Skip to content

Commit 548f0e6

Browse files
committed
module_adapter: generic: Introduce mod_generic_init
Factor out resource initialization so that it can be reused. While at it get rid of md variable. Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
1 parent d9e15d5 commit 548f0e6

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

src/audio/module_adapter/module/generic.c

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,20 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size)
7171
return ret;
7272
}
7373

74+
static void mod_resource_init(struct processing_module *mod)
75+
{
76+
struct module_data *md = &mod->priv;
77+
/* Init memory list */
78+
list_init(&md->resources.res_list);
79+
list_init(&md->resources.free_cont_list);
80+
list_init(&md->resources.cont_chunk_list);
81+
md->resources.heap_usage = 0;
82+
md->resources.heap_high_water_mark = 0;
83+
}
84+
7485
int module_init(struct processing_module *mod)
7586
{
7687
int ret;
77-
struct module_data *md = &mod->priv;
7888
struct comp_dev *dev = mod->dev;
7989
const struct module_interface *const interface = dev->drv->adapter_ops;
8090

@@ -99,14 +109,9 @@ int module_init(struct processing_module *mod)
99109
return -EIO;
100110
}
101111

102-
/* Init memory list */
103-
list_init(&md->resources.res_list);
104-
list_init(&md->resources.free_cont_list);
105-
list_init(&md->resources.cont_chunk_list);
106-
md->resources.heap_usage = 0;
107-
md->resources.heap_high_water_mark = 0;
112+
mod_resource_init(mod);
108113
#if CONFIG_MODULE_MEMORY_API_DEBUG && defined(__ZEPHYR__)
109-
md->resources.rsrc_mngr = k_current_get();
114+
mod->priv.resources.rsrc_mngr = k_current_get();
110115
#endif
111116
/* Now we can proceed with module specific initialization */
112117
ret = interface->init(mod);
@@ -117,7 +122,7 @@ int module_init(struct processing_module *mod)
117122

118123
comp_dbg(dev, "done");
119124
#if CONFIG_IPC_MAJOR_3
120-
md->state = MODULE_INITIALIZED;
125+
mod->priv.state = MODULE_INITIALIZED;
121126
#endif
122127

123128
return 0;

0 commit comments

Comments
 (0)