module: Move system_agent_start parameters into system_agent_params struct

Replace multiple arguments passed to system_agent_start and
native_system_agent_start with a single pointer to system_agent_params.
This improves readability and simplifies function signature.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>

Author: softwarecki

src/audio/module_adapter/iadk/system_agent.cpp

@@ -21,6 +21,7 @@
 #include <iadk_module_adapter.h>
 #include <system_agent.h>
 #include <sof/audio/module_adapter/library/native_system_service.h>
+#include <sof/audio/module_adapter/library/native_system_agent.h>
 
 using namespace intel_adsp;
 using namespace intel_adsp::system;
@@ -124,16 +125,17 @@ int SystemAgent::CheckIn(ProcessingModuleFactoryInterface& module_factory,
 typedef int (*create_instance_f)(uint32_t module_id, uint32_t instance_id, uint32_t core_id,
 				 void *mod_cfg, void *parent_ppl, void **mod_ptr);
 
-int system_agent_start(uintptr_t entry_point, uint32_t module_id, uint32_t instance_id,
-		       uint32_t core_id, uint32_t log_handle, void* mod_cfg,
+int system_agent_start(const struct system_agent_params *params,
 		       const void **adapter)
 {
 	uint32_t ret;
-	SystemAgent system_agent(module_id, instance_id, core_id, log_handle);
+	SystemAgent system_agent(params->module_id, params->instance_id, params->core_id,
+				 params->log_handle);
 	void* system_agent_p = reinterpret_cast<void*>(&system_agent);
 
-	create_instance_f ci = (create_instance_f)(entry_point);
-	ret = ci(module_id, instance_id, core_id, mod_cfg, NULL, &system_agent_p);
+	create_instance_f ci = (create_instance_f)(params->entry_point);
+	ret = ci(params->module_id, params->instance_id, params->core_id, params->mod_cfg, NULL,
+		 &system_agent_p);
 
 	IadkModuleAdapter* module_adapter = reinterpret_cast<IadkModuleAdapter*>(system_agent_p);
 	*adapter = module_adapter;

src/audio/module_adapter/library/native_system_agent.c

@@ -19,21 +19,20 @@ typedef void* (*native_create_instance_f)(void *mod_cfg, void *parent_ppl,
 
 struct native_system_agent native_sys_agent;
 
-int native_system_agent_start(uintptr_t entry_point, uint32_t module_id, uint32_t instance_id,
-			      uint32_t core_id, uint32_t log_handle, void *mod_cfg,
+int native_system_agent_start(const struct system_agent_params *params,
 			      const void **iface)
 {
-	native_sys_agent.module_id = module_id;
-	native_sys_agent.instance_id = instance_id;
-	native_sys_agent.core_id = core_id;
-	native_sys_agent.log_handle = log_handle;
+	native_sys_agent.module_id = params->module_id;
+	native_sys_agent.instance_id = params->instance_id;
+	native_sys_agent.core_id = params->core_id;
+	native_sys_agent.log_handle = params->log_handle;
 	const void *ret;
 
 	void *system_agent_p = &native_sys_agent;
 
-	native_create_instance_f ci = (native_create_instance_f)entry_point;
+	native_create_instance_f ci = (native_create_instance_f)params->entry_point;
 
-	ret = ci(mod_cfg, NULL, &system_agent_p);
+	ret = ci(params->mod_cfg, NULL, &system_agent_p);
 	if (!ret)
 		return -EINVAL;
 

src/include/sof/audio/module_adapter/iadk/system_agent.h

@@ -107,8 +107,9 @@ extern "C" {
  * method (the variant with 7 parameters) via a parameter that initially contained the address to
  * the agent system. The system_agent_start function returns it in the variable adapter.
  */
-int system_agent_start(uintptr_t entry_point, uint32_t module_id, uint32_t instance_id,
-		       uint32_t core_id, uint32_t log_handle, void *mod_cfg, const void **adapter);
+struct system_agent_params;
+
+int system_agent_start(const struct system_agent_params *params, const void **adapter);
 #ifdef __cplusplus
 }
 #endif

src/include/sof/audio/module_adapter/library/native_system_agent.h

@@ -11,9 +11,17 @@
 #include <sof/audio/module_adapter/module/module_interface.h>
 #include <native_system_service.h>
 
-typedef int (*system_agent_start_fn)(uintptr_t entry_point, uint32_t module_id,
-				     uint32_t instance_id, uint32_t core_id, uint32_t log_handle,
-				     void *mod_cfg, const void **adapter);
+struct system_agent_params {
+	uintptr_t entry_point;	/* The module entry point function address. */
+	uint32_t module_id;	/* The identifier for the module. */
+	uint32_t instance_id;	/* The instance identifier of the module. */
+	uint32_t core_id;	/* Core on which the module will run. */
+	uint32_t log_handle;	/* The handle for logging purposes. */
+	void *mod_cfg;		/* Pointer to the module configuration data. */
+};
+
+typedef int (*system_agent_start_fn)(const struct system_agent_params *params,
+				     const void **adapter);
 
 struct native_system_agent {
 	struct system_service system_service;
@@ -29,18 +37,12 @@ struct native_system_agent {
  *
  * This function initializes and starts the native system agent with the provided parameters.
  *
- * @param[in] entry_point - The module entry point function address.
- * @param[in] module_id - The identifier for the module.
- * @param[in] instance_id - The instance identifier of the module.
- * @param[in] core_id - Core on which the module will run.
- * @param[in] log_handle - The handle for logging purposes.
- * @param[in] mod_cfg - Pointer to the module configuration data.
+ * @param[in] params - Pointer to the system agent parameter structure
  * @param[out] iface - Pointer to the module interface.
  *
  * @return Returns 0 on success or an error code on failure.
  */
-int native_system_agent_start(uintptr_t entry_point, uint32_t module_id, uint32_t instance_id,
-			      uint32_t core_id, uint32_t log_handle, void *mod_cfg,
+int native_system_agent_start(const struct system_agent_params *params,
 			      const void **iface);
 
 #endif /* __NATIVE_SYSTEM_AGENT_H__ */

src/library_manager/lib_manager.c

@@ -501,18 +501,22 @@ static int lib_manager_start_agent(const struct comp_driver *drv, const uint32_t
 				   const system_agent_start_fn agent,
 				   const void **agent_interface)
 {
-	const uint32_t module_id = IPC4_MOD_ID(component_id);
-	const uint32_t instance_id = IPC4_INST_ID(component_id);
-	const uint32_t log_handle = (uint32_t)drv->tctx;
+	struct system_agent_params agent_params;
 	byte_array_t mod_cfg;
 	int ret;
 
 	mod_cfg.data = (uint8_t *)args->data;
 	/* Intel modules expects DW size here */
 	mod_cfg.size = args->size >> 2;
 
-	ret = agent(module_entry_point, module_id, instance_id, 0, log_handle, &mod_cfg,
-		    agent_interface);
+	agent_params.entry_point = module_entry_point;
+	agent_params.module_id = IPC4_MOD_ID(component_id);
+	agent_params.instance_id = IPC4_INST_ID(component_id);
+	agent_params.core_id = 0;
+	agent_params.log_handle = (uint32_t)drv->tctx;
+	agent_params.mod_cfg = &mod_cfg;
+
+	ret = agent(&agent_params, agent_interface);
 	if (ret)
 		tr_err(&lib_manager_tr, "System agent start failed %d!", ret);