Modifications for 917 NCP and Bugfixes for 917 SOC (#25107)

* Modified wifi_sdk_dir path and added only one flag for 917 NCP Build * Bugfixes for 917 SOC Build failures * Modified condition for 917 NCP * Applied restyle --------- Co-authored-by: srningap <Srishylam.Ningapuram@silabs.com>
project-chip · May 5, 2023 · 2272760 · 2272760
1 parent 5410d99
commit 2272760
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/examples/platform/silabs/SiWx917/uart.cpp b/examples/platform/silabs/SiWx917/uart.cpp
@@ -71,6 +71,7 @@ void ARM_USART_SignalEvent(uint32_t event)
     case ARM_USART_EVENT_DSR:
     case ARM_USART_EVENT_DCD:
     case ARM_USART_EVENT_RI:
+        break;
     }
 }
 

diff --git a/examples/platform/silabs/efr32/rs911x/rs9117.gni b/examples/platform/silabs/efr32/rs911x/rs9117.gni
@@ -1,7 +1,7 @@
 import("//build_overrides/chip.gni")
 
 examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
-wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi"
+wifi_sdk_dir = "${chip_root}/src/platform/silabs/efr32/wifi"
 wisemcu_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
 
 rs911x_src_plat = [

diff --git a/examples/window-app/silabs/SiWx917/src/WindowAppImpl.cpp b/examples/window-app/silabs/SiWx917/src/WindowAppImpl.cpp
@@ -217,7 +217,7 @@ CHIP_ERROR WindowAppImpl::Init()
     char qrCodeBuffer[chip::QRCodeBasicSetupPayloadGenerator::kMaxQRCodeBase38RepresentationLength + 1];
     chip::MutableCharSpan QRCode(qrCodeBuffer);
 
-    if (EFR32::EFR32DeviceDataProvider::GetDeviceDataProvider().GetSetupPayload(QRCode) == CHIP_NO_ERROR)
+    if (SIWx917::SIWx917DeviceDataProvider::GetDeviceDataProvider().GetSetupPayload(QRCode) == CHIP_NO_ERROR)
     {
         PrintQrCodeURL(QRCode);
     }

diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -199,11 +199,15 @@ template("efr32_sdk") {
           "SL_WFX_USE_SPI",
           "EFX32_RS911X=1",
           "RS911X_WIFI",
-          "SiWx917_WIFI",
           "RSI_WLAN_ENABLE",
           "RSI_SPI_INTERFACE",
           "RSI_WITH_OS",
         ]
+      }
+      if (use_SiWx917) {
+        #Added this flag only for SiwX917 NCP board
+        #TODO: Remove when rsi_wlan_ext_stats gets implemented using Wisemcu SDK
+        defines += [ "SiWx917_WIFI" ]
       } else if (use_wf200) {
         defines += [
           "SL_HEAP_SIZE=24576",
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,6 +71,7 @@ void ARM_USART_SignalEvent(uint32_t event) @@
         case ARM_USART_EVENT_DSR:
         case ARM_USART_EVENT_DCD:
         case ARM_USART_EVENT_RI:
+            break;
         }
     }
@@ Expand Down @@