[Silabs] Wi-fi: Header duplication removed. (#32633)

* [Silabs] Wi-fi: Header duplication removed. * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Mar 20, 2024 · 16ab164 · 16ab164
1 parent 2b590aa
commit 16ab164
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 115 deletions.
diff --git a/examples/platform/silabs/efr32/rs911x/wfx_rsi.h b/examples/platform/silabs/efr32/rs911x/wfx_rsi.h
diff --git a/...platform/silabs/SiWx917/SiWx917/wfx_rsi.h → examples/platform/silabs/wfx_rsi.h b/...platform/silabs/SiWx917/SiWx917/wfx_rsi.h → examples/platform/silabs/wfx_rsi.h
@@ -14,11 +14,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#pragma once
 
-#ifndef _WFX_RSI_H_
-#define _WFX_RSI_H_
+#include <event_groups.h>
 
-#include "event_groups.h"
+#ifndef RSI_BLE_ENABLE
+#define RSI_BLE_ENABLE (1)
+#endif
 
 /*
  * Interface to RSI Sapis
@@ -30,6 +32,7 @@
 #define WFX_RSI_CONFIG_MAX_JOIN (5)             /* Max join retries			*/
 // TODO: Default values are usually in minutes, but this is in ms. Confirm if this is correct
 #define WFX_RSI_DHCP_POLL_INTERVAL (250) /* Poll interval in ms for DHCP		*/
+#define WFX_RSI_NUM_TIMERS (2)           /* Number of RSI timers to alloc	*/
 
 typedef enum
 {
@@ -78,7 +81,9 @@ typedef struct wfx_rsi_s
     TaskHandle_t drv_task;
     TaskHandle_t wlan_task;
     TaskHandle_t init_task;
+#ifdef RSI_BLE_ENABLE
     TaskHandle_t ble_task;
+#endif
     uint16_t dev_state;
     uint16_t ap_chan; /* The chan our STA is using	*/
     wfx_wifi_provision_t sec;
@@ -97,6 +102,7 @@ typedef struct wfx_rsi_s
 } WfxRsi_t;
 
 extern WfxRsi_t wfx_rsi;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -112,11 +118,12 @@ int32_t wfx_rsi_disconnect();
 int32_t wfx_wifi_rsi_init(void);
 #if SL_ICD_ENABLED
 void sl_wfx_host_si91x_sleep_wakeup();
+#if SLI_SI917
 int32_t wfx_rsi_power_save(rsi_power_save_profile_mode_t sl_si91x_ble_state, sl_si91x_performance_profile_t sl_si91x_wifi_state);
+#else
+int32_t wfx_rsi_power_save();
+#endif /* SLI_SI917 */
 #endif /* SL_ICD_ENABLED */
-
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _WFX_RSI_H_ */
diff --git a/src/platform/silabs/rs911x/wfx_sl_ble_init.h b/src/platform/silabs/rs911x/wfx_sl_ble_init.h
@@ -27,9 +27,6 @@
 
 #ifndef WFX_SL_BLE_INIT
 #define WFX_SL_BLE_INIT
-#ifndef RSI_BLE_ENABLE
-#define RSI_BLE_ENABLE (1)
-#endif // RSI_BLE_ENABLE
 
 // BLE include file to refer BLE APIs
 #include "FreeRTOS.h"