OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

audio: tdfb: rename some macros to avoid repeat definition 

Add prefix SOF_TDFB to macros to avoid repeat definition.

Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>
This commit is contained in:
Baofeng Tian 2023-11-13 15:10:15 +08:00 committed by Kai Vehmanen
parent 03a4c38a3d
commit f60dd1818f
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/audio/tdfb/tdfb.h
View File

@ -20,11 +20,11 @@
/* The driver assigns running numbers for control index. If there's single control of
* type switch, enum, binary they all have index 0.
*/
#define CTRL_INDEX_PROCESS 0 /* switch */
#define CTRL_INDEX_DIRECTION 1 /* switch */
#define CTRL_INDEX_AZIMUTH 0 /* enum */
#define CTRL_INDEX_AZIMUTH_ESTIMATE 1 /* enum */
#define CTRL_INDEX_FILTERBANK 0 /* bytes */
#define SOF_TDFB_CTRL_INDEX_PROCESS 0 /* switch */
#define SOF_TDFB_CTRL_INDEX_DIRECTION 1 /* switch */
#define SOF_TDFB_CTRL_INDEX_AZIMUTH 0 /* enum */
#define SOF_TDFB_CTRL_INDEX_AZIMUTH_ESTIMATE 1 /* enum */
#define SOF_TDFB_CTRL_INDEX_FILTERBANK 0 /* bytes */
/*
* sof_tdfb_config data[]

16
src/audio/tdfb/tdfb_ipc3.c
View File

@ -41,7 +41,7 @@ static int init_get_ctl_ipc(struct processing_module *mod)
cd->ctrl_data->comp_id = comp_id;
cd->ctrl_data->type = SOF_CTRL_TYPE_VALUE_CHAN_GET;
cd->ctrl_data->cmd = SOF_CTRL_CMD_ENUM;
cd->ctrl_data->index = CTRL_INDEX_AZIMUTH_ESTIMATE;
cd->ctrl_data->index = SOF_TDFB_CTRL_INDEX_AZIMUTH_ESTIMATE;
cd->ctrl_data->num_elems = 0;
return 0;
}
@ -77,7 +77,7 @@ static int tdfb_cmd_switch_get(struct sof_ipc_ctrl_data *cdata, struct tdfb_comp
int j;
/* Fail if wrong index in control, needed if several in same type */
if (cdata->index != CTRL_INDEX_PROCESS)
if (cdata->index != SOF_TDFB_CTRL_INDEX_PROCESS)
return -EINVAL;
for (j = 0; j < cdata->num_elems; j++)
@ -91,12 +91,12 @@ static int tdfb_cmd_enum_get(struct sof_ipc_ctrl_data *cdata, struct tdfb_comp_d
int j;
switch (cdata->index) {
case CTRL_INDEX_AZIMUTH:
case SOF_TDFB_CTRL_INDEX_AZIMUTH:
for (j = 0; j < cdata->num_elems; j++)
cdata->chanv[j].value = cd->az_value;
break;
case CTRL_INDEX_AZIMUTH_ESTIMATE:
case SOF_TDFB_CTRL_INDEX_AZIMUTH_ESTIMATE:
for (j = 0; j < cdata->num_elems; j++)
cdata->chanv[j].value = cd->az_value_estimate;
@ -150,11 +150,11 @@ static int tdfb_cmd_enum_set(struct sof_ipc_ctrl_data *cdata, struct tdfb_comp_d
return -EINVAL;
switch (cdata->index) {
case CTRL_INDEX_AZIMUTH:
case SOF_TDFB_CTRL_INDEX_AZIMUTH:
cd->az_value = cdata->chanv[0].value;
cd->update = true;
break;
case CTRL_INDEX_AZIMUTH_ESTIMATE:
case SOF_TDFB_CTRL_INDEX_AZIMUTH_ESTIMATE:
cd->az_value_estimate = cdata->chanv[0].value;
break;
default:
@ -170,11 +170,11 @@ static int tdfb_cmd_switch_set(struct sof_ipc_ctrl_data *cdata, struct tdfb_comp
return -EINVAL;
switch (cdata->index) {
case CTRL_INDEX_PROCESS:
case SOF_TDFB_CTRL_INDEX_PROCESS:
cd->beam_on = cdata->chanv[0].value;
cd->update = true;
break;
case CTRL_INDEX_DIRECTION:
case SOF_TDFB_CTRL_INDEX_DIRECTION:
cd->direction_updates = cdata->chanv[0].value;
break;
default:

10
src/audio/tdfb/tdfb_ipc4.c
View File

@ -88,7 +88,7 @@ int tdfb_ipc_notification_init(struct processing_module *mod)
struct tdfb_comp_data *cd = module_get_private_data(mod);
cd->msg = tdfb_notification_init(mod, SOF_IPC4_ENUM_CONTROL_PARAM_ID,
CTRL_INDEX_AZIMUTH_ESTIMATE);
SOF_TDFB_CTRL_INDEX_AZIMUTH_ESTIMATE);
if (!cd->msg) {
comp_err(mod->dev, "Failed to initialize control notification.");
return -EINVAL;
@ -121,11 +121,11 @@ static int tdfb_cmd_enum_set(struct sof_ipc4_control_msg_payload *ctl, struct td
return -EINVAL;
switch (ctl->id) {
case CTRL_INDEX_AZIMUTH:
case SOF_TDFB_CTRL_INDEX_AZIMUTH:
cd->az_value = ctl->chanv[0].value;
cd->update = true;
break;
case CTRL_INDEX_AZIMUTH_ESTIMATE:
case SOF_TDFB_CTRL_INDEX_AZIMUTH_ESTIMATE:
cd->az_value_estimate = ctl->chanv[0].value;
break;
default:
@ -141,11 +141,11 @@ static int tdfb_cmd_switch_set(struct sof_ipc4_control_msg_payload *ctl, struct
return -EINVAL;
switch (ctl->id) {
case CTRL_INDEX_PROCESS:
case SOF_TDFB_CTRL_INDEX_PROCESS:
cd->beam_on = ctl->chanv[0].value;
cd->update = true;
break;
case CTRL_INDEX_DIRECTION:
case SOF_TDFB_CTRL_INDEX_DIRECTION:
cd->direction_updates = ctl->chanv[0].value;
break;
default: