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

codec_adapter: modify the signature of module_allocate_memory() 

Pass the pointer to struct processing module instead of comp_dev.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2022-01-10 16:49:33 -08:00 committed by Liam Girdwood
parent 3f2f149b9c
commit 70158f93d3
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,7 +312,7 @@ static int init_memory_tables(struct processing_module *mod)
goto err;
}
/* Allocate memory for this type, taking alignment into account */
ptr = module_allocate_memory(dev, mem_size, mem_alignment);
ptr = module_allocate_memory(mod, mem_size, mem_alignment);
if (!ptr) {
comp_err(dev, "init_memory_tables() error %x: failed to allocate memory for %d",
ret, mem_type);
@ -450,7 +450,7 @@ static int cadence_codec_prepare(struct processing_module *mod)
return ret;
}
cd->mem_tabs = module_allocate_memory(dev, mem_tabs_size, 4);
cd->mem_tabs = module_allocate_memory(mod, mem_tabs_size, 4);
if (!cd->mem_tabs) {
comp_err(dev, "cadence_codec_prepare() error: failed to allocate space for memtabs");
return -ENOMEM;

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

@ -24,7 +24,7 @@ static void *dts_effect_allocate_codec_memory(void *mod_void, unsigned int lengt
comp_dbg(dev, "dts_effect_allocate_codec_memory() start");
pMem = module_allocate_memory(dev, (uint32_t)length, (uint32_t)alignment);
pMem = module_allocate_memory(mod, (uint32_t)length, (uint32_t)alignment);
if (pMem == NULL)
comp_err(dev,

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

@ -118,11 +118,11 @@ int module_init(struct processing_module *mod, struct module_interface *interfac
return ret;
}
void *module_allocate_memory(struct comp_dev *dev, uint32_t size, uint32_t alignment)
void *module_allocate_memory(struct processing_module *mod, uint32_t size, uint32_t alignment)
{
struct comp_dev *dev = mod->dev;
struct module_memory *container;
void *ptr;
struct processing_module *mod = comp_get_drvdata(dev);
if (!size) {
comp_err(dev, "module_allocate_memory: requested allocation of 0 bytes.");

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

@ -200,7 +200,7 @@ static int waves_effect_allocate(struct processing_module *mod)
return -EINVAL;
}
waves_codec->effect = (MaxxEffect_t *)module_allocate_memory(dev,
waves_codec->effect = (MaxxEffect_t *)module_allocate_memory(mod,
waves_codec->effect_size, 16);
if (!waves_codec->effect) {
@ -377,7 +377,7 @@ static int waves_effect_buffers(struct processing_module *mod)
goto err;
}
response = module_allocate_memory(dev, waves_codec->response_max_bytes, 16);
response = module_allocate_memory(mod, waves_codec->response_max_bytes, 16);
if (!response) {
comp_err(dev, "waves_effect_buffers() failed to allocate %d bytes for response",
waves_codec->response_max_bytes);
@ -385,7 +385,7 @@ static int waves_effect_buffers(struct processing_module *mod)
goto err;
}
i_buffer = module_allocate_memory(dev, waves_codec->buffer_bytes, 16);
i_buffer = module_allocate_memory(mod, waves_codec->buffer_bytes, 16);
if (!i_buffer) {
comp_err(dev, "waves_effect_buffers() failed to allocate %d bytes for i_buffer",
waves_codec->buffer_bytes);
@ -393,7 +393,7 @@ static int waves_effect_buffers(struct processing_module *mod)
goto err;
}
o_buffer = module_allocate_memory(dev, waves_codec->buffer_bytes, 16);
o_buffer = module_allocate_memory(mod, waves_codec->buffer_bytes, 16);
if (!o_buffer) {
comp_err(dev, "waves_effect_buffers() failed to allocate %d bytes for o_buffer",
waves_codec->buffer_bytes);
@ -607,7 +607,7 @@ static int waves_codec_init(struct processing_module *mod)
comp_dbg(dev, "waves_codec_init() start");
waves_codec = module_allocate_memory(dev, sizeof(struct waves_codec_data), 16);
waves_codec = module_allocate_memory(mod, sizeof(struct waves_codec_data), 16);
if (!waves_codec) {
comp_err(dev, "waves_codec_init() failed to allocate %d bytes for waves_codec_data",
sizeof(struct waves_codec_data));

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

@ -203,7 +203,7 @@ struct processing_module {
/*****************************************************************************/
int module_load_config(struct comp_dev *dev, void *cfg, size_t size);
int module_init(struct processing_module *mod, struct module_interface *interface);
void *module_allocate_memory(struct comp_dev *dev, uint32_t size, uint32_t alignment);
void *module_allocate_memory(struct processing_module *mod, uint32_t size, uint32_t alignment);
int module_free_memory(struct comp_dev *dev, void *ptr);
void module_free_all_memory(struct processing_module *mod);
int module_prepare(struct processing_module *mod);