Skip to content

Module adapter cleanup #9383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 3 commits into from
Aug 22, 2024
Merged

Module adapter cleanup #9383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2d4bd3
module_adapter: fix a log string typo
cujomalainey Aug 21, 2024
3b1ad07
module_adapter: remove validate_config
cujomalainey Aug 21, 2024
3a3eeaa
module_adapter: clean up module_load_config
cujomalainey Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions src/audio/module_adapter/module/generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@

LOG_MODULE_DECLARE(module_adapter, CONFIG_SOF_LOG_LEVEL);

/*****************************************************************************/
/* Local helper functions */
/*****************************************************************************/
static int validate_config(struct module_config *cfg);

int module_load_config(struct comp_dev *dev, const void *cfg, size_t size)
{
int ret;
Expand Down Expand Up @@ -52,30 +47,18 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size)
}
if (!dst->data) {
comp_err(dev, "module_load_config(): failed to allocate space for setup config.");
ret = -ENOMEM;
goto err;
return -ENOMEM;
}

ret = memcpy_s(dst->data, size, cfg, size);
assert(!ret);
ret = validate_config(dst->data);
if (ret) {
comp_err(dev, "module_load_config(): validation of config failed!");
ret = -EINVAL;
goto err;
}

/* Config loaded, mark it as valid */
dst->size = size;
dst->avail = true;

comp_dbg(dev, "module_load_config() done");
return ret;
err:
if (dst->data)
rfree(dst->data);
dst->data = NULL;
return ret;
}

int module_init(struct processing_module *mod)
Expand Down Expand Up @@ -190,12 +173,6 @@ int module_free_memory(struct processing_module *mod, void *ptr)
return -EINVAL;
}

static int validate_config(struct module_config *cfg)
{
/* TODO: validation of codec specific setup config */
return 0;
}

int module_prepare(struct processing_module *mod,
struct sof_source **sources, int num_of_sources,
struct sof_sink **sinks, int num_of_sinks)
Expand Down
2 changes: 1 addition & 1 deletion src/audio/module_adapter/module_adapter_ipc3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ int module_adapter_init_data(struct comp_dev *dev,
if (size) {
ret = module_load_config(dev, data, size);
if (ret < 0) {
comp_err(dev, "module_adapter_new() error %d: config loading has failed.",
comp_err(dev, "module_adapter_init_data() error %d: config loading has failed.",
ret);
return ret;
}
Expand Down