Fix builds

mkardous-silabs · mkardous-silabs · commit 526541a9b39f · 2025-02-27T15:06:43.000-05:00
diff --git a/src/platform/silabs/DiagnosticDataProviderImpl.cpp b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
@@ -35,7 +35,6 @@
 #include <sl_cmsis_os2_common.h>
 
 using namespace ::chip::app::Clusters::GeneralDiagnostics;
-using namespace ::chip::DeviceLayer::Silabs;
 
 namespace chip {
 namespace DeviceLayer {
@@ -341,7 +340,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(MutableByteSpan & BssId)
 
     VerifyOrReturnError(BssId.size() >= bssIdSize, CHIP_ERROR_BUFFER_TOO_SMALL);
 
-    if (WifiInterface::GetInstance().GetAccessPointInfo(ap) == CHIP_NO_ERROR)
+    if (Silabs::WifiInterface::GetInstance().GetAccessPointInfo(ap) == CHIP_NO_ERROR)
     {
         memcpy(BssId.data(), ap.bssid, bssIdSize);
         BssId.reduce_size(bssIdSize);
@@ -356,7 +355,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNe
     using app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum;
 
     wfx_wifi_scan_result_t ap = { 0 };
-    CHIP_ERROR error          = WifiInterface::GetInstance().GetAccessPointInfo(ap);
+    CHIP_ERROR error          = Silabs::WifiInterface::GetInstance().GetAccessPointInfo(ap);
     if (error == CHIP_NO_ERROR)
     {
         // TODO: Is this actually right?  Do the wfx_wifi_scan_result_t values
@@ -376,7 +375,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetwork
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiChannelNumber(uint16_t & channelNumber)
 {
     wfx_wifi_scan_result_t ap = { 0 };
-    CHIP_ERROR error          = WifiInterface::GetInstance().GetAccessPointInfo(ap);
+    CHIP_ERROR error          = Silabs::WifiInterface::GetInstance().GetAccessPointInfo(ap);
     if (error == CHIP_NO_ERROR)
     {
         channelNumber = ap.chan;
@@ -388,7 +387,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiChannelNumber(uint16_t & channelNu
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi)
 {
     wfx_wifi_scan_result_t ap = { 0 };
-    CHIP_ERROR error          = WifiInterface::GetInstance().GetAccessPointInfo(ap);
+    CHIP_ERROR error          = Silabs::WifiInterface::GetInstance().GetAccessPointInfo(ap);
     if (error == CHIP_NO_ERROR)
     {
         rssi = ap.rssi;
@@ -400,7 +399,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi)
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconLostCount(uint32_t & beaconLostCount)
 {
     wfx_wifi_scan_ext_t extra_info = { 0 };
-    CHIP_ERROR error               = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
+    CHIP_ERROR error               = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
     if (error == CHIP_NO_ERROR)
     {
         beaconLostCount = extra_info.beacon_lost_count;
@@ -417,7 +416,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiCurrentMaxRate(uint64_t & currentM
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastRxCount(uint32_t & packetMulticastRxCount)
 {
     wfx_wifi_scan_ext_t extra_info = { 0 };
-    CHIP_ERROR error               = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
+    CHIP_ERROR error               = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
     if (error == CHIP_NO_ERROR)
     {
         packetMulticastRxCount = extra_info.mcast_rx_count;
@@ -429,7 +428,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastRxCount(uint32_t &
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastTxCount(uint32_t & packetMulticastTxCount)
 {
     wfx_wifi_scan_ext_t extra_info = { 0 };
-    CHIP_ERROR error               = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
+    CHIP_ERROR error               = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
     if (error == CHIP_NO_ERROR)
     {
         packetMulticastTxCount = extra_info.mcast_tx_count;
@@ -441,7 +440,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastTxCount(uint32_t &
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastRxCount(uint32_t & packetUnicastRxCount)
 {
     wfx_wifi_scan_ext_t extra_info = { 0 };
-    CHIP_ERROR error               = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
+    CHIP_ERROR error               = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
     if (error == CHIP_NO_ERROR)
     {
         packetUnicastRxCount = extra_info.ucast_rx_count;
@@ -453,7 +452,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastRxCount(uint32_t & pa
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastTxCount(uint32_t & packetUnicastTxCount)
 {
     wfx_wifi_scan_ext_t extra_info = { 0 };
-    CHIP_ERROR error               = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
+    CHIP_ERROR error               = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
     if (error == CHIP_NO_ERROR)
     {
         packetUnicastTxCount = extra_info.ucast_tx_count;
@@ -465,7 +464,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastTxCount(uint32_t & pa
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiOverrunCount(uint64_t & overrunCount)
 {
     wfx_wifi_scan_ext_t extra_info = { 0 };
-    CHIP_ERROR error               = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
+    CHIP_ERROR error               = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
     if (error == CHIP_NO_ERROR)
     {
         overrunCount = extra_info.overrun_count;
@@ -477,7 +476,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiOverrunCount(uint64_t & overrunCou
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconRxCount(uint32_t & beaconRxCount)
 {
     wfx_wifi_scan_ext_t extra_info = { 0 };
-    CHIP_ERROR error               = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
+    CHIP_ERROR error               = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);
     if (error == CHIP_NO_ERROR)
     {
         beaconRxCount = extra_info.beacon_rx_count;
@@ -488,7 +487,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconRxCount(uint32_t & beaconRxC
 
 CHIP_ERROR DiagnosticDataProviderImpl::ResetWiFiNetworkDiagnosticsCounts()
 {
-    return WifiInterface::GetInstance().ResetCounters();
+    return Silabs::WifiInterface::GetInstance().ResetCounters();
 }
 #endif // SL_WIFI
 
diff --git a/src/platform/silabs/PlatformManagerImpl.cpp b/src/platform/silabs/PlatformManagerImpl.cpp
@@ -30,7 +30,10 @@
 #include <platform/PlatformManager.h>
 #include <platform/internal/GenericPlatformManagerImpl_CMSISOS.ipp>
 #include <platform/silabs/DiagnosticDataProviderImpl.h>
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
 #include <platform/silabs/wifi/WifiInterface.h>
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
 
 #if defined(SL_MBEDTLS_USE_TINYCRYPT)
 #include "tinycrypt/ecc.h"
@@ -41,7 +44,6 @@
 #endif // CHIP_SYSTEM_CONFIG_USE_LWIP
 
 using namespace chip::DeviceLayer::Internal;
-using namespace chip::DeviceLayer::Silabs;
 
 namespace chip {
 namespace DeviceLayer {
@@ -147,6 +149,7 @@ void HandleWFXSystemEvent(sl_wfx_generic_message_t * eventData)
 {
     using namespace chip;
     using namespace chip::DeviceLayer;
+    using namespace chip::DeviceLayer::Silabs;
 
     ChipDeviceEvent event;
     memset(&event, 0, sizeof(event));
diff --git a/src/platform/silabs/wifi/WifiInterface.h b/src/platform/silabs/wifi/WifiInterface.h
@@ -26,6 +26,9 @@
 #include <sl_status.h>
 
 #if (SLI_SI91X_MCU_INTERFACE | EXP_BOARD)
+#include "rsi_common_apis.h"
+#include "sl_si91x_types.h"
+#include "sl_wifi_constants.h"
 #include "sl_wifi_device.h"
 #endif // (SLI_SI91X_MCU_INTERFACE | EXP_BOARD)
 
diff --git a/src/platform/silabs/wifi/icd/WifiSleepManager.cpp b/src/platform/silabs/wifi/icd/WifiSleepManager.cpp
@@ -20,6 +20,8 @@
 #include <platform/silabs/wifi/WifiInterface.h>
 #include <platform/silabs/wifi/icd/WifiSleepManager.h>
 
+using namespace chip::DeviceLayer::Silabs;
+
 namespace {
 
 // TODO: Once the platform sleep calls are unified, we can removed this ifdef
@@ -33,10 +35,10 @@ namespace {
  */
 CHIP_ERROR ConfigureDTIMBasedSleep()
 {
-    ReturnLogErrorOnFailure(ConfigureBroadcastFilter(false));
+    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigureBroadcastFilter(false));
 
     // Allowing the device to go to sleep must be the last actions to avoid configuration failures.
-    ReturnLogErrorOnFailure(ConfigurePowerSave(RSI_SLEEP_MODE_2, ASSOCIATED_POWER_SAVE, 0));
+    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(RSI_SLEEP_MODE_2, ASSOCIATED_POWER_SAVE, 0));
 
     return CHIP_NO_ERROR;
 }
@@ -49,7 +51,7 @@ CHIP_ERROR ConfigureDTIMBasedSleep()
  */
 CHIP_ERROR ConfigureDeepSleep()
 {
-    ReturnLogErrorOnFailure(ConfigurePowerSave(RSI_SLEEP_MODE_8, DEEP_SLEEP_WITH_RAM_RETENTION, 0));
+    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(RSI_SLEEP_MODE_8, DEEP_SLEEP_WITH_RAM_RETENTION, 0));
     return CHIP_NO_ERROR;
 }
 
@@ -61,7 +63,7 @@ CHIP_ERROR ConfigureDeepSleep()
  */
 CHIP_ERROR ConfigureHighPerformance()
 {
-    ReturnLogErrorOnFailure(ConfigurePowerSave(RSI_ACTIVE, HIGH_PERFORMANCE, 0));
+    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(RSI_ACTIVE, HIGH_PERFORMANCE, 0));
     return CHIP_NO_ERROR;
 }
 #endif // SLI_SI917
@@ -148,15 +150,15 @@ CHIP_ERROR WifiSleepManager::VerifyAndTransitionToLowPowerMode(PowerEvent event)
         return CHIP_NO_ERROR;
     }
 
-    if (!IsWifiProvisioned())
+    if (!WifiInterface::GetInstance().IsWifiProvisioned())
     {
         return ConfigureDeepSleep();
     }
 
     return ConfigureDTIMBasedSleep();
 
 #else
-    ReturnErrorOnFailure(ConfigurePowerSave());
+    ReturnErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave());
     return CHIP_NO_ERROR;
 #endif
 }
diff --git a/src/platform/silabs/wifi/rs911x/WifiInterfaceImpl.h b/src/platform/silabs/wifi/rs911x/WifiInterfaceImpl.h
@@ -43,8 +43,7 @@ class WifiInterfaceImpl final : public WiseconnectWifiInterface
     CHIP_ERROR ResetCounters() override;
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     CHIP_ERROR ConfigureBroadcastFilter(bool enableBroadcastFilter) override;
-    CHIP_ERROR ConfigurePowerSave(rsi_power_save_profile_mode_t sl_si91x_ble_state,
-                                  sl_si91x_performance_profile_t sl_si91x_wifi_state, uint32_t listenInterval) override;
+    CHIP_ERROR ConfigurePowerSave() override;
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@`
`35`	`35`	`#include <sl_cmsis_os2_common.h>`
`36`	`36`
`37`	`37`	`using namespace ::chip::app::Clusters::GeneralDiagnostics;`
`38`		`-using namespace ::chip::DeviceLayer::Silabs;`
`39`	`38`
`40`	`39`	`namespace chip {`
`41`	`40`	`namespace DeviceLayer {`
`@@ -341,7 +340,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(MutableByteSpan & BssId)`
`341`	`340`
`342`	`341`	`VerifyOrReturnError(BssId.size() >= bssIdSize, CHIP_ERROR_BUFFER_TOO_SMALL);`
`343`	`342`
`344`		`- if (WifiInterface::GetInstance().GetAccessPointInfo(ap) == CHIP_NO_ERROR)`
	`343`	`+ if (Silabs::WifiInterface::GetInstance().GetAccessPointInfo(ap) == CHIP_NO_ERROR)`
`345`	`344`	`{`
`346`	`345`	`memcpy(BssId.data(), ap.bssid, bssIdSize);`
`347`	`346`	`BssId.reduce_size(bssIdSize);`
`@@ -356,7 +355,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNe`
`356`	`355`	`using app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum;`
`357`	`356`
`358`	`357`	`wfx_wifi_scan_result_t ap = { 0 };`
`359`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointInfo(ap);`
	`358`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointInfo(ap);`
`360`	`359`	`if (error == CHIP_NO_ERROR)`
`361`	`360`	`{`
`362`	`361`	`// TODO: Is this actually right? Do the wfx_wifi_scan_result_t values`
`@@ -376,7 +375,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetwork`
`376`	`375`	`CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiChannelNumber(uint16_t & channelNumber)`
`377`	`376`	`{`
`378`	`377`	`wfx_wifi_scan_result_t ap = { 0 };`
`379`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointInfo(ap);`
	`378`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointInfo(ap);`
`380`	`379`	`if (error == CHIP_NO_ERROR)`
`381`	`380`	`{`
`382`	`381`	`channelNumber = ap.chan;`
`@@ -388,7 +387,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiChannelNumber(uint16_t & channelNu`
`388`	`387`	`CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi)`
`389`	`388`	`{`
`390`	`389`	`wfx_wifi_scan_result_t ap = { 0 };`
`391`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointInfo(ap);`
	`390`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointInfo(ap);`
`392`	`391`	`if (error == CHIP_NO_ERROR)`
`393`	`392`	`{`
`394`	`393`	`rssi = ap.rssi;`
`@@ -400,7 +399,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi)`
`400`	`399`	`CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconLostCount(uint32_t & beaconLostCount)`
`401`	`400`	`{`
`402`	`401`	`wfx_wifi_scan_ext_t extra_info = { 0 };`
`403`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
	`402`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
`404`	`403`	`if (error == CHIP_NO_ERROR)`
`405`	`404`	`{`
`406`	`405`	`beaconLostCount = extra_info.beacon_lost_count;`
`@@ -417,7 +416,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiCurrentMaxRate(uint64_t & currentM`
`417`	`416`	`CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastRxCount(uint32_t & packetMulticastRxCount)`
`418`	`417`	`{`
`419`	`418`	`wfx_wifi_scan_ext_t extra_info = { 0 };`
`420`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
	`419`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
`421`	`420`	`if (error == CHIP_NO_ERROR)`
`422`	`421`	`{`
`423`	`422`	`packetMulticastRxCount = extra_info.mcast_rx_count;`
`@@ -429,7 +428,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastRxCount(uint32_t &`
`429`	`428`	`CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastTxCount(uint32_t & packetMulticastTxCount)`
`430`	`429`	`{`
`431`	`430`	`wfx_wifi_scan_ext_t extra_info = { 0 };`
`432`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
	`431`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
`433`	`432`	`if (error == CHIP_NO_ERROR)`
`434`	`433`	`{`
`435`	`434`	`packetMulticastTxCount = extra_info.mcast_tx_count;`
`@@ -441,7 +440,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastTxCount(uint32_t &`
`441`	`440`	`CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastRxCount(uint32_t & packetUnicastRxCount)`
`442`	`441`	`{`
`443`	`442`	`wfx_wifi_scan_ext_t extra_info = { 0 };`
`444`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
	`443`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
`445`	`444`	`if (error == CHIP_NO_ERROR)`
`446`	`445`	`{`
`447`	`446`	`packetUnicastRxCount = extra_info.ucast_rx_count;`
`@@ -453,7 +452,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastRxCount(uint32_t & pa`
`453`	`452`	`CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastTxCount(uint32_t & packetUnicastTxCount)`
`454`	`453`	`{`
`455`	`454`	`wfx_wifi_scan_ext_t extra_info = { 0 };`
`456`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
	`455`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
`457`	`456`	`if (error == CHIP_NO_ERROR)`
`458`	`457`	`{`
`459`	`458`	`packetUnicastTxCount = extra_info.ucast_tx_count;`
`@@ -465,7 +464,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastTxCount(uint32_t & pa`
`465`	`464`	`CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiOverrunCount(uint64_t & overrunCount)`
`466`	`465`	`{`
`467`	`466`	`wfx_wifi_scan_ext_t extra_info = { 0 };`
`468`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
	`467`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
`469`	`468`	`if (error == CHIP_NO_ERROR)`
`470`	`469`	`{`
`471`	`470`	`overrunCount = extra_info.overrun_count;`
`@@ -477,7 +476,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiOverrunCount(uint64_t & overrunCou`
`477`	`476`	`CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconRxCount(uint32_t & beaconRxCount)`
`478`	`477`	`{`
`479`	`478`	`wfx_wifi_scan_ext_t extra_info = { 0 };`
`480`		`- CHIP_ERROR error = WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
	`479`	`+ CHIP_ERROR error = Silabs::WifiInterface::GetInstance().GetAccessPointExtendedInfo(extra_info);`
`481`	`480`	`if (error == CHIP_NO_ERROR)`
`482`	`481`	`{`
`483`	`482`	`beaconRxCount = extra_info.beacon_rx_count;`
`@@ -488,7 +487,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconRxCount(uint32_t & beaconRxC`
`488`	`487`
`489`	`488`	`CHIP_ERROR DiagnosticDataProviderImpl::ResetWiFiNetworkDiagnosticsCounts()`
`490`	`489`	`{`
`491`		`- return WifiInterface::GetInstance().ResetCounters();`
	`490`	`+ return Silabs::WifiInterface::GetInstance().ResetCounters();`
`492`	`491`	`}`
`493`	`492`	`#endif // SL_WIFI`
`494`	`493`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`#include <platform/silabs/wifi/WifiInterface.h>`
`21`	`21`	`#include <platform/silabs/wifi/icd/WifiSleepManager.h>`
`22`	`22`
	`23`	`+using namespace chip::DeviceLayer::Silabs;`
	`24`	`+`
`23`	`25`	`namespace {`
`24`	`26`
`25`	`27`	`// TODO: Once the platform sleep calls are unified, we can removed this ifdef`
`@@ -33,10 +35,10 @@ namespace {`
`33`	`35`	`*/`
`34`	`36`	`CHIP_ERROR ConfigureDTIMBasedSleep()`
`35`	`37`	`{`
`36`		`- ReturnLogErrorOnFailure(ConfigureBroadcastFilter(false));`
	`38`	`+ ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigureBroadcastFilter(false));`
`37`	`39`
`38`	`40`	`// Allowing the device to go to sleep must be the last actions to avoid configuration failures.`
`39`		`- ReturnLogErrorOnFailure(ConfigurePowerSave(RSI_SLEEP_MODE_2, ASSOCIATED_POWER_SAVE, 0));`
	`41`	`+ ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(RSI_SLEEP_MODE_2, ASSOCIATED_POWER_SAVE, 0));`
`40`	`42`
`41`	`43`	`return CHIP_NO_ERROR;`
`42`	`44`	`}`
`@@ -49,7 +51,7 @@ CHIP_ERROR ConfigureDTIMBasedSleep()`
`49`	`51`	`*/`
`50`	`52`	`CHIP_ERROR ConfigureDeepSleep()`
`51`	`53`	`{`
`52`		`- ReturnLogErrorOnFailure(ConfigurePowerSave(RSI_SLEEP_MODE_8, DEEP_SLEEP_WITH_RAM_RETENTION, 0));`
	`54`	`+ ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(RSI_SLEEP_MODE_8, DEEP_SLEEP_WITH_RAM_RETENTION, 0));`
`53`	`55`	`return CHIP_NO_ERROR;`
`54`	`56`	`}`
`55`	`57`
`@@ -61,7 +63,7 @@ CHIP_ERROR ConfigureDeepSleep()`
`61`	`63`	`*/`
`62`	`64`	`CHIP_ERROR ConfigureHighPerformance()`
`63`	`65`	`{`
`64`		`- ReturnLogErrorOnFailure(ConfigurePowerSave(RSI_ACTIVE, HIGH_PERFORMANCE, 0));`
	`66`	`+ ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(RSI_ACTIVE, HIGH_PERFORMANCE, 0));`
`65`	`67`	`return CHIP_NO_ERROR;`
`66`	`68`	`}`
`67`	`69`	`#endif // SLI_SI917`
`@@ -148,15 +150,15 @@ CHIP_ERROR WifiSleepManager::VerifyAndTransitionToLowPowerMode(PowerEvent event)`
`148`	`150`	`return CHIP_NO_ERROR;`
`149`	`151`	`}`
`150`	`152`
`151`		`- if (!IsWifiProvisioned())`
	`153`	`+ if (!WifiInterface::GetInstance().IsWifiProvisioned())`
`152`	`154`	`{`
`153`	`155`	`return ConfigureDeepSleep();`
`154`	`156`	`}`
`155`	`157`
`156`	`158`	`return ConfigureDTIMBasedSleep();`
`157`	`159`
`158`	`160`	`#else`
`159`		`- ReturnErrorOnFailure(ConfigurePowerSave());`
	`161`	`+ ReturnErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave());`
`160`	`162`	`return CHIP_NO_ERROR;`
`161`	`163`	`#endif`
`162`	`164`	`}`