Renaming Wiseconnect variable name to Wisemcu for SiWx917 SOC Radio B…

…oard
project-chip · Feb 3, 2023 · c194983 · c194983
1 parent f990d5d
commit c194983
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 66 deletions.
diff --git a/examples/light-switch-app/silabs/SiWx917/BUILD.gn b/examples/light-switch-app/silabs/SiWx917/BUILD.gn
@@ -122,7 +122,6 @@ if (chip_enable_wifi) {
     efr32_lwip_defs += [ "LWIP_IPV6=0" ]
   }
 
-  wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
   import("${examples_plat_dir}/SiWx917/rs911x.gni")
 }
 

diff --git a/examples/lighting-app/silabs/SiWx917/BUILD.gn b/examples/lighting-app/silabs/SiWx917/BUILD.gn
@@ -128,7 +128,6 @@ if (chip_enable_wifi) {
     efr32_lwip_defs += [ "LWIP_IPV6=0" ]
   }
 
-  wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
   import("${examples_plat_dir}/SiWx917/rs911x.gni")
 }
 

diff --git a/examples/lock-app/silabs/SiWx917/BUILD.gn b/examples/lock-app/silabs/SiWx917/BUILD.gn
@@ -121,8 +121,6 @@ if (chip_enable_wifi) {
   } else {
     efr32_lwip_defs += [ "LWIP_IPV6=0" ]
   }
-
-  wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
   import("${examples_plat_dir}/SiWx917/rs911x.gni")
 }
 

diff --git a/examples/platform/silabs/SiWx917/SiWx917/rs911x.gni b/examples/platform/silabs/SiWx917/SiWx917/rs911x.gni
@@ -4,7 +4,7 @@ import("//build_overrides/pigweed.gni")
 
 examples_plat_dir = "${chip_root}/examples/platform/silabs/SiWx917"
 wifi_sdk_dir = "${chip_root}/src/platform/silabs/SiWx917/wifi"
-wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
+wisemcu_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
 rs911x_cflags = []
 
 rs911x_src_plat = [
@@ -15,60 +15,59 @@ rs911x_src_plat = [
   "${examples_plat_dir}/SiWx917/hal/rsi_hal_mcu_timer.c",
   "${examples_plat_dir}/SiWx917/hal/rsi_hal_mcu_platform_init.c",
 
-  "${wiseconnect_sdk_root}/platforms/si91x/hal/src/rsi_bootup_config.c",
-  "${wiseconnect_sdk_root}/platforms/si91x/hal/src/rsi_hal_mcu_m4.c",
-  "${wiseconnect_sdk_root}/platforms/si91x/hal/src/rsi_hal_mcu_m4_rom.c",
-  "${wiseconnect_sdk_root}/platforms/si91x/hal/src/rsi_hal_mcu_interrupt.c",
+  "${wisemcu_sdk_root}/platforms/si91x/hal/src/rsi_bootup_config.c",
+  "${wisemcu_sdk_root}/platforms/si91x/hal/src/rsi_hal_mcu_m4.c",
+  "${wisemcu_sdk_root}/platforms/si91x/hal/src/rsi_hal_mcu_m4_rom.c",
+  "${wisemcu_sdk_root}/platforms/si91x/hal/src/rsi_hal_mcu_interrupt.c",
 ]
 rs911x_plat_incs = [
   "${wifi_sdk_dir}",
   "${wifi_sdk_dir}/hal",
-  "${wiseconnect_sdk_root}/platforms/si91x/hal/inc",
+  "${wisemcu_sdk_root}/platforms/si91x/hal/inc",
 
-  #  "${wiseconnect_sdk_root}/sapi/include",
   "${chip_root}/src/platform/silabs/SiWx917",
   "${chip_root}/src/platform/silabs/SiWx917/bluetooth",
   "${examples_plat_dir}/SiWx917",
-  "${wiseconnect_sdk_root}/platforms/si91x/hal/inc",
+  "${wisemcu_sdk_root}/platforms/si91x/hal/inc",
 ]
 
 #
 # All the stuff from wiseconnect
 #
 rs911x_src_sapi = [
-  "${wiseconnect_sdk_root}/sapi/wlan/rsi_wlan_apis.c",
-  "${wiseconnect_sdk_root}/sapi/common/rsi_apis_non_rom.c",
-  "${wiseconnect_sdk_root}/sapi/common/rsi_apis_rom.c",
-  "${wiseconnect_sdk_root}/sapi/common/rsi_common_apis.c",
-  "${wiseconnect_sdk_root}/sapi/common/rsi_device_init_apis.c",
+  "${wisemcu_sdk_root}/sapi/wlan/rsi_wlan_apis.c",
+  "${wisemcu_sdk_root}/sapi/common/rsi_apis_non_rom.c",
+  "${wisemcu_sdk_root}/sapi/common/rsi_apis_rom.c",
+  "${wisemcu_sdk_root}/sapi/common/rsi_common_apis.c",
+  "${wisemcu_sdk_root}/sapi/common/rsi_device_init_apis.c",
 
-  #  "${wiseconnect_sdk_root}/sapi/common/rsi_wisemcu_hardware_setup.c",
-  "${wiseconnect_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_frame_rd_wr.c",
-  "${wiseconnect_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_functs.c",
-  "${wiseconnect_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_iface_init.c",
-  "${wiseconnect_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_mem_rd_wr.c",
-  "${wiseconnect_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_reg_rd_wr.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_common.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_device_init.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_driver_event_handlers.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_driver.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_events_rom.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_events.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_iap.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_nwk_rom.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_nwk.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_pkt_mgmt_rom.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_pkt_mgmt.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_queue_rom.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_queue.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_scheduler_rom.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_scheduler.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_setregion_countryinfo.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_timer.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_utils_rom.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_utils.c",
-  "${wiseconnect_sdk_root}/sapi/driver/rsi_wlan.c",
-  "${wiseconnect_sdk_root}/sapi/rtos/freertos_wrapper/rsi_os_wrapper.c",
+  #  "${wisemcu_sdk_root}/sapi/common/rsi_wisemcu_hardware_setup.c",
+  "${wisemcu_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_frame_rd_wr.c",
+  "${wisemcu_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_functs.c",
+  "${wisemcu_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_iface_init.c",
+  "${wisemcu_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_mem_rd_wr.c",
+  "${wisemcu_sdk_root}/sapi/driver/device_interface/spi/rsi_spi_reg_rd_wr.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_common.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_device_init.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_driver_event_handlers.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_driver.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_events_rom.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_events.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_iap.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_nwk_rom.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_nwk.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_pkt_mgmt_rom.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_pkt_mgmt.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_queue_rom.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_queue.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_scheduler_rom.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_scheduler.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_setregion_countryinfo.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_timer.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_utils_rom.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_utils.c",
+  "${wisemcu_sdk_root}/sapi/driver/rsi_wlan.c",
+  "${wisemcu_sdk_root}/sapi/rtos/freertos_wrapper/rsi_os_wrapper.c",
 ]
 
 foreach(src_file, rs911x_src_sapi) {
@@ -89,28 +88,28 @@ rs911x_inc_plat = [
   "${wifi_sdk_dir}",
   "${examples_plat_dir}/SiWx917",
   "${examples_plat_dir}/SiWx917/hal",
-  "${wiseconnect_sdk_root}/sapi/include",
+  "${wisemcu_sdk_root}/sapi/include",
 
   #CCP Platfrom
-  "${wiseconnect_sdk_root}/platforms/si91x/hal/inc",
-  "${wiseconnect_sdk_root}/platforms/si91x/boards/brd4325a/inc",
-  "${wiseconnect_sdk_root}/platforms/si91x/drivers/peripheral_drivers/inc",
-  "${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/inc",
-  "${wiseconnect_sdk_root}/platforms/si91x/core/chip/inc",
-  "${wiseconnect_sdk_root}/platforms/si91x/core/config",
-  "${wiseconnect_sdk_root}/platforms/si91x/drivers/cmsis_driver/config",
-  "${wiseconnect_sdk_root}/platforms/si91x/drivers/rom_driver/inc",
-  "${wiseconnect_sdk_root}/platforms/si91x/drivers/cmsis_driver",
-  "${wiseconnect_sdk_root}/platforms/si91x/drivers/cmsis_driver/CMSIS/Driver/Include",
+  "${wisemcu_sdk_root}/platforms/si91x/hal/inc",
+  "${wisemcu_sdk_root}/platforms/si91x/boards/brd4325a/inc",
+  "${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/inc",
+  "${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/inc",
+  "${wisemcu_sdk_root}/platforms/si91x/core/chip/inc",
+  "${wisemcu_sdk_root}/platforms/si91x/core/config",
+  "${wisemcu_sdk_root}/platforms/si91x/drivers/cmsis_driver/config",
+  "${wisemcu_sdk_root}/platforms/si91x/drivers/rom_driver/inc",
+  "${wisemcu_sdk_root}/platforms/si91x/drivers/cmsis_driver",
+  "${wisemcu_sdk_root}/platforms/si91x/drivers/cmsis_driver/CMSIS/Driver/Include",
 
-  "${wiseconnect_sdk_root}/platforms/si91x/core/cmsis",
-  "${wiseconnect_sdk_root}/platforms/si91x/service/system/inc",
+  "${wisemcu_sdk_root}/platforms/si91x/core/cmsis",
+  "${wisemcu_sdk_root}/platforms/si91x/service/system/inc",
 ]
 
 # Apparently - the rsi library needs this
 rs911x_src_sock = [
-  "${wiseconnect_sdk_root}/sapi/network/socket/rsi_socket.c",
-  "${wiseconnect_sdk_root}/sapi/network/socket/rsi_socket_rom.c",
+  "${wisemcu_sdk_root}/sapi/network/socket/rsi_socket.c",
+  "${wisemcu_sdk_root}/sapi/network/socket/rsi_socket_rom.c",
 ]
 rs911x_sock_inc = [ "${wifi_sdk_dir}/rsi-sockets" ]
 

diff --git a/examples/window-app/silabs/SiWx917/BUILD.gn b/examples/window-app/silabs/SiWx917/BUILD.gn
@@ -121,7 +121,6 @@ if (chip_enable_wifi) {
     efr32_lwip_defs += [ "LWIP_IPV6=0" ]
   }
 
-  wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
   import("${examples_plat_dir}/SiWx917/rs911x.gni")
 }
 

diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -24,7 +24,7 @@ declare_args() {
   # Location of the efr32 SDK.
   efr32_sdk_root = "${chip_root}/third_party/silabs/gecko_sdk"
   sdk_support_root = "${chip_root}/third_party/silabs/matter_support"
-  wiseconnect_sdk_root =
+  wisemcu_sdk_root =
       "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
   wisemcu_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
   examples_plat_dir = "${chip_root}/examples/platform/silabs/SiWx917"
@@ -89,7 +89,7 @@ template("efr32_sdk") {
       "${wisemcu_sdk_root}/third_party/freertos/portable/GCC/ARM_CM4F",
       "${examples_plat_dir}/device/inc",
 
-      "${wiseconnect_sdk_root}/sapi/include",
+      "${wisemcu_sdk_root}/sapi/include",
 
       "${chip_root}/examples/platform/SiWx917/SiWx917",
       "${chip_root}/examples/platform/SiWx917/SiWx917/hal",
@@ -252,10 +252,10 @@ template("efr32_sdk") {
       "${wisemcu_sdk_root}/platforms/si91x/core/chip/src/system_RS1xxxx.c",
 
       # Bluetooth
-      "${wiseconnect_sdk_root}/sapi/bluetooth/rsi_ble_gap_apis.c",
-      "${wiseconnect_sdk_root}/sapi/bluetooth/rsi_ble_gatt_apis.c",
-      "${wiseconnect_sdk_root}/sapi/bluetooth/rsi_bt_common_apis.c",
-      "${wiseconnect_sdk_root}/sapi/driver/rsi_bt_ble.c",
+      "${wisemcu_sdk_root}/sapi/bluetooth/rsi_ble_gap_apis.c",
+      "${wisemcu_sdk_root}/sapi/bluetooth/rsi_ble_gatt_apis.c",
+      "${wisemcu_sdk_root}/sapi/bluetooth/rsi_bt_common_apis.c",
+      "${wisemcu_sdk_root}/sapi/driver/rsi_bt_ble.c",
       "${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/clock_update.c",
       "${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_comparator.c",
       "${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_egpio.c",