Skip to content

Commit 16ab164

Browse files
[Silabs] Wi-fi: Header duplication removed. (project-chip#32633)
* [Silabs] Wi-fi: Header duplication removed. * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 2b590aa commit 16ab164

File tree

3 files changed

+13
-115
lines changed

3 files changed

+13
-115
lines changed

examples/platform/silabs/efr32/rs911x/wfx_rsi.h

-106
This file was deleted.

examples/platform/silabs/SiWx917/SiWx917/wfx_rsi.h examples/platform/silabs/wfx_rsi.h

+13-6
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17+
#pragma once
1718

18-
#ifndef _WFX_RSI_H_
19-
#define _WFX_RSI_H_
19+
#include <event_groups.h>
2020

21-
#include "event_groups.h"
21+
#ifndef RSI_BLE_ENABLE
22+
#define RSI_BLE_ENABLE (1)
23+
#endif
2224

2325
/*
2426
* Interface to RSI Sapis
@@ -30,6 +32,7 @@
3032
#define WFX_RSI_CONFIG_MAX_JOIN (5) /* Max join retries */
3133
// TODO: Default values are usually in minutes, but this is in ms. Confirm if this is correct
3234
#define WFX_RSI_DHCP_POLL_INTERVAL (250) /* Poll interval in ms for DHCP */
35+
#define WFX_RSI_NUM_TIMERS (2) /* Number of RSI timers to alloc */
3336

3437
typedef enum
3538
{
@@ -78,7 +81,9 @@ typedef struct wfx_rsi_s
7881
TaskHandle_t drv_task;
7982
TaskHandle_t wlan_task;
8083
TaskHandle_t init_task;
84+
#ifdef RSI_BLE_ENABLE
8185
TaskHandle_t ble_task;
86+
#endif
8287
uint16_t dev_state;
8388
uint16_t ap_chan; /* The chan our STA is using */
8489
wfx_wifi_provision_t sec;
@@ -97,6 +102,7 @@ typedef struct wfx_rsi_s
97102
} WfxRsi_t;
98103

99104
extern WfxRsi_t wfx_rsi;
105+
100106
#ifdef __cplusplus
101107
extern "C" {
102108
#endif
@@ -112,11 +118,12 @@ int32_t wfx_rsi_disconnect();
112118
int32_t wfx_wifi_rsi_init(void);
113119
#if SL_ICD_ENABLED
114120
void sl_wfx_host_si91x_sleep_wakeup();
121+
#if SLI_SI917
115122
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);
123+
#else
124+
int32_t wfx_rsi_power_save();
125+
#endif /* SLI_SI917 */
116126
#endif /* SL_ICD_ENABLED */
117-
118127
#ifdef __cplusplus
119128
}
120129
#endif
121-
122-
#endif /* _WFX_RSI_H_ */

src/platform/silabs/rs911x/wfx_sl_ble_init.h

-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727

2828
#ifndef WFX_SL_BLE_INIT
2929
#define WFX_SL_BLE_INIT
30-
#ifndef RSI_BLE_ENABLE
31-
#define RSI_BLE_ENABLE (1)
32-
#endif // RSI_BLE_ENABLE
3330

3431
// BLE include file to refer BLE APIs
3532
#include "FreeRTOS.h"

0 commit comments

Comments
 (0)