Skip to content

Commit 84babe0

Browse files
mkardous-silabsrestyled-commits
mkardous-silabs
and
restyled-commits
authored
[Silabs] Move Wi-Fi interface to src/platform from examples/platform (#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 <commits@restyled.io>
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-2
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

+3-3
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>

‎examples/platform/silabs/SiWx917/BUILD.gn

+2-90
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
1818
import("${chip_root}/examples/platform/silabs/args.gni")
1919
import("${chip_root}/src/lib/lib.gni")
2020
import("${chip_root}/src/platform/device.gni")
21-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
21+
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2222
import("${chip_root}/third_party/silabs/silabs_board.gni")
2323
import("${silabs_sdk_build_root}/SiWx917_sdk.gni")
2424

@@ -28,19 +28,6 @@ declare_args() {
2828
# OTA timeout in seconds
2929
ota_periodic_query_timeout_sec = 86400
3030

31-
# Wifi related stuff - they are overridden by gn -args="use_wf200=true"
32-
sl_wfx_config_softap = false
33-
sl_wfx_config_scan = true
34-
35-
# Argument to force enable WPA3 security on rs91x
36-
rs91x_wpa3_transition = true
37-
38-
#default WiFi SSID
39-
chip_default_wifi_ssid = ""
40-
41-
#default Wifi Password
42-
chip_default_wifi_psk = ""
43-
4431
# The EnableKey in hex string format used by TestEventTrigger command in
4532
# GeneralDiagnostics cluster. The length of the string should be 16 bytes.
4633
sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"
@@ -105,41 +92,6 @@ source_set("matter-shell") {
10592
]
10693
}
10794

108-
config("wifi-interface-config") {
109-
include_dirs = [
110-
"${silabs_plat_dir}/wifi",
111-
"${silabs_common_plat_dir}/wifi",
112-
]
113-
}
114-
115-
source_set("wifi-interface") {
116-
sources = [
117-
"${silabs_common_plat_dir}/wifi/WifiInterfaceAbstraction.cpp",
118-
"${silabs_common_plat_dir}/wifi/WiseconnectInterfaceAbstraction.cpp",
119-
"SiWxWifiInterface.cpp",
120-
121-
# Wi-Fi Config - Using the file sdk support until the wiseconnect file is fixed
122-
"${sdk_support_root}/components/service/network_manager/src/sl_net_for_lwip.c",
123-
]
124-
125-
public_deps = [
126-
"${chip_root}/src/app/icd/server:icd-server-config",
127-
"${chip_root}/src/lib/core",
128-
"${chip_root}/src/lib/support",
129-
"${chip_root}/src/platform:platform",
130-
"${chip_root}/src/platform/silabs/SiWx917:SiWx917",
131-
"${lwip_root}:lwip",
132-
]
133-
134-
public_configs = [
135-
":siwx917-common-config",
136-
"${silabs_sdk_build_root}:silabs_config",
137-
":chip_examples_project_config",
138-
":wifi-interface-config",
139-
":silabs-wifi-config",
140-
]
141-
}
142-
14395
config("siwx917-common-config") {
14496
defines = [ "OTA_PERIODIC_TIMEOUT=${ota_periodic_query_timeout_sec}" ]
14597

@@ -164,46 +116,10 @@ config("siwx917-common-config") {
164116
ldflags = [ "-Wl,--no-warn-rwx-segment" ]
165117
}
166118

167-
config("silabs-wifi-config") {
168-
defines = []
169-
include_dirs = []
170-
171-
if (chip_default_wifi_ssid != "") {
172-
defines += [
173-
"SL_ONNETWORK_PAIRING=1",
174-
"SL_WIFI_SSID=\"${chip_default_wifi_ssid}\"",
175-
]
176-
}
177-
if (chip_default_wifi_psk != "") {
178-
assert(chip_default_wifi_ssid != "",
179-
"ssid can't be null if psk is provided")
180-
defines += [ "SL_WIFI_PSK=\"${chip_default_wifi_psk}\"" ]
181-
}
182-
183-
if (sl_wfx_config_softap) {
184-
defines += [ "SL_WFX_CONFIG_SOFTAP" ]
185-
}
186-
187-
if (sl_wfx_config_scan) {
188-
defines += [ "SL_WFX_CONFIG_SCAN" ]
189-
}
190-
191-
if (chip_enable_wifi_ipv4) {
192-
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
193-
}
194-
195-
if (rs91x_wpa3_transition) {
196-
defines += [ "WIFI_ENABLE_SECURITY_WPA3_TRANSITION=1" ]
197-
}
198-
}
199-
200119
source_set("siwx917-common") {
201120
deps = [ "${silabs_common_plat_dir}/provision:storage" ]
202121
defines = []
203-
public_deps = [
204-
":wifi-interface",
205-
"${lwip_root}:lwip",
206-
]
122+
public_deps = []
207123

208124
public_configs = [
209125
":siwx917-common-config",
@@ -250,10 +166,6 @@ source_set("siwx917-common") {
250166
sources += [ "${silabs_common_plat_dir}/MemMonitoring.cpp" ]
251167
}
252168

253-
if (chip_enable_wifi) {
254-
public_configs += [ ":silabs-wifi-config" ]
255-
}
256-
257169
if (chip_build_libshell) {
258170
deps += [ ":matter-shell" ]
259171

‎examples/platform/silabs/display/demo-ui.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
#include "sl_memlcd.h"
2828
#include <app/icd/server/ICDServerConfig.h>
2929
#if SL_WIFI && !SLI_SI91X_MCU_INTERFACE
30-
#include "spi_multiplex.h"
30+
#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
3131
#endif // SL_WIFI && !SLI_SI91X_MCU_INTERFACE
32-
#include <stdio.h>
3332
#include <string.h>
3433

3534
// Main Logo and App image

‎examples/platform/silabs/efr32/BUILD.gn

-87
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,6 @@ declare_args() {
2727
# OTA timeout in seconds
2828
ota_periodic_query_timeout_sec = 86400
2929

30-
# Wifi related stuff - they are overridden by gn -args="use_wf200=true"
31-
sl_wfx_config_softap = false
32-
sl_wfx_config_scan = true
33-
34-
# Argument to force enable WPA3 security on rs91x
35-
rs91x_wpa3_transition = true
36-
37-
#default WiFi SSID
38-
chip_default_wifi_ssid = ""
39-
40-
#default Wifi Password
41-
chip_default_wifi_psk = ""
42-
4330
# The EnableKey in hex string format used by TestEventTrigger command in
4431
# GeneralDiagnostics cluster. The length of the string should be 16 bytes.
4532
sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"
@@ -53,20 +40,6 @@ assert(!(use_rs9116 && chip_enable_openthread))
5340
assert(!(use_SiWx917 && chip_enable_openthread))
5441
assert(!(use_wf200 && chip_enable_openthread))
5542

56-
if (chip_enable_wifi) {
57-
assert(use_rs9116 || use_wf200 || use_SiWx917)
58-
import("${chip_root}/src/platform/silabs/wifi_args.gni")
59-
60-
if (use_rs9116) {
61-
import("rs911x/rs911x.gni")
62-
} else if (use_SiWx917) {
63-
import("rs911x/rs9117.gni")
64-
}
65-
if (use_wf200) {
66-
import("wf200/wf200.gni")
67-
}
68-
}
69-
7043
config("chip_examples_project_config") {
7144
include_dirs = [ "project_include" ]
7245

@@ -167,40 +140,6 @@ config("efr32-common-config") {
167140
ldflags = [ "-Wl,--no-warn-rwx-segment" ]
168141
}
169142

170-
config("silabs-wifi-config") {
171-
defines = []
172-
include_dirs = []
173-
174-
if (chip_default_wifi_ssid != "") {
175-
defines += [
176-
"SL_ONNETWORK_PAIRING=1",
177-
"SL_WIFI_SSID=\"${chip_default_wifi_ssid}\"",
178-
]
179-
}
180-
if (chip_default_wifi_psk != "") {
181-
assert(chip_default_wifi_ssid != "",
182-
"ssid can't be null if psk is provided")
183-
defines += [ "SL_WIFI_PSK=\"${chip_default_wifi_psk}\"" ]
184-
}
185-
186-
if (sl_wfx_config_softap) {
187-
defines += [ "SL_WFX_CONFIG_SOFTAP" ]
188-
}
189-
190-
if (sl_wfx_config_scan) {
191-
defines += [ "SL_WFX_CONFIG_SCAN" ]
192-
}
193-
194-
if (chip_enable_wifi_ipv4) {
195-
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
196-
}
197-
198-
if (rs91x_wpa3_transition) {
199-
# TODO: Change this macro once WF200 support is provided
200-
defines += [ "WIFI_ENABLE_SECURITY_WPA3_TRANSITION=1" ]
201-
}
202-
}
203-
204143
source_set("efr32-common") {
205144
deps = [ "${silabs_common_plat_dir}/provision:storage" ]
206145
defines = []
@@ -265,32 +204,6 @@ source_set("efr32-common") {
265204
]
266205
}
267206

268-
if (chip_enable_wifi) {
269-
if (use_rs9116) {
270-
sources += rs911x_src_plat
271-
272-
# All the stuff from wiseconnect
273-
sources += rs911x_src_sapi
274-
include_dirs += rs911x_inc_plat
275-
276-
#add compilation flags for rs991x build. This will be addressed directly in wiseconnect sdk in the next version release of that sdk
277-
cflags = rs911x_cflags
278-
} else if (use_SiWx917) {
279-
sources += rs911x_src_plat
280-
281-
# All the stuff from wiseconnect
282-
sources += rs9117_src_sapi
283-
include_dirs += rs9117_inc_plat
284-
285-
#add compilation flags for rs991x build. This will be addressed directly in wiseconnect sdk in the next version release of that sdk
286-
} else if (use_wf200) {
287-
sources += wf200_plat_src
288-
include_dirs += wf200_plat_incs
289-
}
290-
291-
public_configs += [ ":silabs-wifi-config" ]
292-
}
293-
294207
if (chip_build_libshell) {
295208
deps += [ ":matter-shell" ]
296209

‎examples/platform/silabs/efr32/wf200/sl_wfx_configuration.h

-30
This file was deleted.

0 commit comments

Comments
 (0)