Review Comment solved

project-chip · Aug 9, 2023 · 1d0a756 · 1d0a756
1 parent 2a1c862
commit 1d0a756
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 312 deletions.
diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
@@ -155,17 +155,6 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     SILABS_LOG("%s starting", appName);
     SILABS_LOG("==================================================");
 
-#ifdef SI917
-    sl_status_t status;
-    SILABS_LOG("Wireless init starting");
-    if ((status = wfx_wifi_rsi_init()) != SL_STATUS_OK)
-    {
-        SILABS_LOG("wfx_wifi_start() failed: %s", status);
-        ReturnErrorOnFailure((CHIP_ERROR)status);
-    }
-    SILABS_LOG("WIFI init completed");
-#endif // SI917
-
 #if PW_RPC_ENABLED
     chip::rpc::Init();
 #endif
@@ -275,6 +264,15 @@ CHIP_ERROR SilabsMatterConfig::InitWiFi(void)
     wfx_securelink_task_start(); // start securelink key renegotiation task
 #endif                           // SL_WFX_USE_SECURE_LINK
 #endif /* WF200_WIFI */
+
+#ifdef SI917
+    sl_status_t status;
+    if ((status = wfx_wifi_rsi_init()) != SL_STATUS_OK)
+    {
+        ReturnErrorOnFailure((CHIP_ERROR)status);
+    }
+#endif // SI917
+
     return CHIP_NO_ERROR;
 }
 #endif // SL_WIFI

diff --git a/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c b/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c
@@ -17,7 +17,6 @@
 
 #include "rsi_board.h"
 #include "rsi_chip.h"
-#include "rsi_driver.h"
 #include "rsi_m4.h"
 #ifdef COMMON_FLASH_EN
 #include "rsi_power_save.h"
@@ -94,4 +93,4 @@ void IRQ021_Handler(void)
         btn0 = 0;
         sl_button_on_change(0, 1);
     }
-}
+}
diff --git a/examples/platform/silabs/SiWx917/init_ccpPlatform.cpp b/examples/platform/silabs/SiWx917/init_ccpPlatform.cpp
diff --git a/examples/platform/silabs/SilabsDeviceDataProvider.cpp b/examples/platform/silabs/SilabsDeviceDataProvider.cpp
@@ -25,7 +25,6 @@
 
 #ifdef SIWX917_USE_COMISSIONABLE_DATA
 #include "DeviceConfig.h"
-#include "siwx917_utils.h"
 #include <setup_payload/Base38Decode.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #endif // SIWX917_USE_COMISSIONABLE_DATA

diff --git a/examples/platform/silabs/ldscripts/SiWx917.ld b/examples/platform/silabs/ldscripts/SiWx917.ld
diff --git a/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp b/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp
@@ -25,11 +25,14 @@
 #endif
 
 // TODO add includes ?
-extern "C" void RSI_Board_LED_Set(int, bool);
-extern "C" void RSI_Board_LED_Toggle(int);
-extern "C" void RSI_Wakeupsw_config(void);
-extern "C" void RSI_Wakeupsw_config_gpio0(void);
-extern "C" void sl_platform_init(void);
+extern "C" { 
+#include "sl_event_handler.h"
+
+void RSI_Board_LED_Set(int, bool);
+void RSI_Board_LED_Toggle(int);
+void RSI_Wakeupsw_config(void);
+void RSI_Wakeupsw_config_gpio0(void);
+}
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/third_party/silabs/BUILD.gn b/third_party/silabs/BUILD.gn
@@ -18,7 +18,7 @@ import("//build_overrides/jlink.gni")
 import("${chip_root}/src/platform/device.gni")
 import("${efr32_sdk_build_root}/silabs_board.gni")
 
-if ((silabs_board == "BRD4325B") || (silabs_board == "BRD4325C") || (silabs_board == "BRD4325G")) {  # CCP board
+if (wifi_soc == true) {  # CCP board
   import("${efr32_sdk_build_root}/SiWx917_sdk.gni")
 } else {
   import("${efr32_sdk_build_root}/efr32_sdk.gni")
@@ -53,7 +53,7 @@ group("efr32_sdk") {
   public_configs = [ ":silabs_config" ]
 }
 
-if ((silabs_board != "BRD4325B") || (silabs_board != "BRD4325C") || (silabs_board != "BRD4325G")) {  # CCP board
+if (wifi_soc != true) {  # CCP board
   # Openthread GSDK libraries configurations
   if (use_silabs_thread_lib) {
     config("libopenthread-platform_config") {

diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -152,15 +152,11 @@ template("siwx917_sdk") {
       "SL_PLATFORM_EXAMPLES_ENABLE",
       "SI91X_DEVICE",
       "SI917_RADIO_BOARD",
-      # "SL_NET_COMPONENT_INCLUDED",
       "FLASH_PAGE_SIZE",
       "SL_NVM3_PRESENT",
       "ROM_WIRELESS",
       "SRAM_BASE=0x0C000000UL",
       "SRAM_SIZE=0x00040000UL",
-      # "SL_ONNETWORK_PAIRING=1",
-      # "SL_WIFI_SSID=\"matter_openwrt\"",
-      # "SL_WIFI_PSK=\"matter@123\"",
     ]
 
     if ( silabs_board == "BRD4325B" ) {