Skip to content

Commit

Permalink
Revert "ASoC: qdsp6v2: Add LSM opendsp support"
Browse files Browse the repository at this point in the history 
This reverts commit 8e518ae.
  • Loading branch information
@sultanqasim
sultanqasim committed Jan 23, 2016
1 parent c22afd6 commit b645348
Show file tree
Hide file tree
Showing 4 changed files with 127 additions and 1,189 deletions.
4 changes: 0 additions & 4 deletions include/sound/apr_audio-v2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7205,15 +7205,12 @@ struct asm_dts_eagle_param_get {
#define LSM_SESSION_CMD_OPEN_TX (0x00012A82)
#define LSM_SESSION_CMD_CLOSE_TX (0x00012A88)
#define LSM_SESSION_CMD_SET_PARAMS (0x00012A83)
#define LSM_SESSION_CMD_SET_PARAMS_V2 (0x00012A8F)
#define LSM_SESSION_CMD_REGISTER_SOUND_MODEL (0x00012A84)
#define LSM_SESSION_CMD_DEREGISTER_SOUND_MODEL (0x00012A85)
#define LSM_SESSION_CMD_START (0x00012A86)
#define LSM_SESSION_CMD_STOP (0x00012A87)
#define LSM_SESSION_CMD_EOB (0x00012A89)
#define LSM_SESSION_CMD_READ (0x00012A8A)
#define LSM_SESSION_CMD_OPEN_TX_V2 (0x00012A8B)
#define LSM_CMD_ADD_TOPOLOGIES (0x00012A8C)

#define LSM_SESSION_EVENT_DETECTION_STATUS (0x00012B00)
#define LSM_SESSION_EVENT_DETECTION_STATUS_V2 (0x00012B01)
Expand All @@ -7230,7 +7227,6 @@ struct asm_dts_eagle_param_get {
#define LSM_MODULE_ID_LAB (0x00012C08)
#define LSM_PARAM_ID_LAB_ENABLE (0x00012C09)
#define LSM_PARAM_ID_LAB_CONFIG (0x00012C0A)
#define LSM_MODULE_ID_FRAMEWORK (0x00012C0E)

/* HW MAD specific */
#define AFE_MODULE_HW_MAD (0x00010230)
Expand Down
63 changes: 4 additions & 59 deletions include/sound/q6lsm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,11 @@ struct lsm_client {
bool started;
dma_addr_t lsm_cal_phy_addr;
uint32_t lsm_cal_size;
uint32_t app_id;
uint16_t app_id;
bool lab_enable;
bool lab_started;
struct lsm_lab_buffer *lab_buffer;
struct lsm_lab_hw_params hw_params;
bool use_topology;
};

struct lsm_stream_cmd_open_tx {
Expand All @@ -89,33 +88,11 @@ struct lsm_stream_cmd_open_tx {
uint32_t sampling_rate;
} __packed;

struct lsm_stream_cmd_open_tx_v2 {
struct apr_hdr hdr;
uint32_t topology_id;
} __packed;

struct lsm_custom_topologies {
struct apr_hdr hdr;
uint32_t data_payload_addr_lsw;
uint32_t data_payload_addr_msw;
uint32_t mem_map_handle;
uint32_t buffer_size;
} __packed;

struct lsm_param_size_reserved {
uint16_t param_size;
uint16_t reserved;
} __packed;

union lsm_param_size {
uint32_t param_size;
struct lsm_param_size_reserved sr;
} __packed;

struct lsm_param_payload_common {
uint32_t module_id;
uint32_t param_id;
union lsm_param_size p_size;
uint16_t param_size;
uint16_t reserved;
} __packed;

struct lsm_param_op_mode {
Expand Down Expand Up @@ -169,31 +146,6 @@ struct lsm_cmd_set_opmode_connectport {
struct lsm_param_op_mode op_mode;
} __packed;

struct lsm_param_epd_thres {
struct lsm_param_payload_common common;
uint32_t minor_version;
uint32_t epd_begin;
uint32_t epd_end;
} __packed;

struct lsm_cmd_set_epd_threshold {
struct apr_hdr msg_hdr;
struct lsm_set_params_hdr param_hdr;
struct lsm_param_epd_thres epd_thres;
} __packed;

struct lsm_param_gain {
struct lsm_param_payload_common common;
uint32_t minor_version;
uint16_t gain;
uint16_t reserved;
} __packed;

struct lsm_cmd_set_gain {
struct apr_hdr msg_hdr;
struct lsm_set_params_hdr param_hdr;
struct lsm_param_gain lsm_gain;
} __packed;

struct lsm_cmd_reg_snd_model {
struct apr_hdr hdr;
Expand Down Expand Up @@ -254,8 +206,7 @@ void q6lsm_client_free(struct lsm_client *client);
int q6lsm_open(struct lsm_client *client, uint16_t app_id);
int q6lsm_start(struct lsm_client *client, bool wait);
int q6lsm_stop(struct lsm_client *client, bool wait);
int q6lsm_snd_model_buf_alloc(struct lsm_client *client, size_t len,
bool allocate_module_data);
int q6lsm_snd_model_buf_alloc(struct lsm_client *client, size_t len);
int q6lsm_snd_model_buf_free(struct lsm_client *client);
int q6lsm_close(struct lsm_client *client);
int q6lsm_register_sound_model(struct lsm_client *client,
Expand All @@ -271,10 +222,4 @@ int q6lsm_lab_control(struct lsm_client *client, u32 enable);
int q6lsm_stop_lab(struct lsm_client *client);
int q6lsm_read(struct lsm_client *client, struct lsm_cmd_read *read);
int q6lsm_lab_buffer_alloc(struct lsm_client *client, bool alloc);
int q6lsm_set_one_param(struct lsm_client *client,
struct lsm_params_info *p_info, void *data,
enum LSM_PARAM_TYPE param_type);
void q6lsm_sm_set_param_data(struct lsm_client *client,
struct lsm_params_info *p_info,
size_t *offset);
#endif /* __Q6LSM_H__ */
Loading

0 comments on commit b645348

Please sign in to comment.