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

codec_adapter: rename codec_load_config() 

to module_load_config(). No functional change.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2022-01-07 17:59:36 -08:00 committed by Daniel Baluta
parent ae0e7fb774
commit 032cddc854
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/audio/codec_adapter/codec/generic.c
View File

@ -18,19 +18,17 @@
/*****************************************************************************/ /*****************************************************************************/
static int validate_config(struct module_config *cfg); static int validate_config(struct module_config *cfg);
int int module_load_config(struct comp_dev *dev, void *cfg, size_t size, enum module_cfg_type type)
codec_load_config(struct comp_dev *dev, void *cfg, size_t size,
enum module_cfg_type type)
{ {
int ret; int ret;
struct module_config *dst; struct module_config *dst;
struct processing_module *mod = comp_get_drvdata(dev); struct processing_module *mod = comp_get_drvdata(dev);
struct module_data *md = &mod->priv; struct module_data *md = &mod->priv;
comp_dbg(dev, "codec_load_config() start"); comp_dbg(dev, "module_load_config() start");
if (!cfg || !size) { if (!cfg || !size) {
comp_err(dev, "codec_load_config(): wrong input params! dev %x, cfg %x size %d", comp_err(dev, "module_load_config(): wrong input params! dev %x, cfg %x size %d",
(uint32_t)dev, (uint32_t)cfg, size); (uint32_t)dev, (uint32_t)cfg, size);
return -EINVAL; return -EINVAL;
} }
@ -49,7 +47,7 @@ codec_load_config(struct comp_dev *dev, void *cfg, size_t size,
dst->data = rballoc(0, SOF_MEM_CAPS_RAM, size); dst->data = rballoc(0, SOF_MEM_CAPS_RAM, size);
} }
if (!dst->data) { if (!dst->data) {
comp_err(dev, "codec_load_config(): failed to allocate space for setup config."); comp_err(dev, "module_load_config(): failed to allocate space for setup config.");
ret = -ENOMEM; ret = -ENOMEM;
goto err; goto err;
} }
@ -58,7 +56,7 @@ codec_load_config(struct comp_dev *dev, void *cfg, size_t size,
assert(!ret); assert(!ret);
ret = validate_config(dst->data); ret = validate_config(dst->data);
if (ret) { if (ret) {
comp_err(dev, "codec_load_config(): validation of config failed!"); comp_err(dev, "module_load_config(): validation of config failed!");
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
@ -67,7 +65,7 @@ codec_load_config(struct comp_dev *dev, void *cfg, size_t size,
dst->size = size; dst->size = size;
dst->avail = true; dst->avail = true;
comp_dbg(dev, "codec_load_config() done"); comp_dbg(dev, "module_load_config() done");
return ret; return ret;
err: err:
if (dst->data && type == MODULE_CFG_RUNTIME) if (dst->data && type == MODULE_CFG_RUNTIME)

5
src/audio/codec_adapter/codec_adapter.c
View File

@ -146,7 +146,7 @@ int load_setup_config(struct comp_dev *dev, void *cfg, uint32_t size)
lib_cfg_size = size - sizeof(struct ca_config); lib_cfg_size = size - sizeof(struct ca_config);
if (lib_cfg_size) { if (lib_cfg_size) {
lib_cfg = (char *)cfg + sizeof(struct ca_config); lib_cfg = (char *)cfg + sizeof(struct ca_config);
ret = codec_load_config(dev, lib_cfg, lib_cfg_size, MODULE_CFG_SETUP); ret = module_load_config(dev, lib_cfg, lib_cfg_size, MODULE_CFG_SETUP);
if (ret) { if (ret) {
comp_err(dev, "load_setup_config(): %d: failed to load setup config for codec id %x", comp_err(dev, "load_setup_config(): %d: failed to load setup config for codec id %x",
ret, mod->ca_config.codec_id); ret, mod->ca_config.codec_id);
@ -537,8 +537,7 @@ static int codec_adapter_set_params(struct comp_dev *dev, struct sof_ipc_ctrl_da
break; break;
case MODULE_CFG_RUNTIME: case MODULE_CFG_RUNTIME:
ret = codec_load_config(dev, md->runtime_params, size, ret = module_load_config(dev, md->runtime_params, size, MODULE_CFG_RUNTIME);
MODULE_CFG_RUNTIME);
if (ret) { if (ret) {
comp_err(dev, "codec_adapter_set_params() error %d: load of runtime config failed.", comp_err(dev, "codec_adapter_set_params() error %d: load of runtime config failed.",
ret); ret);

3
src/include/sof/audio/codec_adapter/codec/generic.h
View File

@ -221,8 +221,7 @@ struct processing_module {
/*****************************************************************************/ /*****************************************************************************/
/* Codec generic interfaces */ /* Codec generic interfaces */
/*****************************************************************************/ /*****************************************************************************/
int codec_load_config(struct comp_dev *dev, void *cfg, size_t size, int module_load_config(struct comp_dev *dev, void *cfg, size_t size, enum module_cfg_type type);
enum module_cfg_type type);
int module_init(struct comp_dev *dev, struct module_interface *interface); int module_init(struct comp_dev *dev, struct module_interface *interface);
void *codec_allocate_memory(struct comp_dev *dev, uint32_t size, void *codec_allocate_memory(struct comp_dev *dev, uint32_t size,
uint32_t alignment); uint32_t alignment);