[Silabs] Rename Wifi abstraction file names (project-chip#36992)

* Rename Wifi abstraction file names * Correct file names * correct files names
pgregorr-amazon · Jan 9, 2025 · b4bf951 · b4bf951
1 parent 30cb6ce
commit b4bf951
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 32 deletions.
diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp
@@ -66,7 +66,7 @@
 #ifdef SL_WIFI
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <platform/silabs/NetworkCommissioningWiFiDriver.h>
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #endif // SL_WIFI
 
 #ifdef DIC_ENABLE

diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
@@ -25,7 +25,7 @@
 #include <mbedtls/platform.h>
 
 #ifdef SL_WIFI
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #endif /* SL_WIFI */
 
 #if PW_RPC_ENABLED
@@ -42,7 +42,7 @@
 
 #if defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1
 #include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
-#include <platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h>
+#include <platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.h>
 #endif // SLI_SI91X_MCU_INTERFACE
 
 #include <crypto/CHIPCryptoPAL.h>

diff --git a/examples/window-app/silabs/src/WindowManager.cpp b/examples/window-app/silabs/src/WindowManager.cpp
@@ -37,7 +37,7 @@
 #ifdef SL_WIFI
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <platform/silabs/NetworkCommissioningWiFiDriver.h>
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #endif
 
 #ifdef DISPLAY_ENABLED

diff --git a/src/platform/silabs/CHIPDevicePlatformEvent.h b/src/platform/silabs/CHIPDevicePlatformEvent.h
@@ -26,7 +26,7 @@
 
 #include <platform/CHIPDeviceEvent.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #endif
 
 namespace chip {

diff --git a/src/platform/silabs/ConfigurationManagerImpl.cpp b/src/platform/silabs/ConfigurationManagerImpl.cpp
@@ -31,7 +31,7 @@
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #endif
 
 namespace chip {

diff --git a/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp b/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp
@@ -40,7 +40,7 @@
 #endif
 
 #include "CHIPDevicePlatformConfig.h"
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/src/platform/silabs/NetworkCommissioningWiFiDriver.h b/src/platform/silabs/NetworkCommissioningWiFiDriver.h
@@ -18,7 +18,7 @@
 #pragma once
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
 #include <platform/NetworkCommissioning.h>
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/src/platform/silabs/PlatformManagerImpl.h b/src/platform/silabs/PlatformManagerImpl.h
@@ -26,7 +26,7 @@
 
 #include <platform/internal/GenericPlatformManagerImpl_CMSISOS.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #endif
 #include <cmsis_os2.h>
 

diff --git a/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp b/src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp
@@ -21,7 +21,7 @@
 #include <platform/silabs/OTAImageProcessorImpl.h>
 
 #include <platform/silabs/SilabsConfig.h>
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/src/platform/silabs/wifi/BUILD.gn b/src/platform/silabs/wifi/BUILD.gn
@@ -102,8 +102,8 @@ config("wifi-platform-config") {
 
 source_set("wifi-platform") {
   sources = [
-    "${silabs_platform_dir}/wifi/WifiInterfaceAbstraction.cpp",
-    "${silabs_platform_dir}/wifi/WifiInterfaceAbstraction.h",
+    "${silabs_platform_dir}/wifi/WifiInterface.cpp",
+    "${silabs_platform_dir}/wifi/WifiInterface.h",
     "${silabs_platform_dir}/wifi/wfx_msgs.h",
   ]
 
@@ -131,9 +131,9 @@ source_set("wifi-platform") {
 
   if (wifi_soc) {
     sources += [
-      "${silabs_platform_dir}/wifi/SiWx/WifiInterface.cpp",
-      "${silabs_platform_dir}/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.cpp",
-      "${silabs_platform_dir}/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h",
+      "${silabs_platform_dir}/wifi/SiWx/WifiInterfaceImpl.cpp",
+      "${silabs_platform_dir}/wifi/wiseconnect-interface/WiseconnectWifiInterface.cpp",
+      "${silabs_platform_dir}/wifi/wiseconnect-interface/WiseconnectWifiInterface.h",
 
       # Wi-Fi Config - Using the file sdk support until the wiseconnect file is fixed
       "${sdk_support_root}/components/service/network_manager/src/sl_net_for_lwip.c",

diff --git a/...atform/silabs/wifi/SiWx/WifiInterface.cpp → ...rm/silabs/wifi/SiWx/WifiInterfaceImpl.cpp b/...atform/silabs/wifi/SiWx/WifiInterface.cpp → ...rm/silabs/wifi/SiWx/WifiInterfaceImpl.cpp
@@ -39,8 +39,8 @@
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
-#include <platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
+#include <platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.h>
 
 extern "C" {
 #include "sl_si91x_driver.h"

diff --git a/src/platform/silabs/wifi/SiWx/ncp/rs9117.gni b/src/platform/silabs/wifi/SiWx/ncp/rs9117.gni
@@ -17,11 +17,11 @@ import("//build_overrides/efr32_sdk.gni")
 import("${silabs_sdk_build_root}/efr32_sdk.gni")
 
 rs911x_src_plat = [
-  "${chip_root}/src/platform/silabs/wifi/SiWx/WifiInterface.cpp",
+  "${chip_root}/src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp",
   "${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",
+  "${chip_root}/src/platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.cpp",
+  "${chip_root}/src/platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.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.

diff --git a/.../silabs/wifi/WifiInterfaceAbstraction.cpp → src/platform/silabs/wifi/WifiInterface.cpp b/.../silabs/wifi/WifiInterfaceAbstraction.cpp → src/platform/silabs/wifi/WifiInterface.cpp
@@ -23,7 +23,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/TypeTraits.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/...rm/silabs/wifi/WifiInterfaceAbstraction.h → src/platform/silabs/wifi/WifiInterface.h b/...rm/silabs/wifi/WifiInterfaceAbstraction.h → src/platform/silabs/wifi/WifiInterface.h
diff --git a/src/platform/silabs/wifi/lwip-support/dhcp_client.cpp b/src/platform/silabs/wifi/lwip-support/dhcp_client.cpp
@@ -23,7 +23,7 @@
 
 #include "dhcp_client.h"
 #include "lwip/dhcp.h"
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 
 #include <lib/support/logging/CHIPLogging.h>
 

diff --git a/src/platform/silabs/wifi/lwip-support/ethernetif.cpp b/src/platform/silabs/wifi/lwip-support/ethernetif.cpp
@@ -44,7 +44,7 @@ extern "C" {
 #endif // (SLI_SI91X_MCU_INTERFACE | EXP_BOARD)
 #endif // WF200_WIFI
 
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #ifdef WF200_WIFI
 #include "sl_wfx.h"
 #endif

diff --git a/src/platform/silabs/wifi/lwip-support/lwip_netif.cpp b/src/platform/silabs/wifi/lwip-support/lwip_netif.cpp
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 
 #include "dhcp_client.h"
 #include "ethernetif.h"

diff --git a/...form/silabs/wifi/rs911x/WifiInterface.cpp → .../silabs/wifi/rs911x/WifiInterfaceImpl.cpp b/...form/silabs/wifi/rs911x/WifiInterface.cpp → .../silabs/wifi/rs911x/WifiInterfaceImpl.cpp
@@ -23,10 +23,10 @@
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #include <platform/silabs/wifi/lwip-support/dhcp_client.h>
 #include <platform/silabs/wifi/lwip-support/ethernetif.h>
-#include <platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h>
+#include <platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.h>
 
 extern "C" {
 #include "rsi_bootup_config.h"

diff --git a/src/platform/silabs/wifi/rs911x/rs911x.gni b/src/platform/silabs/wifi/rs911x/rs911x.gni
@@ -17,14 +17,14 @@ import("//build_overrides/efr32_sdk.gni")
 import("${silabs_sdk_build_root}/efr32_sdk.gni")
 
 rs911x_src_plat = [
-  "${chip_root}/src/platform/silabs/wifi/rs911x/WifiInterface.cpp",
+  "${chip_root}/src/platform/silabs/wifi/rs911x/WifiInterfaceImpl.cpp",
   "${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",
+  "${chip_root}/src/platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.cpp",
 ]
 
 #

diff --git a/...tform/silabs/wifi/wf200/WifiInterface.cpp → ...m/silabs/wifi/wf200/WifiInterfaceImpl.cpp b/...tform/silabs/wifi/wf200/WifiInterface.cpp → ...m/silabs/wifi/wf200/WifiInterfaceImpl.cpp
@@ -30,7 +30,7 @@
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #include <platform/silabs/wifi/lwip-support/dhcp_client.h>
 #include <platform/silabs/wifi/lwip-support/ethernetif.h>
 #include <platform/silabs/wifi/wf200/ncp/sl_wfx_board.h>

diff --git a/src/platform/silabs/wifi/wf200/wf200.gni b/src/platform/silabs/wifi/wf200/wf200.gni
@@ -17,7 +17,7 @@ import("//build_overrides/efr32_sdk.gni")
 import("${silabs_sdk_build_root}/efr32_sdk.gni")
 
 wf200_plat_src = [
-  "${chip_root}/src/platform/silabs/wifi/wf200/WifiInterface.cpp",
+  "${chip_root}/src/platform/silabs/wifi/wf200/WifiInterfaceImpl.cpp",
   "${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",

diff --git a/...ction/WiseconnectInterfaceAbstraction.cpp → ...ct-interface/WiseconnectWifiInterface.cpp b/...ction/WiseconnectInterfaceAbstraction.cpp → ...ct-interface/WiseconnectWifiInterface.cpp
@@ -16,7 +16,7 @@
 
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h>
+#include <platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.h>
 
 extern WfxRsi_t wfx_rsi;
 

diff --git a/...raction/WiseconnectInterfaceAbstraction.h → ...nect-interface/WiseconnectWifiInterface.h b/...raction/WiseconnectInterfaceAbstraction.h → ...nect-interface/WiseconnectWifiInterface.h
@@ -18,7 +18,7 @@
 #include <app/icd/server/ICDServerConfig.h>
 #include <cmsis_os2.h>
 #include <lib/support/BitFlags.h>
-#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
+#include <platform/silabs/wifi/WifiInterface.h>
 #include <sl_cmsis_os2_common.h>
 
 #define WFX_RSI_DHCP_POLL_INTERVAL (250) /* Poll interval in ms for DHCP */