From 94b9976df79c0d0ab5dfe19876a81c83ff8984c1 Mon Sep 17 00:00:00 2001 From: Adrian Warecki Date: Tue, 5 Mar 2024 16:45:34 +0100 Subject: [PATCH] lib_manager: Rename lib_manager_get_library_module_desc function The lib_manager_get_library_module_desc function was renamed to lib_manager_get_library_manifest, which better describes what it do. Signed-off-by: Adrian Warecki --- src/include/sof/lib_manager.h | 2 +- src/library_manager/lib_manager.c | 6 +++--- src/library_manager/llext_manager.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/include/sof/lib_manager.h b/src/include/sof/lib_manager.h index 34b85224073f..80c0160015a9 100644 --- a/src/include/sof/lib_manager.h +++ b/src/include/sof/lib_manager.h @@ -151,7 +151,7 @@ int lib_manager_register_module(const uint32_t component_id); * * Gets firmware manifest descriptor using module_id to locate it */ -struct sof_man_fw_desc *lib_manager_get_library_module_desc(int module_id); +const struct sof_man_fw_desc *lib_manager_get_library_manifest(int module_id); struct processing_module; /* diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c index e240c98e8f21..8441d2a7fbe7 100644 --- a/src/library_manager/lib_manager.c +++ b/src/library_manager/lib_manager.c @@ -214,7 +214,7 @@ static int lib_manager_unload_module(const struct sof_man_module *const mod) */ static int lib_manager_load_libcode_modules(const uint32_t module_id) { - const struct sof_man_fw_desc *const desc = lib_manager_get_library_module_desc(module_id); + const struct sof_man_fw_desc *const desc = lib_manager_get_library_manifest(module_id); struct ext_library *const ext_lib = ext_lib_get(); const struct sof_man_module *module_entry = (struct sof_man_module *) ((char *)desc + SOF_MAN_MODULE_OFFSET(0)); @@ -252,7 +252,7 @@ static int lib_manager_load_libcode_modules(const uint32_t module_id) */ static int lib_manager_unload_libcode_modules(const uint32_t module_id) { - const struct sof_man_fw_desc *const desc = lib_manager_get_library_module_desc(module_id); + const struct sof_man_fw_desc *const desc = lib_manager_get_library_manifest(module_id); const struct sof_man_module *module_entry = (struct sof_man_module *) ((char *)desc + SOF_MAN_MODULE_OFFSET(0)); struct ext_library *const ext_lib = ext_lib_get(); @@ -450,7 +450,7 @@ void lib_manager_init(void) sof->ext_library = &loader_ext_lib; } -struct sof_man_fw_desc *lib_manager_get_library_module_desc(int module_id) +const struct sof_man_fw_desc *lib_manager_get_library_manifest(int module_id) { struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id); uint8_t *buffptr = ctx ? ctx->base_addr : NULL; diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c index 4e84d3b6ff71..e3d73ae98a12 100644 --- a/src/library_manager/llext_manager.c +++ b/src/library_manager/llext_manager.c @@ -242,7 +242,7 @@ uintptr_t llext_manager_allocate_module(struct processing_module *proc, tr_dbg(&lib_manager_tr, "llext_manager_allocate_module(): mod_id: %#x", ipc_config->id); - desc = lib_manager_get_library_module_desc(module_id); + desc = (struct sof_man_fw_desc *)lib_manager_get_library_manifest(module_id); if (!ctx || !desc) { tr_err(&lib_manager_tr, "llext_manager_allocate_module(): failed to get module descriptor");