removing the --wifi SiWx917 flag, removing duplicates and address few…

… review comments
project-chip · Mar 19, 2023 · 19094be · 19094be
1 parent 0964403
commit 19094be
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 238 deletions.
diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -20,6 +20,7 @@ import("${chip_root}/src/platform/device.gni")
 import("${efr32_sdk_build_root}/SiWx917_sdk.gni")
 import("${chip_root}/third_party/silabs/silabs_board.gni")
 silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
+wifi_sdk_dir = "${chip_root}/src/platform/silabs/SiWx917/wifi"
 
 declare_args() {
   enable_heap_monitoring = false
@@ -44,17 +45,13 @@ declare_args() {
   chip_default_wifi_psk = ""
 }
 
-silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
-
 import("${silabs_common_plat_dir}/SiWx917/args.gni")
 
 # Sanity check
 assert(chip_enable_wifi)
-assert(use_SiWx917)
 import("${chip_root}/src/platform/silabs/SiWx917/args.gni")
 wisemcu_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
-import("SiWx917/rs911x.gni")
-
+silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 config("chip_examples_project_config") {
   include_dirs = [ "project_include" ]
@@ -82,7 +79,11 @@ source_set("siwx917-matter-shell") {
   if (chip_build_libshell) {
     defines = [ "ENABLE_CHIP_SHELL" ]
 
-    sources = [ "${silabs_common_plat_dir}/matter_shell.cpp" ]
+    sources = [
+      "${silabs_common_plat_dir}/matter_shell.cpp",
+      "${wisemcu_sdk_root}/platforms/si91x/drivers/cmsis_driver/UDMA.c",
+      "${wisemcu_sdk_root}/platforms/si91x/drivers/cmsis_driver/USART.c",
+    ]
     include_dirs = [
       ".",
       "${silabs_common_plat_dir}",
@@ -160,14 +161,14 @@ config("silabs-wifi-config") {
 
   if (chip_default_wifi_ssid != "") {
     defines += [
-      "CHIP_ONNETWORK_PAIRING=1",
-      "CHIP_WIFI_SSID=\"${chip_default_wifi_ssid}\"",
+      "SL_ONNETWORK_PAIRING=1",
+      "SL_WIFI_SSID=\"${chip_default_wifi_ssid}\"",
     ]
   }
   if (chip_default_wifi_psk != "") {
     assert(chip_default_wifi_ssid != "",
            "ssid can't be null if psk is provided")
-    defines += [ "CHIP_WIFI_PSK=\"${chip_default_wifi_psk}\"" ]
+    defines += [ "SL_WIFI_PSK=\"${chip_default_wifi_psk}\"" ]
   }
 
   if (sl_wfx_config_softap) {
@@ -195,13 +196,24 @@ source_set("siwx917-common") {
     "${efr32_sdk_build_root}:silabs_config",
   ]
 
-  include_dirs = [ "." ]
+  include_dirs = [
+    ".",
+    "SiWx917/",
+    "${wifi_sdk_dir}",
+    "${wifi_sdk_dir}/hal",
+  ]
 
   sources = [
     "${silabs_common_plat_dir}/heap_4_silabs.c",
+    "${wifi_sdk_dir}/ethernetif.cpp",
+    "${wifi_sdk_dir}/dhcp_client.cpp",
+    "${wifi_sdk_dir}/lwip_netif.cpp",
+    "${wifi_sdk_dir}/wfx_notify.cpp",
     "siwx917_utils.cpp",
     "init_ccpPlatform.cpp",
     "matter_config.cpp",
+    "SiWx917/rsi_if.c",
+    "SiWx917/wfx_rsi_host.c",
   ]
 
   if (use_base_app) {
@@ -235,14 +247,6 @@ source_set("siwx917-common") {
   }
 
   if (chip_enable_wifi) {
-    sources += rs911x_src_plat
-
-    # All the stuff from wiseconnect
-    sources += rs911x_src_sapi
-    include_dirs += rs911x_inc_plat
-
-    #add compilation flags for rs991x build. This will be addressed directly in wiseconnect sdk in the next version release of that sdk
-    cflags = rs911x_cflags
 
     public_configs += [ ":silabs-wifi-config" ]
   }

diff --git a/examples/platform/silabs/SiWx917/SiWx917/rs911x.gni b/examples/platform/silabs/SiWx917/SiWx917/rs911x.gni
diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
@@ -209,14 +209,14 @@ config("silabs-wifi-config") {
 
   if (chip_default_wifi_ssid != "") {
     defines += [
-      "CHIP_ONNETWORK_PAIRING=1",
-      "CHIP_WIFI_SSID=\"${chip_default_wifi_ssid}\"",
+      "SL_ONNETWORK_PAIRING=1",
+      "SL_WIFI_SSID=\"${chip_default_wifi_ssid}\"",
     ]
   }
   if (chip_default_wifi_psk != "") {
     assert(chip_default_wifi_ssid != "",
            "ssid can't be null if psk is provided")
-    defines += [ "CHIP_WIFI_PSK=\"${chip_default_wifi_psk}\"" ]
+    defines += [ "SL_WIFI_PSK=\"${chip_default_wifi_psk}\"" ]
   }
 
   if (sl_wfx_config_softap) {

diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_efr32_example.sh
@@ -221,16 +221,10 @@ else
     echo BUILD_DIR="$BUILD_DIR"
     if [ "$USE_WIFI" == true ]; then
         # wifi build
-        #
-        if [[ $SILABS_BOARD == *"BRD4325B"* ]]; then
-            # SOC chip
-            gn gen --check --fail-on-used-args --export-compile-commands --root="$ROOT" --args="silabs_board=\"$SILABS_BOARD\" $optArgs" "$BUILD_DIR"
-        else
-            # NCP mode EFR32 + wifi module
-            gn gen --check --fail-on-unused-args --export-compile-commands --root="$ROOT" --dotfile="$ROOT"/build_for_wifi_gnfile.gn --args="silabs_board=\"$SILABS_BOARD\" $optArgs" "$BUILD_DIR"
-        fi
+        # NCP mode EFR32 + wifi module
+        gn gen --check --fail-on-unused-args --export-compile-commands --root="$ROOT" --dotfile="$ROOT"/build_for_wifi_gnfile.gn --args="silabs_board=\"$SILABS_BOARD\" $optArgs" "$BUILD_DIR"
     else
-        # thread build
+        # thread/SoC build
         #
         if [ -z "$optArgs" ]; then
             gn gen --check --fail-on-unused-args --export-compile-commands --root="$ROOT" --args="silabs_board=\"$SILABS_BOARD\"" "$BUILD_DIR"

diff --git a/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp b/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp
@@ -262,7 +262,7 @@ void ConnectivityManagerImpl::DriveStationState()
         // If the WiFi station interface is no longer enabled, or no longer provisioned,
         // disconnect the station from the AP, unless the WiFi station mode is currently
         // under application control.
-#ifndef CHIP_ONNETWORK_PAIRING
+#ifndef SL_ONNETWORK_PAIRING
         // Incase of station interface disabled & provisioned, wifi_station should not be disconnected.
         // Device will try to reconnect.
         if (mWiFiStationMode != kWiFiStationMode_ApplicationControlled &&

diff --git a/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp b/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp
@@ -43,11 +43,11 @@ CHIP_ERROR SlWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeC
     mpScanCallback        = nullptr;
     mpConnectCallback     = nullptr;
 
-#ifdef CHIP_ONNETWORK_PAIRING
-    memcpy(&mSavedNetwork.ssid[0], CHIP_WIFI_SSID, sizeof(CHIP_WIFI_SSID));
-    memcpy(&mSavedNetwork.credentials[0], CHIP_WIFI_PSK, sizeof(CHIP_WIFI_PSK));
-    credentialsLen               = sizeof(CHIP_WIFI_PSK);
-    ssidLen                      = sizeof(CHIP_WIFI_SSID);
+#ifdef SL_ONNETWORK_PAIRING
+    memcpy(&mSavedNetwork.ssid[0], SL_WIFI_SSID, sizeof(SL_WIFI_SSID));
+    memcpy(&mSavedNetwork.credentials[0], SL_WIFI_PSK, sizeof(SL_WIFI_PSK));
+    credentialsLen               = sizeof(SL_WIFI_PSK);
+    ssidLen                      = sizeof(SL_WIFI_SSID);
     mSavedNetwork.credentialsLen = credentialsLen;
     mSavedNetwork.ssidLen        = ssidLen;
     mStagingNetwork              = mSavedNetwork;