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

module_interface: remove the apply_config op 

The set_configuration op replaces this one.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2022-01-10 22:44:09 -08:00 committed by Liam Girdwood
parent b231a60b08
commit 91893750f7
6 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/audio/codec_adapter/codec/cadence.c
View File

@ -632,7 +632,6 @@ static struct module_interface cadence_interface = {
.init = cadence_codec_init,
.prepare = cadence_codec_prepare,
.process = cadence_codec_process,
.apply_config = cadence_codec_apply_config,
.set_configuration = cadence_codec_set_configuration,
.reset = cadence_codec_reset,
.free = cadence_codec_free

1
src/audio/codec_adapter/codec/dts.c
View File

@ -396,7 +396,6 @@ static struct module_interface dts_interface = {
.init = dts_codec_init,
.prepare = dts_codec_prepare,
.process = dts_codec_process,
.apply_config = dts_codec_apply_config,
.set_configuration = dts_codec_set_configuration,
.reset = dts_codec_reset,
.free = dts_codec_free

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

@ -93,7 +93,7 @@ int module_init(struct processing_module *mod, struct module_interface *interfac
}
if (!interface->init || !interface->prepare || !interface->process ||
!interface->apply_config || !interface->reset || !interface->free) {
!interface->reset || !interface->free) {
comp_err(dev, "module_init(): comp %d is missing mandatory interfaces",
dev_comp_id(dev));
return -EIO;
@ -255,31 +255,6 @@ int module_process(struct comp_dev *dev)
return ret;
}
int module_apply_runtime_config(struct comp_dev *dev)
{
int ret;
struct processing_module *mod = comp_get_drvdata(dev);
struct module_data *md = &mod->priv;
comp_dbg(dev, "module_apply_config() start");
ret = md->ops->apply_config(dev);
if (ret) {
comp_err(dev, "module_apply_config() error %d: for comp %x",
ret, dev_comp_id(dev));
return ret;
}
md->cfg.avail = false;
/* Configuration had been applied, we can free it now. */
rfree(md->cfg.data);
md->cfg.data = NULL;
comp_dbg(dev, "module_apply_config() end");
return ret;
}
int module_reset(struct processing_module *mod)
{
int ret;

9
src/audio/codec_adapter/codec/passthrough.c
View File

@ -75,14 +75,6 @@ static int passthrough_codec_process(struct comp_dev *dev)
return 0;
}
static int passthrough_codec_apply_config(struct comp_dev *dev)
{
comp_info(dev, "passthrough_codec_apply_config()");
/* nothing to do */
return 0;
}
static int passthrough_codec_reset(struct processing_module *mod)
{
comp_info(mod->dev, "passthrough_codec_reset()");
@ -108,7 +100,6 @@ static struct module_interface passthrough_interface = {
.init = passthrough_codec_init,
.prepare = passthrough_codec_prepare,
.process = passthrough_codec_process,
.apply_config = passthrough_codec_apply_config,
.reset = passthrough_codec_reset,
.free = passthrough_codec_free
};

1
src/audio/codec_adapter/codec/waves.c
View File

@ -832,7 +832,6 @@ static struct module_interface waves_interface = {
.init = waves_codec_init,
.prepare = waves_codec_prepare,
.process = waves_codec_process,
.apply_config = waves_codec_apply_config,
.set_configuration = waves_codec_set_configuration,
.reset = waves_codec_reset,
.free = waves_codec_free

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

@ -104,12 +104,6 @@ struct module_interface {
* ones back to codec_adapter.
*/
int (*process)(struct comp_dev *dev);
/**
* Module specific apply config procedure, called by codec_adapter every time
* a new RUNTIME configuration has been sent if the adapter has been
* prepared. This will not be called for SETUP cfg.
*/
int (*apply_config)(struct comp_dev *dev);
/**
* Set module configuration for the given configuration ID
@ -254,7 +248,6 @@ int module_free_memory(struct processing_module *mod, void *ptr);
void module_free_all_memory(struct processing_module *mod);
int module_prepare(struct processing_module *mod);
int module_process(struct comp_dev *dev);
int module_apply_runtime_config(struct comp_dev *dev);
int module_reset(struct processing_module *mod);
int module_free(struct processing_module *mod);
int module_set_configuration(struct processing_module *mod,