[nrf noup] wifi: Migrate to nRF70 upstream

krish2718 · adigie · commit 4b484c515ecd · 2024-11-28T09:30:23.000+01:00
nRF70 support moved upstream, update the names. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no> (cherry picked from commit 218689e) Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -148,12 +148,12 @@ matter_add_gn_arg_bool  ("chip_progress_logging"                  CONFIG_MATTER_
 matter_add_gn_arg_bool  ("chip_detail_logging"                    CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 4)
 matter_add_gn_arg_bool  ("chip_automation_logging"                FALSE)
 matter_add_gn_arg_bool  ("chip_malloc_sys_heap"                   CONFIG_CHIP_MALLOC_SYS_HEAP)
-matter_add_gn_arg_bool  ("chip_enable_wifi"                       CONFIG_WIFI_NRF700X)
+matter_add_gn_arg_bool  ("chip_enable_wifi"                       CONFIG_WIFI_NRF70)
 matter_add_gn_arg_bool  ("chip_system_config_provide_statistics"  CONFIG_CHIP_STATISTICS)
 matter_add_gn_arg_bool  ("chip_enable_icd_server"                 CONFIG_CHIP_ENABLE_ICD_SUPPORT)
 matter_add_gn_arg_bool  ("chip_enable_factory_data"               CONFIG_CHIP_FACTORY_DATA)
 matter_add_gn_arg_bool  ("chip_enable_read_client"                CONFIG_CHIP_ENABLE_READ_CLIENT)
-matter_add_gn_arg_bool  ("chip_mdns_minimal"                      CONFIG_WIFI_NRF700X)
+matter_add_gn_arg_bool  ("chip_mdns_minimal"                      CONFIG_WIFI_NRF70)
 matter_add_gn_arg_bool  ("chip_mdns_platform"                     CONFIG_NET_L2_OPENTHREAD)
 
 if (CONFIG_CHIP_ENABLE_ICD_SUPPORT)
@@ -173,7 +173,7 @@ if (CONFIG_CHIP_ROTATING_DEVICE_ID)
     matter_add_gn_arg_bool("chip_enable_additional_data_advertising" TRUE)
 endif()
 
-if(CONFIG_WIFI_NRF700X)
+if(CONFIG_WIFI_NRF70)
     matter_add_gn_arg_string("chip_mdns" "minimal")
 elseif (CONFIG_NET_L2_OPENTHREAD)
     matter_add_gn_arg_string("chip_mdns" "platform")
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -228,7 +228,7 @@ config NRF_WIFI_FW_PATCH_DFU
 # ==============================================================================
 
 config NET_L2_OPENTHREAD
-    default y if !WIFI_NRF700X
+    default y if !WIFI_NRF70
 
 if NET_L2_OPENTHREAD
 
@@ -253,35 +253,35 @@ endif # NET_L2_OPENTHREAD
 
 if CHIP_WIFI
 
-choice WPA_SUPP_LOG_LEVEL_CHOICE
-    default WPA_SUPP_LOG_LEVEL_ERR
+choice WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_CHOICE
+    default WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_ERR
 endchoice
 
 # it saves us 20kB of FLASH
-config WPA_SUPP_NO_DEBUG
+config WIFI_NM_WPA_SUPPLICANT_NO_DEBUG
     default y
 
-config NRF700X_LOG_VERBOSE
+config NRF70_LOG_VERBOSE
     default n
 
-choice WIFI_NRF700X_LOG_LEVEL_CHOICE
-    default WIFI_NRF700X_LOG_LEVEL_OFF
+choice WIFI_NRF70_LOG_LEVEL_CHOICE
+    default WIFI_NRF70_LOG_LEVEL_OFF
 endchoice
 
 config NRF_WIFI_LOW_POWER
     default n
 
-config NRF700X_RX_NUM_BUFS
+config NRF70_RX_NUM_BUFS
     default 16
 
-config NRF700X_MAX_TX_TOKENS
+config NRF70_MAX_TX_TOKENS
     default 10
 
-config NRF700X_MAX_TX_AGGREGATION
+config NRF70_MAX_TX_AGGREGATION
     default 1
 
 # it saves 25kB of FLASH
-config WPA_SUPP_ADVANCED_FEATURES
+config WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES
     default n
 
 endif # CHIP_WIFI
diff --git a/config/nrfconnect/chip-module/Kconfig.features b/config/nrfconnect/chip-module/Kconfig.features
@@ -22,9 +22,9 @@ if CHIP
 config CHIP_WIFI
 	bool "Enable nrfconnect Wi-Fi support"
 	default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
-	select WIFI_NRF700X
+	select WIFI_NRF70
 	select WIFI
-	select WPA_SUPP
+	select WIFI_NM_WPA_SUPPLICANT
 	imply NORDIC_SECURITY_BACKEND
 	imply MBEDTLS_ENTROPY_C
 	imply MBEDTLS_PSA_CRYPTO_C
diff --git a/examples/chef/nrfconnect/main.cpp b/examples/chef/nrfconnect/main.cpp
@@ -109,7 +109,7 @@ int main()
         ChipLogError(AppServer, "ConnectivityMgr().SetThreadDeviceType() failed");
         return 1;
     }
-#elif !defined(CONFIG_WIFI_NRF700X)
+#elif !defined(CONFIG_WIFI_NRF70)
     return CHIP_ERROR_INTERNAL;
 #endif
 
diff --git a/examples/pump-app/nrfconnect/main/AppTask.cpp b/examples/pump-app/nrfconnect/main/AppTask.cpp
@@ -137,7 +137,7 @@ CHIP_ERROR AppTask::Init()
         LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");
         return err;
     }
-#elif !defined(CONFIG_WIFI_NRF700X)
+#elif !defined(CONFIG_WIFI_NRF70)
     return CHIP_ERROR_INTERNAL;
 #endif
 
diff --git a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp
@@ -125,7 +125,7 @@ CHIP_ERROR AppTask::Init()
         LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");
         return err;
     }
-#elif !defined(CONFIG_WIFI_NRF700X)
+#elif !defined(CONFIG_WIFI_NRF70)
     return CHIP_ERROR_INTERNAL;
 #endif
 
diff --git a/examples/window-app/nrfconnect/main/AppTask.cpp b/examples/window-app/nrfconnect/main/AppTask.cpp
@@ -142,7 +142,7 @@ CHIP_ERROR AppTask::Init()
         LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");
         return err;
     }
-#elif !defined(CONFIG_WIFI_NRF700X)
+#elif !defined(CONFIG_WIFI_NRF70)
     return CHIP_ERROR_INTERNAL;
 #endif
 
diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
@@ -64,8 +64,8 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
 #endif
 
-#ifdef CONFIG_WIFI_NRF700X
-#define CHIP_DEVICE_CONFIG_ENABLE_WIFI CONFIG_WIFI_NRF700X
+#ifdef CONFIG_WIFI_NRF70
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI CONFIG_WIFI_NRF70
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
 #else
diff --git a/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.cpp b/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.cpp
@@ -23,7 +23,7 @@
 
 #include "DiagnosticDataProviderImplNrf.h"
 
-#ifdef CONFIG_WIFI_NRF700X
+#ifdef CONFIG_WIFI_NRF70
 #include <platform/nrfconnect/wifi/WiFiManager.h>
 #endif
 
@@ -41,7 +41,7 @@ DiagnosticDataProviderImplNrf & DiagnosticDataProviderImplNrf::GetDefaultInstanc
     return sInstance;
 }
 
-#ifdef CONFIG_WIFI_NRF700X
+#ifdef CONFIG_WIFI_NRF70
 CHIP_ERROR DiagnosticDataProviderImplNrf::GetWiFiBssId(MutableByteSpan & value)
 {
     WiFiManager::WiFiInfo info;
diff --git a/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.h b/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.h
@@ -31,7 +31,7 @@ namespace DeviceLayer {
 class DiagnosticDataProviderImplNrf : public DiagnosticDataProviderImpl
 {
 public:
-#ifdef CONFIG_WIFI_NRF700X
+#ifdef CONFIG_WIFI_NRF70
     CHIP_ERROR GetWiFiBssId(MutableByteSpan & value) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
     CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion) override;
diff --git a/src/platform/nrfconnect/SystemPlatformConfig.h b/src/platform/nrfconnect/SystemPlatformConfig.h
@@ -52,7 +52,7 @@ struct ChipDeviceEvent;
 #endif
 
 #ifndef CHIP_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX
-#ifdef CONFIG_WIFI_NRF700X
+#ifdef CONFIG_WIFI_NRF70
 // Minimal mDNS uses Matter packet buffers, so as long as minimal mDNS is used
 // in Nordic's Wi-Fi solution, the packet buffers must be a bit bigger than what
 // is required by Matter.
@@ -62,7 +62,7 @@ struct ChipDeviceEvent;
 // unless for large messages that can be sent over BTP or TCP. But those will
 // likely require a separate buffer pool or employ chained buffers.
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX 1280
-#endif // CONFIG_WIFI_NRF700X
+#endif // CONFIG_WIFI_NRF70
 #endif // CHIP_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX
 
 // ========== Platform-specific Configuration Overrides =========

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ int main()`
`109`	`109`	`ChipLogError(AppServer, "ConnectivityMgr().SetThreadDeviceType() failed");`
`110`	`110`	`return 1;`
`111`	`111`	`}`
`112`		`-#elif !defined(CONFIG_WIFI_NRF700X)`
	`112`	`+#elif !defined(CONFIG_WIFI_NRF70)`
`113`	`113`	`return CHIP_ERROR_INTERNAL;`
`114`	`114`	`#endif`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ CHIP_ERROR AppTask::Init()`
`137`	`137`	`LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");`
`138`	`138`	`return err;`
`139`	`139`	`}`
`140`		`-#elif !defined(CONFIG_WIFI_NRF700X)`
	`140`	`+#elif !defined(CONFIG_WIFI_NRF70)`
`141`	`141`	`return CHIP_ERROR_INTERNAL;`
`142`	`142`	`#endif`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ CHIP_ERROR AppTask::Init()`
`125`	`125`	`LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");`
`126`	`126`	`return err;`
`127`	`127`	`}`
`128`		`-#elif !defined(CONFIG_WIFI_NRF700X)`
	`128`	`+#elif !defined(CONFIG_WIFI_NRF70)`
`129`	`129`	`return CHIP_ERROR_INTERNAL;`
`130`	`130`	`#endif`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ CHIP_ERROR AppTask::Init()`
`142`	`142`	`LOG_ERR("ConnectivityMgr().SetThreadDeviceType() failed");`
`143`	`143`	`return err;`
`144`	`144`	`}`
`145`		`-#elif !defined(CONFIG_WIFI_NRF700X)`
	`145`	`+#elif !defined(CONFIG_WIFI_NRF70)`
`146`	`146`	`return CHIP_ERROR_INTERNAL;`
`147`	`147`	`#endif`
`148`	`148`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`#include "DiagnosticDataProviderImplNrf.h"`
`25`	`25`
`26`		`-#ifdef CONFIG_WIFI_NRF700X`
	`26`	`+#ifdef CONFIG_WIFI_NRF70`
`27`	`27`	`#include <platform/nrfconnect/wifi/WiFiManager.h>`
`28`	`28`	`#endif`
`29`	`29`
`@@ -41,7 +41,7 @@ DiagnosticDataProviderImplNrf & DiagnosticDataProviderImplNrf::GetDefaultInstanc`
`41`	`41`	`return sInstance;`
`42`	`42`	`}`
`43`	`43`
`44`		`-#ifdef CONFIG_WIFI_NRF700X`
	`44`	`+#ifdef CONFIG_WIFI_NRF70`
`45`	`45`	`CHIP_ERROR DiagnosticDataProviderImplNrf::GetWiFiBssId(MutableByteSpan & value)`
`46`	`46`	`{`
`47`	`47`	`WiFiManager::WiFiInfo info;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace DeviceLayer {`
`31`	`31`	`class DiagnosticDataProviderImplNrf : public DiagnosticDataProviderImpl`
`32`	`32`	`{`
`33`	`33`	`public:`
`34`		`-#ifdef CONFIG_WIFI_NRF700X`
	`34`	`+#ifdef CONFIG_WIFI_NRF70`
`35`	`35`	`CHIP_ERROR GetWiFiBssId(MutableByteSpan & value) override;`
`36`	`36`	`CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;`
`37`	`37`	`CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion) override;`