Moved Wifi Init code to Matter_config.cpp

project-chip · Aug 7, 2023 · f46a22c · f46a22c
1 parent 5a01f2d
commit f46a22c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
@@ -155,6 +155,17 @@ 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

diff --git a/examples/platform/silabs/MatterConfig.h b/examples/platform/silabs/MatterConfig.h
@@ -22,6 +22,16 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/KeyValueStoreManager.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t wfx_wifi_rsi_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+
 class SilabsMatterConfig
 {
 public:

diff --git a/examples/platform/silabs/main.cpp b/examples/platform/silabs/main.cpp
@@ -62,18 +62,6 @@ int main(void)
 
 void application_start(const void *unused)
 {
-
-#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);
-        return;
-    }
-    SILABS_LOG("WIFI init completed");
-#endif // SI917
-
     if (SilabsMatterConfig::InitMatter(BLE_DEV_NAME) != CHIP_NO_ERROR)
         appError(CHIP_ERROR_INTERNAL);