[SL-ONLY] Update WifiSleepManager to fix mergle conflicts

Author: mkardous-silabs

src/platform/silabs/wifi/icd/WifiSleepManager.cpp

@@ -21,71 +21,6 @@
 
 using namespace chip::DeviceLayer::Silabs;
 
-namespace {
-
-// TODO: Once the platform sleep calls are unified, we can removed this ifdef
-#if SLI_SI917 // 917 SoC & NCP
-
-/**
- * @brief Configures the Wi-Fi Chip to go to LI based sleep.
- *        Function sets the listen interval the ICD Transort Slow Poll configuration and enables the broadcast filter.
- *
- * @return CHIP_ERROR CHIP_NO_ERROR if the configuration of the Wi-Fi chip was successful; otherwise CHIP_ERROR_INTERNAL
- */
-CHIP_ERROR ConfigureLIBasedSleep()
-{
-    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigureBroadcastFilter(true));
-
-    // Allowing the device to go to sleep must be the last actions to avoid configuration failures.
-    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(
-        RSI_SLEEP_MODE_2, ASSOCIATED_POWER_SAVE, chip::ICDConfigurationData::GetInstance().GetSlowPollingInterval().count()));
-
-    return CHIP_NO_ERROR;
-}
-
-/**
- * @brief Configures the Wi-Fi Chip to go to DTIM based sleep.
- *        Function sets the listen interval to be synced with the DTIM beacon and disables the broadcast filter.
- *
- * @return CHIP_ERROR CHIP_NO_ERROR if the configuration of the Wi-Fi chip was successful; otherwise CHIP_ERROR_INTERNAL
- */
-CHIP_ERROR ConfigureDTIMBasedSleep()
-{
-    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigureBroadcastFilter(false));
-
-    // Allowing the device to go to sleep must be the last actions to avoid configuration failures.
-    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(RSI_SLEEP_MODE_2, ASSOCIATED_POWER_SAVE, 0));
-
-    return CHIP_NO_ERROR;
-}
-
-/**
- * @brief Configures the Wi-Fi chip to go Deep Sleep.
- *        Function doesn't change the state of the broadcast filter.
- *
- * @return CHIP_ERROR CHIP_NO_ERROR if the configuration of the Wi-Fi chip was successful; otherwise CHIP_ERROR_INTERNAL
- */
-CHIP_ERROR ConfigureDeepSleep()
-{
-    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(RSI_SLEEP_MODE_8, DEEP_SLEEP_WITH_RAM_RETENTION, 0));
-    return CHIP_NO_ERROR;
-}
-
-/**
- * @brief Configures the Wi-Fi chip to go to High Performance.
- *        Function doesn't change the broad cast filter configuration.
- *
- * @return CHIP_ERROR CHIP_NO_ERROR if the configuration of the Wi-Fi chip was successful; otherwise CHIP_ERROR_INTERNAL
- */
-CHIP_ERROR ConfigureHighPerformance()
-{
-    ReturnLogErrorOnFailure(WifiInterface::GetInstance().ConfigurePowerSave(RSI_ACTIVE, HIGH_PERFORMANCE, 0));
-    return CHIP_NO_ERROR;
-}
-#endif // SLI_SI917
-
-} // namespace
-
 namespace chip {
 namespace DeviceLayer {
 namespace Silabs {

src/platform/silabs/wifi/icd/WifiSleepManager.h

@@ -223,6 +223,14 @@ class WifiSleepManager
      */
     CHIP_ERROR ConfigureDTIMBasedSleep();
 
+    /**
+     * @brief Configures the Wi-Fi Chip to go to LI based sleep.
+     *        Function sets the listen interval the ICD Transort Slow Poll configuration and enables the broadcast filter.
+     *
+     * @return CHIP_ERROR CHIP_NO_ERROR if the configuration of the Wi-Fi chip was successful; otherwise CHIP_ERROR_INTERNAL
+     */
+    CHIP_ERROR ConfigureLIBasedSleep();
+
     /**
      * @brief Increments the HighPerformance request counter and triggers the transition to High Performance if requested.
      *