From 1422c0fd9cb82e3c27a5f3c7c53304acbd910887 Mon Sep 17 00:00:00 2001 From: Sophie Mao Date: Thu, 22 Feb 2024 11:04:51 -0800 Subject: [PATCH] Remove ACL_CONTEXT_MPSIM from kernel_if --- include/acl_kernel_if.h | 2 +- src/acl_hal_mmd.cpp | 4 +++- src/acl_kernel_if.cpp | 16 ++++++---------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/include/acl_kernel_if.h b/include/acl_kernel_if.h index cdbe0808..d52d69df 100644 --- a/include/acl_kernel_if.h +++ b/include/acl_kernel_if.h @@ -93,7 +93,7 @@ typedef struct { // *********************** Public functions ************************** int acl_kernel_if_init(acl_kernel_if *kern, acl_bsp_io bsp_io, - acl_system_def_t *sysdef); + acl_system_def_t *sysdef, bool sim_mmd_dispatch); int acl_kernel_if_update(const acl_device_def_autodiscovery_t &devdef, acl_kernel_if *kern); int acl_kernel_if_is_valid(acl_kernel_if *kern); diff --git a/src/acl_hal_mmd.cpp b/src/acl_hal_mmd.cpp index 545a2fd3..976330a3 100644 --- a/src/acl_hal_mmd.cpp +++ b/src/acl_hal_mmd.cpp @@ -1216,8 +1216,10 @@ static int l_try_device(unsigned int physical_device_id, const char *name, bsp_io_kern[physical_device_id].printf = printf; bsp_io_kern[physical_device_id].debug_verbosity = debug_verbosity; + bool is_simulator = l_is_simulator_dispatch(device->mmd_dispatch); info_assert(acl_kernel_if_init(&kern[physical_device_id], - bsp_io_kern[physical_device_id], sys) == 0, + bsp_io_kern[physical_device_id], sys, + is_simulator) == 0, "Failed to initialize kernel interface"); acl_kernel_if_reset(&kern[physical_device_id]); diff --git a/src/acl_kernel_if.cpp b/src/acl_kernel_if.cpp index 5e4b051f..b31a7567 100644 --- a/src/acl_kernel_if.cpp +++ b/src/acl_kernel_if.cpp @@ -621,7 +621,7 @@ int acl_kernel_if_set_profile_shared_control(acl_kernel_if *kern, // // Returns 0 on success, -ve otherwise int acl_kernel_if_init(acl_kernel_if *kern, acl_bsp_io bsp_io, - acl_system_def_t *sysdef) { + acl_system_def_t *sysdef, bool sim_mmd_dispatch) { char description_size_msb[KERNEL_ROM_SIZE_BYTES_READ + 1]; char description_size_lsb[KERNEL_ROM_SIZE_BYTES_READ + 1]; unsigned int size_location, version, size; @@ -716,15 +716,6 @@ int acl_kernel_if_init(acl_kernel_if *kern, acl_bsp_io bsp_io, auto load_result = acl_load_device_def_from_str( config_string, sysdef->device[kern->physical_device_id].autodiscovery_def, auto_config_err_str); - if (load_result) { - if (acl_platform.offline_mode == ACL_CONTEXT_MPSIM) { - sysdef->device[kern->physical_device_id].autodiscovery_def.name = - ACL_MPSIM_DEVICE_NAME; - sysdef->num_devices = 1; - } else { - ++sysdef->num_devices; - } - } result |= load_result ? 0 : -1; if (result != 0) { @@ -739,6 +730,11 @@ int acl_kernel_if_init(acl_kernel_if *kern, acl_bsp_io bsp_io, result = acl_kernel_if_update( sysdef->device[kern->physical_device_id].autodiscovery_def, kern); + if (sim_mmd_dispatch) { + sysdef->device[kern->physical_device_id].autodiscovery_def.name = + ACL_MPSIM_DEVICE_NAME; + } + return result; }