lib-manager: use an appropriate type for a pointer integer

lib_manager_allocate_module() returns a pointer as an integer, use uintptr_t for it. Signed-off-by: Guennadi Liakhovetski <[email protected]>
thesofproject · Nov 2, 2023 · b150c22 · b150c22
1 parent 8b8f7bd
commit b150c22
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/audio/module_adapter/module/modules.c b/src/audio/module_adapter/module/modules.c
@@ -66,8 +66,8 @@ static int modules_init(struct processing_module *mod)
 		struct comp_ipc_config *config = &(mod->dev->ipc_config);
 		/* At this point module resources are allocated and it is moved to L2 memory. */
 		const void *buildinfo = NULL;
-		uint32_t module_entry_point = lib_manager_allocate_module(mod, config,
-									  src_cfg, &buildinfo);
+		uintptr_t module_entry_point = lib_manager_allocate_module(mod, config,
+									   src_cfg, &buildinfo);
 
 		if (module_entry_point == 0) {
 			comp_err(dev, "modules_init(), lib_manager_allocate_module() failed!");

diff --git a/src/include/sof/audio/module_adapter/module/generic.h b/src/include/sof/audio/module_adapter/module/generic.h
@@ -164,7 +164,7 @@ struct module_data {
 	struct module_memory memory; /**< memory allocated by module */
 	struct module_processing_data mpd; /**< shared data comp <-> module */
 	void *module_adapter; /**<loadable module interface handle */
-	uint32_t module_entry_point; /**<loadable module entry point address */
+	uintptr_t module_entry_point; /**<loadable module entry point address */
 	struct llext *llext; /**< Zephyr loadable extension context */
 };
 

diff --git a/src/include/sof/lib_manager.h b/src/include/sof/lib_manager.h
@@ -137,9 +137,9 @@ struct processing_module;
  * Function is responsible to allocate module in available free memory and assigning proper address.
  * (WIP) These feature will contain module validation and proper memory management.
  */
-uint32_t lib_manager_allocate_module(struct processing_module *proc,
-				     struct comp_ipc_config *ipc_config,
-				     const void *ipc_specific_config, const void **buildinfo);
+uintptr_t lib_manager_allocate_module(struct processing_module *proc,
+				      struct comp_ipc_config *ipc_config,
+				      const void *ipc_specific_config, const void **buildinfo);
 
 /*
  * \brief Free module

diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
@@ -250,9 +250,9 @@ static int lib_manager_free_module_instance(uint32_t module_id, uint32_t instanc
 #include <zephyr/llext/loader.h>
 #include <zephyr/llext/llext.h>
 
-uint32_t lib_manager_allocate_module(struct processing_module *proc,
-				     struct comp_ipc_config *ipc_config,
-				     const void *ipc_specific_config, const void **buildinfo)
+uintptr_t lib_manager_allocate_module(struct processing_module *proc,
+				      struct comp_ipc_config *ipc_config,
+				      const void *ipc_specific_config, const void **buildinfo)
 {
 	struct sof_man_fw_desc *desc;
 	struct sof_man_module *mod;
@@ -353,9 +353,9 @@ int lib_manager_free_module(struct processing_module *proc,
 
 #define PAGE_SZ		4096 /* equals to MAN_PAGE_SIZE used by rimage */
 
-uint32_t lib_manager_allocate_module(struct processing_module *proc,
-				     struct comp_ipc_config *ipc_config,
-				     const void *ipc_specific_config)
+uintptr_t lib_manager_allocate_module(struct processing_module *proc,
+				      struct comp_ipc_config *ipc_config,
+				      const void *ipc_specific_config)
 {
 	tr_err(&lib_manager_tr,
 	       "lib_manager_allocate_module(): Dynamic module allocation is not supported");