Skip to content

Commit d555a77

Browse files
committed
module: use the module name from the manifest for loading
The module name is present in the manifest, use it as an argument to module_load(). Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 4433c3a commit d555a77

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/library_manager/lib_manager.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,23 +278,22 @@ uint32_t lib_manager_allocate_module(const struct comp_driver *drv,
278278
return 0;
279279
}
280280

281+
mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
282+
281283
size_t mod_size = desc->header.preload_page_count * CONFIG_MM_DRV_PAGE_SIZE;
282284
/* FIXME: where does the module begin?? */
283285
struct module_buf_stream mbs = MODULE_BUF_STREAM((uint8_t *)desc -
284286
SOF_MAN_ELF_TEXT_OFFSET + 0x8000,
285287
mod_size);
286288
struct module *m;
287289

288-
/* FIXME: get a name from the manifest */
289-
ret = module_load(&mbs.stream, "SMATEST", &m);
290+
ret = module_load(&mbs.stream, mod->name, &m);
290291
if (ret < 0)
291292
return ret;
292293

293294
const struct sof_man_module_manifest *mod_manifest = module_peek(&mbs.stream,
294295
m->module_offset);
295296

296-
mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
297-
298297
mod->segment[SOF_MAN_SEGMENT_TEXT].v_base_addr = mbs.stream.sects[MOD_SECT_TEXT].sh_addr;
299298
mod->segment[SOF_MAN_SEGMENT_TEXT].flags.r.length = mbs.stream.sects[MOD_SECT_TEXT].sh_size;
300299
mod->segment[SOF_MAN_SEGMENT_TEXT].file_offset = (uintptr_t)m->mem[MOD_MEM_TEXT] -

0 commit comments

Comments
 (0)