[Silabs] Move Wi-Fi interface files to the final structure (#36644)
* Move files
* Move wifi files to their final location & cleanup
* Restyled by clang-format
* rename directories
* rename paths for new locations
* Restyled by clang-format
* update include path with the structure
---------
Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/examples/platform/silabs/display/demo-ui.c b/examples/platform/silabs/display/demo-ui.c
index fb41a5b..fac00dc 100644
--- a/examples/platform/silabs/display/demo-ui.c
+++ b/examples/platform/silabs/display/demo-ui.c
@@ -27,7 +27,7 @@
#include "sl_memlcd.h"
#include <app/icd/server/ICDServerConfig.h>
#if SL_WIFI && !SLI_SI91X_MCU_INTERFACE
-#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#include <platform/silabs/wifi/ncp/spi_multiplex.h>
#endif // SL_WIFI && !SLI_SI91X_MCU_INTERFACE
#include <string.h>
diff --git a/src/platform/silabs/efr32/OTAImageProcessorImpl.cpp b/src/platform/silabs/efr32/OTAImageProcessorImpl.cpp
index a884071..09d37d0 100644
--- a/src/platform/silabs/efr32/OTAImageProcessorImpl.cpp
+++ b/src/platform/silabs/efr32/OTAImageProcessorImpl.cpp
@@ -22,7 +22,7 @@
#include <platform/silabs/SilabsConfig.h>
#if SL_WIFI
-#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#include <platform/silabs/wifi/ncp/spi_multiplex.h>
#endif // SL_WIFI
extern "C" {
diff --git a/src/platform/silabs/wifi/BUILD.gn b/src/platform/silabs/wifi/BUILD.gn
index db58633..304fa89 100644
--- a/src/platform/silabs/wifi/BUILD.gn
+++ b/src/platform/silabs/wifi/BUILD.gn
@@ -43,7 +43,7 @@
if (use_rs9116) {
import("${silabs_platform_dir}/wifi/rs911x/rs911x.gni")
} else if (use_SiWx917) {
- import("${silabs_platform_dir}/wifi/rs911x/rs9117.gni")
+ import("${silabs_platform_dir}/wifi/SiWx/ncp/rs9117.gni")
}
if (use_wf200) {
import("${silabs_platform_dir}/wifi/wf200/wf200.gni")
diff --git a/src/platform/silabs/wifi/SiWx/WifiInterface.cpp b/src/platform/silabs/wifi/SiWx/WifiInterface.cpp
index 514af64..291c998 100644
--- a/src/platform/silabs/wifi/SiWx/WifiInterface.cpp
+++ b/src/platform/silabs/wifi/SiWx/WifiInterface.cpp
@@ -67,7 +67,7 @@
#if (EXP_BOARD)
#include "rsi_bt_common_apis.h"
-#include <platform/silabs/wifi/rs911x/platform/sl_board_configuration.h>
+#include <platform/silabs/wifi/SiWx/ncp/sl_board_configuration.h>
#endif
#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
diff --git a/src/platform/silabs/wifi/rs911x/platform/efx32_ncp_host.c b/src/platform/silabs/wifi/SiWx/ncp/efx32_ncp_host.c
similarity index 98%
rename from src/platform/silabs/wifi/rs911x/platform/efx32_ncp_host.c
rename to src/platform/silabs/wifi/SiWx/ncp/efx32_ncp_host.c
index c717376..8991ffa 100644
--- a/src/platform/silabs/wifi/rs911x/platform/efx32_ncp_host.c
+++ b/src/platform/silabs/wifi/SiWx/ncp/efx32_ncp_host.c
@@ -22,7 +22,6 @@
#include "em_gpio.h"
#include "em_usart.h"
#include "gpiointerrupt.h"
-#include "sl_board_configuration_SiWx917.h"
#include "sl_constants.h"
#include "sl_rsi_utility.h"
#include "sl_si91x_host_interface.h"
@@ -30,7 +29,8 @@
#include "sl_si91x_status.h"
#include "sl_status.h"
#include "sl_wifi_constants.h"
-#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#include <platform/silabs/wifi/SiWx/ncp/sl_board_configuration.h>
+#include <platform/silabs/wifi/ncp/spi_multiplex.h>
#include <stdbool.h>
#include <string.h>
diff --git a/src/platform/silabs/wifi/rs911x/rs9117.gni b/src/platform/silabs/wifi/SiWx/ncp/rs9117.gni
similarity index 86%
rename from src/platform/silabs/wifi/rs911x/rs9117.gni
rename to src/platform/silabs/wifi/SiWx/ncp/rs9117.gni
index cbeaf98..6be9a73 100644
--- a/src/platform/silabs/wifi/rs911x/rs9117.gni
+++ b/src/platform/silabs/wifi/SiWx/ncp/rs9117.gni
@@ -18,17 +18,14 @@
rs911x_src_plat = [
"${chip_root}/src/platform/silabs/wifi/SiWx/WifiInterface.cpp",
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_interrupt.c",
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/sl_si91x_ncp_utility.c",
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/sl_board_configuration.h",
+ "${chip_root}/src/platform/silabs/wifi/SiWx/ncp/sl_si91x_ncp_utility.c",
+ "${chip_root}/src/platform/silabs/wifi/SiWx/ncp/sl_board_configuration.h",
"${chip_root}/src/platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.cpp",
"${chip_root}/src/platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h",
-
- # TODO: We shouldn't need a file form the WF200 for the SiWx917 NCP builds
- "${chip_root}/src/platform/silabs/wifi/wf200/platform/spi_multiplex.h",
+ "${chip_root}/src/platform/silabs/wifi/ncp/spi_multiplex.h",
# TODO : We should be using the file from the Wiseconnect SDK and not our copy of it.
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/efx32_ncp_host.c",
+ "${chip_root}/src/platform/silabs/wifi/SiWx/ncp/efx32_ncp_host.c",
]
rs9117_inc_plat = [ "${wifi_sdk_root}/components/si91x/ble/inc" ]
diff --git a/src/platform/silabs/wifi/rs911x/platform/sl_board_configuration_SiWx917.h b/src/platform/silabs/wifi/SiWx/ncp/sl_board_configuration.h
similarity index 76%
rename from src/platform/silabs/wifi/rs911x/platform/sl_board_configuration_SiWx917.h
rename to src/platform/silabs/wifi/SiWx/ncp/sl_board_configuration.h
index 7145e31..0aad8bd 100644
--- a/src/platform/silabs/wifi/rs911x/platform/sl_board_configuration_SiWx917.h
+++ b/src/platform/silabs/wifi/SiWx/ncp/sl_board_configuration.h
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2024 Project CHIP Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
#pragma once
#ifdef SL_UART
diff --git a/src/platform/silabs/wifi/rs911x/platform/sl_si91x_ncp_utility.c b/src/platform/silabs/wifi/SiWx/ncp/sl_si91x_ncp_utility.c
similarity index 99%
rename from src/platform/silabs/wifi/rs911x/platform/sl_si91x_ncp_utility.c
rename to src/platform/silabs/wifi/SiWx/ncp/sl_si91x_ncp_utility.c
index 1d1ab14..50b8ffd 100644
--- a/src/platform/silabs/wifi/rs911x/platform/sl_si91x_ncp_utility.c
+++ b/src/platform/silabs/wifi/SiWx/ncp/sl_si91x_ncp_utility.c
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-/**
- * Includes
- */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/platform/silabs/wifi/rs911x/platform/sl_si91x_ncp_utility.h b/src/platform/silabs/wifi/SiWx/ncp/sl_si91x_ncp_utility.h
similarity index 77%
rename from src/platform/silabs/wifi/rs911x/platform/sl_si91x_ncp_utility.h
rename to src/platform/silabs/wifi/SiWx/ncp/sl_si91x_ncp_utility.h
index b434e35..437be2d 100644
--- a/src/platform/silabs/wifi/rs911x/platform/sl_si91x_ncp_utility.h
+++ b/src/platform/silabs/wifi/SiWx/ncp/sl_si91x_ncp_utility.h
@@ -21,24 +21,16 @@
* devices such as External Flash and LCD.
* That can be extended to other families as well.
*/
-#ifndef SL_SI91X_NCP_UTILITY_H
-#define SL_SI91X_NCP_UTILITY_H
-
#pragma once
+
#include "FreeRTOS.h"
+#include "em_usart.h"
#include "semphr.h"
#include "silabs_utils.h"
-#include "sl_status.h"
-
-// TODO: This is a WF200 specific include. It is not clear why we need this in the 917 NCP files.
-#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
-
-#if defined(CHIP_9117)
-#include "em_usart.h"
-#include "sl_board_configuration_SiWx917.h"
#include "sl_spidrv_exp_config.h"
-
-#endif // CHIP_9117
+#include "sl_status.h"
+#include <platform/silabs/wifi/SiWx/ncp/sl_board_configuration.h>
+#include <platform/silabs/wifi/ncp/spi_multiplex.h>
#define USART_INITSYNC_BAUDRATE 12500000
@@ -48,4 +40,3 @@
extern uint32_t rx_ldma_channel;
extern uint32_t tx_ldma_channel;
-#endif // SL_SI91X_NCP_UTILITY_H
diff --git a/src/platform/silabs/wifi/wf200/platform/spi_multiplex.h b/src/platform/silabs/wifi/ncp/spi_multiplex.h
similarity index 100%
rename from src/platform/silabs/wifi/wf200/platform/spi_multiplex.h
rename to src/platform/silabs/wifi/ncp/spi_multiplex.h
diff --git a/src/platform/silabs/wifi/rs911x/platform/efx_spi.c b/src/platform/silabs/wifi/rs911x/ncp/efx_spi.c
similarity index 99%
rename from src/platform/silabs/wifi/rs911x/platform/efx_spi.c
rename to src/platform/silabs/wifi/rs911x/ncp/efx_spi.c
index a339f71..2467bd3 100644
--- a/src/platform/silabs/wifi/rs911x/platform/efx_spi.c
+++ b/src/platform/silabs/wifi/rs911x/ncp/efx_spi.c
@@ -34,7 +34,7 @@
#include "sl_status.h"
#include "spidrv.h"
#include "task.h"
-#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#include <platform/silabs/wifi/ncp/spi_multiplex.h>
#ifdef SL_BOARD_NAME
#include "sl_board_control.h"
diff --git a/src/platform/silabs/wifi/rs911x/platform/rsi_board_configuration.h b/src/platform/silabs/wifi/rs911x/ncp/rsi_board_configuration.h
similarity index 100%
rename from src/platform/silabs/wifi/rs911x/platform/rsi_board_configuration.h
rename to src/platform/silabs/wifi/rs911x/ncp/rsi_board_configuration.h
diff --git a/src/platform/silabs/wifi/rs911x/platform/rsi_hal.h b/src/platform/silabs/wifi/rs911x/ncp/rsi_hal.h
similarity index 100%
rename from src/platform/silabs/wifi/rs911x/platform/rsi_hal.h
rename to src/platform/silabs/wifi/rs911x/ncp/rsi_hal.h
diff --git a/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_interrupt.c b/src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_interrupt.c
similarity index 95%
rename from src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_interrupt.c
rename to src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_interrupt.c
index 8bd277e..d1d1bd2 100644
--- a/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_interrupt.c
+++ b/src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_interrupt.c
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "FreeRTOS.h"
#include "dmadrv.h"
#include "em_chip.h"
#include "em_cmu.h"
@@ -27,25 +24,16 @@
#include "em_gpio.h"
#include "em_ldma.h"
#include "em_usart.h"
-#include "gpiointerrupt.h"
-#include "sl_device_init_clocks.h"
-#include "sl_status.h"
-
-#include "FreeRTOS.h"
#include "event_groups.h"
-#include "task.h"
-
-#if (SLI_SI91X_MCU_INTERFACE | EXP_BOARD)
-#include "sl_board_configuration.h"
-
-#include "sl_rsi_utility.h"
-#include "sl_si91x_host_interface.h"
-
-void gpio_interrupt(uint8_t interrupt_number);
-#else
+#include "gpiointerrupt.h"
#include "rsi_board_configuration.h"
#include "rsi_driver.h"
-#endif
+#include "sl_device_init_clocks.h"
+#include "sl_status.h"
+#include "task.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
typedef void (*UserIntCallBack_t)(void);
UserIntCallBack_t call_back, gpio_callback;
diff --git a/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_ioports.c b/src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_ioports.c
similarity index 99%
rename from src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_ioports.c
rename to src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_ioports.c
index ba517b4..5e4089d 100644
--- a/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_ioports.c
+++ b/src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_ioports.c
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "FreeRTOS.h"
#include "dmadrv.h"
#include "em_chip.h"
#include "em_cmu.h"
@@ -27,16 +24,17 @@
#include "em_gpio.h"
#include "em_ldma.h"
#include "em_usart.h"
-#include "gpiointerrupt.h"
-#include "sl_device_init_clocks.h"
-#include "sl_status.h"
-
-#include "FreeRTOS.h"
#include "event_groups.h"
-#include "task.h"
-
+#include "gpiointerrupt.h"
#include "rsi_board_configuration.h"
#include "rsi_driver.h"
+#include "sl_device_init_clocks.h"
+#include "sl_status.h"
+#include "task.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
/*===========================================================*/
/**
* @fn void rsi_hal_config_gpio(uint8_t gpio_number,uint8_t mode,uint8_t value)
diff --git a/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_rtc.c b/src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_rtc.c
similarity index 100%
rename from src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_rtc.c
rename to src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_rtc.c
diff --git a/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_timer.c b/src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_timer.c
similarity index 100%
rename from src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_timer.c
rename to src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_timer.c
diff --git a/src/platform/silabs/wifi/rs911x/rsi_wlan_config.h b/src/platform/silabs/wifi/rs911x/ncp/rsi_wlan_config.h
similarity index 97%
rename from src/platform/silabs/wifi/rs911x/rsi_wlan_config.h
rename to src/platform/silabs/wifi/rs911x/ncp/rsi_wlan_config.h
index b851cd7..6e14347 100644
--- a/src/platform/silabs/wifi/rs911x/rsi_wlan_config.h
+++ b/src/platform/silabs/wifi/rs911x/ncp/rsi_wlan_config.h
@@ -46,18 +46,9 @@
//! To set Extended custom feature select bit map
#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION
-#ifdef CHIP_9117
-#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP \
- (EXT_FEAT_448K_M4SS_256K | EXT_FEAT_LOW_POWER_MODE | EXT_FEAT_XTAL_CLK_ENABLE | EXT_FEAT_IEEE_80211W)
-#else /* !CHIP_9117 */
#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (EXT_FEAT_384K_MODE | EXT_FEAT_IEEE_80211W)
-#endif /* CHIP_9117 */
-#else /* !WIFI_ENABLE_SECURITY_WPA3_TRANSITION */
-#ifdef CHIP_9117
-#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (EXT_FEAT_448K_M4SS_256K | EXT_FEAT_LOW_POWER_MODE | EXT_FEAT_XTAL_CLK_ENABLE)
-#else /* !CHIP_9117 */
+#else /* !WIFI_ENABLE_SECURITY_WPA3_TRANSITION */
#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP EXT_FEAT_384K_MODE
-#endif /* CHIP_9117 */
#endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */
//! To set Extended TCPIP feature select bit map
diff --git a/src/platform/silabs/wifi/rs911x/platform/sl_board_configuration.h b/src/platform/silabs/wifi/rs911x/ncp/sl_board_configuration.h
similarity index 100%
rename from src/platform/silabs/wifi/rs911x/platform/sl_board_configuration.h
rename to src/platform/silabs/wifi/rs911x/ncp/sl_board_configuration.h
diff --git a/src/platform/silabs/wifi/rs911x/rs911x.gni b/src/platform/silabs/wifi/rs911x/rs911x.gni
index 3daba8b..54a53fb 100644
--- a/src/platform/silabs/wifi/rs911x/rs911x.gni
+++ b/src/platform/silabs/wifi/rs911x/rs911x.gni
@@ -18,12 +18,12 @@
rs911x_src_plat = [
"${chip_root}/src/platform/silabs/wifi/rs911x/WifiInterface.cpp",
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_interrupt.c",
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_ioports.c",
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/rsi_hal_mcu_timer.c",
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/efx_spi.c",
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/rsi_board_configuration.h",
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform/rsi_hal.h",
+ "${chip_root}/src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_interrupt.c",
+ "${chip_root}/src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_ioports.c",
+ "${chip_root}/src/platform/silabs/wifi/rs911x/ncp/rsi_hal_mcu_timer.c",
+ "${chip_root}/src/platform/silabs/wifi/rs911x/ncp/efx_spi.c",
+ "${chip_root}/src/platform/silabs/wifi/rs911x/ncp/rsi_board_configuration.h",
+ "${chip_root}/src/platform/silabs/wifi/rs911x/ncp/rsi_hal.h",
"${chip_root}/src/platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.cpp",
]
diff --git a/src/platform/silabs/wifi/wf200/WifiInterface.cpp b/src/platform/silabs/wifi/wf200/WifiInterface.cpp
index ebeaa2d..1ff37ab 100644
--- a/src/platform/silabs/wifi/wf200/WifiInterface.cpp
+++ b/src/platform/silabs/wifi/wf200/WifiInterface.cpp
@@ -33,9 +33,9 @@
#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
#include <platform/silabs/wifi/lwip-support/dhcp_client.h>
#include <platform/silabs/wifi/lwip-support/ethernetif.h>
-#include <platform/silabs/wifi/wf200/platform/sl_wfx_board.h>
-#include <platform/silabs/wifi/wf200/platform/sl_wfx_host.h>
-#include <platform/silabs/wifi/wf200/platform/sl_wfx_task.h>
+#include <platform/silabs/wifi/wf200/ncp/sl_wfx_board.h>
+#include <platform/silabs/wifi/wf200/ncp/sl_wfx_host.h>
+#include <platform/silabs/wifi/wf200/ncp/sl_wfx_task.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/platform/silabs/wifi/wf200/platform/efr_spi.c b/src/platform/silabs/wifi/wf200/ncp/efr_spi.c
similarity index 99%
rename from src/platform/silabs/wifi/wf200/platform/efr_spi.c
rename to src/platform/silabs/wifi/wf200/ncp/efr_spi.c
index 434253f..55f781d 100644
--- a/src/platform/silabs/wifi/wf200/platform/efr_spi.c
+++ b/src/platform/silabs/wifi/wf200/ncp/efr_spi.c
@@ -32,7 +32,7 @@
#include "sl_wfx_host_api.h"
#include "sl_wfx_task.h"
#include "spidrv.h"
-#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#include <platform/silabs/wifi/ncp/spi_multiplex.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/platform/silabs/wifi/wf200/platform/sl_custom_board.h b/src/platform/silabs/wifi/wf200/ncp/sl_custom_board.h
similarity index 100%
rename from src/platform/silabs/wifi/wf200/platform/sl_custom_board.h
rename to src/platform/silabs/wifi/wf200/ncp/sl_custom_board.h
diff --git a/src/platform/silabs/wifi/wf200/platform/sl_wfx_board.h b/src/platform/silabs/wifi/wf200/ncp/sl_wfx_board.h
similarity index 100%
rename from src/platform/silabs/wifi/wf200/platform/sl_wfx_board.h
rename to src/platform/silabs/wifi/wf200/ncp/sl_wfx_board.h
diff --git a/src/platform/silabs/wifi/wf200/platform/sl_wfx_host.h b/src/platform/silabs/wifi/wf200/ncp/sl_wfx_host.h
similarity index 100%
rename from src/platform/silabs/wifi/wf200/platform/sl_wfx_host.h
rename to src/platform/silabs/wifi/wf200/ncp/sl_wfx_host.h
diff --git a/src/platform/silabs/wifi/wf200/platform/sl_wfx_task.c b/src/platform/silabs/wifi/wf200/ncp/sl_wfx_task.c
similarity index 100%
rename from src/platform/silabs/wifi/wf200/platform/sl_wfx_task.c
rename to src/platform/silabs/wifi/wf200/ncp/sl_wfx_task.c
diff --git a/src/platform/silabs/wifi/wf200/platform/sl_wfx_task.h b/src/platform/silabs/wifi/wf200/ncp/sl_wfx_task.h
similarity index 100%
rename from src/platform/silabs/wifi/wf200/platform/sl_wfx_task.h
rename to src/platform/silabs/wifi/wf200/ncp/sl_wfx_task.h
diff --git a/src/platform/silabs/wifi/wf200/platform/wf200_init.c b/src/platform/silabs/wifi/wf200/ncp/wf200_init.c
similarity index 100%
rename from src/platform/silabs/wifi/wf200/platform/wf200_init.c
rename to src/platform/silabs/wifi/wf200/ncp/wf200_init.c
diff --git a/src/platform/silabs/wifi/wf200/wf200.gni b/src/platform/silabs/wifi/wf200/wf200.gni
index c8e1308..0d166b1 100644
--- a/src/platform/silabs/wifi/wf200/wf200.gni
+++ b/src/platform/silabs/wifi/wf200/wf200.gni
@@ -18,12 +18,12 @@
wf200_plat_src = [
"${chip_root}/src/platform/silabs/wifi/wf200/WifiInterface.cpp",
- "${chip_root}/src/platform/silabs/wifi/wf200/platform/sl_wfx_task.c",
- "${chip_root}/src/platform/silabs/wifi/wf200/platform/wf200_init.c",
- "${chip_root}/src/platform/silabs/wifi/wf200/platform/efr_spi.c",
- "${chip_root}/src/platform/silabs/wifi/wf200/platform/sl_wfx_board.h",
- "${chip_root}/src/platform/silabs/wifi/wf200/platform/sl_wfx_host.h",
- "${chip_root}/src/platform/silabs/wifi/wf200/platform/sl_wfx_task.h",
- "${chip_root}/src/platform/silabs/wifi/wf200/platform/sl_custom_board.h",
- "${chip_root}/src/platform/silabs/wifi/wf200/platform/spi_multiplex.h",
+ "${chip_root}/src/platform/silabs/wifi/wf200/ncp/sl_wfx_task.c",
+ "${chip_root}/src/platform/silabs/wifi/wf200/ncp/wf200_init.c",
+ "${chip_root}/src/platform/silabs/wifi/wf200/ncp/efr_spi.c",
+ "${chip_root}/src/platform/silabs/wifi/wf200/ncp/sl_wfx_board.h",
+ "${chip_root}/src/platform/silabs/wifi/wf200/ncp/sl_wfx_host.h",
+ "${chip_root}/src/platform/silabs/wifi/wf200/ncp/sl_wfx_task.h",
+ "${chip_root}/src/platform/silabs/wifi/wf200/ncp/sl_custom_board.h",
+ "${chip_root}/src/platform/silabs/wifi/ncp/spi_multiplex.h",
]
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index 4029604..7861e82 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -370,10 +370,7 @@
if (use_rs9116) {
# TODO: we should create a seperate directory for headers that are necessary for the underlying sdks
- _include_dirs += [
- "${chip_root}/src/platform/silabs/wifi/rs911x/platform",
- "${chip_root}/src/platform/silabs/wifi/rs911x",
- ]
+ _include_dirs += [ "${chip_root}/src/platform/silabs/wifi/rs911x/ncp" ]
}
if (use_rs9116 || use_SiWx917) {
