Skip to content

Commit 84babe0

Browse files
[Silabs] Move Wi-Fi interface to src/platform from examples/platform (project-chip#36477)
* Restructure platform files * Move all files to src/platform * Build the wf200 in the new wifi structure * rename directory * Build the rs9116 in the new wifi structure * Build the SiWx917 NCP in the new wifi structure * Build the SiWx917 SoC in the new wifi structure * Delete wfx_host_events header in favor of the new abstraction structure * remove unnecessary includes in gn files and the cflag changes * restyle * add todo comment * remove cflag inclusion * add missing incllude * Add missing includes * Restyled by clang-format * Move wifi_args.gni file to the wifi directory * Rename Wf200WifiInterface to WifiInterface * Rename SiWxWifiInterface to WifiInterface * Rename Rsi91xWifiInterface.cpp to WifiInterface.cpp --------- Co-authored-by: Restyled.io <[email protected]>
1 parent 45a75ba commit 84babe0

File tree

74 files changed

+455
-765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+455
-765
lines changed

examples/air-quality-sensor-app/silabs/build_for_wifi_args.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import("//build_overrides/chip.gni")
1515
import("${chip_root}/config/standalone/args.gni")
1616

1717
silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
18-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
18+
import("${chip_root}/src/platform/silabs/wifi/args.gni")
1919
chip_enable_wifi = true
2020
chip_enable_ota_requestor = true
2121
app_data_model =

examples/chef/silabs/build_for_wifi_args.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ import("//build_overrides/chip.gni")
1515

1616
silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1717
chip_enable_openthread = false
18-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
18+
import("${chip_root}/src/platform/silabs/wifi/args.gni")
1919

2020
chip_enable_ota_requestor = true

examples/dishwasher-app/silabs/build_for_wifi_args.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import("${chip_root}/config/standalone/args.gni")
1616

1717
silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1818
chip_enable_openthread = false
19-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
19+
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2020

2121
sl_enable_test_event_trigger = true
2222
chip_enable_ota_requestor = true

examples/energy-management-app/silabs/build_for_wifi_args.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import("${chip_root}/config/standalone/args.gni")
1616

1717
silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1818
chip_enable_openthread = false
19-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
19+
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2020

2121
sl_enable_test_event_trigger = true
2222
chip_enable_ota_requestor = false

examples/light-switch-app/silabs/build_for_wifi_args.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import("${chip_root}/config/standalone/args.gni")
1616

1717
silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1818
chip_enable_openthread = false
19-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
19+
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2020

2121
chip_enable_ota_requestor = true
2222
app_data_model = "${chip_root}/examples/light-switch-app/light-switch-common"

examples/lighting-app/silabs/build_for_wifi_args.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import("${chip_root}/config/standalone/args.gni")
1616

1717
silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1818
chip_enable_openthread = false
19-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
19+
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2020

2121
# Not needed for the Lighting-app
2222
chip_enable_read_client = false

examples/lit-icd-app/silabs/build_for_wifi_args.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import("${chip_root}/config/standalone/args.gni")
1818

1919
silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2020
chip_enable_openthread = false
21-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
21+
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2222

2323
chip_enable_ota_requestor = true
2424
app_data_model = "${chip_root}/examples/lit-icd-app/lit-icd-common"

examples/lock-app/silabs/build_for_wifi_args.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import("${chip_root}/config/standalone/args.gni")
1616

1717
silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1818
chip_enable_openthread = false
19-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
19+
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2020

2121
chip_enable_ota_requestor = true
2222
app_data_model = "${chip_root}/examples/lock-app/silabs/data_model:silabs-lock"

examples/platform/silabs/BaseApplication.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,9 @@
6464
#include <platform/silabs/platformAbstraction/SilabsPlatform.h>
6565

6666
#ifdef SL_WIFI
67-
#include "WifiInterfaceAbstraction.h"
68-
#include "wfx_host_events.h"
6967
#include <app/clusters/network-commissioning/network-commissioning.h>
7068
#include <platform/silabs/NetworkCommissioningWiFiDriver.h>
69+
#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
7170
#endif // SL_WIFI
7271

7372
#ifdef DIC_ENABLE

examples/platform/silabs/MatterConfig.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <mbedtls/platform.h>
2626

2727
#ifdef SL_WIFI
28-
#include "wfx_host_events.h"
28+
#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
2929
#endif /* SL_WIFI */
3030

3131
#if PW_RPC_ENABLED
@@ -41,8 +41,8 @@
4141
#endif
4242

4343
#if defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1
44-
#include "SiWxPlatformInterface.h"
45-
#include "WiseconnectInterfaceAbstraction.h"
44+
#include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
45+
#include <platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h>
4646
#endif // SLI_SI91X_MCU_INTERFACE
4747

4848
#include <crypto/CHIPCryptoPAL.h>

0 commit comments

Comments
 (0)