From 3ca48190aec23154b9ba3d02be61c5574296b5b8 Mon Sep 17 00:00:00 2001
From: bhmanda-silabs <107180296+bhmanda-silabs@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:26:30 +0530
Subject: [PATCH] [SL-UP] Changes for wifi sdk 3.4.0 (#89)

---
 examples/platform/silabs/BaseApplication.cpp           |  2 +-
 .../platform/silabs/SiWx917/SiWx917/sl_wlan_config.h   | 10 +---------
 .../platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c  |  2 +-
 examples/platform/silabs/wifi/wfx_notify.cpp           |  2 +-
 src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp  |  2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp
index dfcf8915fc..b577382705 100644
--- a/examples/platform/silabs/BaseApplication.cpp
+++ b/examples/platform/silabs/BaseApplication.cpp
@@ -194,7 +194,7 @@ void BaseApplicationDelegate::OnCommissioningWindowClosed()
 #if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
     if (!BaseApplication::GetProvisionStatus() && !isComissioningStarted)
     {
-        int32_t status = wfx_power_save(RSI_SLEEP_MODE_8, STANDBY_POWER_SAVE_WITH_RAM_RETENTION);
+        int32_t status = wfx_power_save(RSI_SLEEP_MODE_8, DEEP_SLEEP_WITH_RAM_RETENTION);
         if (status != SL_STATUS_OK)
         {
             ChipLogError(AppServer, "Failed to enable the TA Deep Sleep");
diff --git a/examples/platform/silabs/SiWx917/SiWx917/sl_wlan_config.h b/examples/platform/silabs/SiWx917/SiWx917/sl_wlan_config.h
index 21ee4a5555..cd605b0f0a 100644
--- a/examples/platform/silabs/SiWx917/SiWx917/sl_wlan_config.h
+++ b/examples/platform/silabs/SiWx917/SiWx917/sl_wlan_config.h
@@ -29,19 +29,11 @@
 //! Disable feature
 #define RSI_DISABLE 0
 
-// Temmporary work-around for wifi-init failure in ACX modules with WiseConnect v3.3.3. This can be removed after integrating with
-// WiseConnect v3.4.0
-#if (SL_SI91X_ACX_MODULE == 1)
-#define REGION_CODE IGNORE_REGION
-#else
-#define REGION_CODE US
-#endif
-
 static const sl_wifi_device_configuration_t config = {
     .boot_option = LOAD_NWP_FW,
     .mac_address = NULL,
     .band        = SL_SI91X_WIFI_BAND_2_4GHZ,
-    .region_code = REGION_CODE,
+    .region_code = US,
     .boot_config = { .oper_mode = SL_SI91X_CLIENT_MODE,
                      .coex_mode = SL_SI91X_WLAN_BLE_MODE,
                      .feature_bit_map =
diff --git a/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c b/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c
index 0a2fad7d0d..6703e2b287 100644
--- a/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c
+++ b/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c
@@ -151,7 +151,7 @@ uint32_t sl_si91x_host_get_wake_indicator(void)
     return GPIO_PinInGet(WAKE_INDICATOR_PIN.port, WAKE_INDICATOR_PIN.pin);
 }
 
-sl_status_t sl_si91x_host_init(sl_si91x_host_init_configuration * config)
+sl_status_t sl_si91x_host_init(const sl_si91x_host_init_configuration * config)
 {
 #if SL_SPICTRL_MUX
     sl_status_t status = sl_board_disable_display();
diff --git a/examples/platform/silabs/wifi/wfx_notify.cpp b/examples/platform/silabs/wifi/wfx_notify.cpp
index de1becacb3..f9d1d4f61e 100644
--- a/examples/platform/silabs/wifi/wfx_notify.cpp
+++ b/examples/platform/silabs/wifi/wfx_notify.cpp
@@ -219,7 +219,7 @@ void wfx_retry_connection(uint16_t retryAttempt)
             return;
         }
 #if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
-        wfx_rsi_power_save(RSI_SLEEP_MODE_8, STANDBY_POWER_SAVE_WITH_RAM_RETENTION);
+        wfx_rsi_power_save(RSI_SLEEP_MODE_8, DEEP_SLEEP_WITH_RAM_RETENTION);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
         ChipLogProgress(DeviceLayer, "wfx_retry_connection : Next attempt after %d Seconds", retryInterval);
         retryInterval += retryInterval;
diff --git a/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp b/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp
index d641bfa61f..c954600873 100644
--- a/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp
+++ b/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp
@@ -238,7 +238,7 @@ void OTAImageProcessorImpl::HandleApply(intptr_t context)
         // send system reset request to reset the MCU and upgrade the m4 image
         ChipLogProgress(SoftwareUpdate, "SoC Soft Reset initiated!");
         // Reboots the device
-        sl_si91x_soc_soft_reset();
+        sl_si91x_soc_nvic_reset();
     }
 }