drivers: wifi: nrf71: Restructure driver sources by operating mode

Reorganize the nRF71 Wi-Fi driver layout to separate system,
radio test, and offloaded raw TX modes into dedicated source and
header trees. Move fmac_main into system/main, consolidate offloaded
raw TX into src/offload_raw_tx/api.c, and add shared rf_params and
vtf helpers under src/common.

Remove the legacy off_raw_tx subtree, debug shell, and the public
nrf71_radio_test.h header in favor of in-tree radio_test APIs.
Update dependent samples to use the new include paths.

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>

Author: sachinthegreen

drivers/wifi/nrf71/CMakeLists.txt

@@ -48,6 +48,8 @@ function(nrf71_wifi_setup_include_and_sources)
     ${nrf71_bus_dir}/device.c
     ${nrf71_bus_dir}/ipc_if.c
     ${nrf71_bus_dir}/ipc_service.c
+    src/common/rf_params.c
+    src/common/vtf.c
   )
 
   if(CONFIG_NRF71_RADIO_TEST)
@@ -56,6 +58,8 @@ function(nrf71_wifi_setup_include_and_sources)
       ${nrf71_osal_base}/fw_if/umac_if/src/radio_test/fmac_cmd.c
       ${nrf71_osal_base}/fw_if/umac_if/src/radio_test/fmac_event.c
       ${nrf71_osal_base}/hw_if/hal/src/radio_test/hal_api.c
+      src/radio_test/main.c
+      src/radio_test/api.c
     )
 
     zephyr_library_include_directories(
@@ -82,6 +86,7 @@ function(nrf71_wifi_setup_include_and_sources)
       ${nrf71_osal_base}/fw_if/umac_if/src/offload_raw_tx/fmac_cmd.c
       ${nrf71_osal_base}/fw_if/umac_if/src/offload_raw_tx/fmac_event.c
       ${nrf71_osal_base}/hw_if/hal/src/offload_raw_tx/hal_api.c
+      src/offload_raw_tx/api.c
     )
   endif()
 
@@ -205,54 +210,39 @@ function(nrf71_wifi_setup_include_and_sources)
 
   zephyr_library_compile_definitions(NRF_WIFI_RX_BUFF_PROG_UMAC)
 
-  zephyr_library_include_directories_ifdef(CONFIG_NRF71_OFFLOADED_RAW_TX
-    off_raw_tx/inc
-  )
 
 
   # ---- Sources: driver (Zephyr shim, net_if, mgmt, wpa, etc.) ----
 
   # Coexistence transport used by the standalone nRF71 SR coexistence driver
   # (drivers/nrf71_sr_coex) to reach the Coexistence Manager over FMAC.
   zephyr_library_sources_ifdef(CONFIG_NRF71_SR_COEX_DRIVER
-    src/coex_transport.c
+    src/system/coex_transport.c
   )
 
-  zephyr_library_sources_ifndef(CONFIG_NRF71_OFFLOADED_RAW_TX
-    src/fmac_main.c
+  zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_MGMT
+    src/system/wifi_mgmt_scan.c
   )
 
-  if(NOT CONFIG_NRF71_RADIO_TEST AND NOT CONFIG_NRF71_OFFLOADED_RAW_TX)
-    zephyr_library_sources(src/net_if.c)
+  if(CONFIG_NRF71_SYSTEM_MODE OR CONFIG_NRF71_SCAN_ONLY)
+    zephyr_library_sources(
+      src/system/main.c
+      src/system/net_if.c
+    )
   endif()
 
-  zephyr_library_sources_ifdef(CONFIG_NET_L2_WIFI_MGMT
-    src/wifi_mgmt_scan.c
-  )
-
   zephyr_library_sources_ifdef(CONFIG_NRF71_SYSTEM_MODE
-    src/wifi_mgmt.c
-  )
-
-  zephyr_library_sources_ifdef(CONFIG_NRF71_OFFLOADED_RAW_TX
-    off_raw_tx/src/off_raw_tx_api.c
+    src/system/wifi_mgmt.c
   )
 
   zephyr_library_sources_ifdef(CONFIG_NRF71_STA_MODE
-    src/wpa_supp_if.c
-    src/wifi_mgmt.c
+    src/system/wpa_supp_if.c
+    src/system/wifi_mgmt.c
   )
 
   zephyr_library_sources_ifdef(CONFIG_NRF71_UTIL
-    src/wifi_util.c
-  )
-
-  if(CONFIG_NRF71_UTIL OR CONFIG_NRF71_DEBUG_SHELL)
-    zephyr_library_sources(src/shell.c)
-  endif()
-
-  zephyr_library_sources_ifdef(CONFIG_NRF71_DEBUG_SHELL
-    src/debug_shell.c
+    src/common/shell.c
+    src/common/util_shell.c
   )
 endfunction()
 

drivers/wifi/nrf71/Kconfig

@@ -212,10 +212,6 @@ config NRF71_UTIL
 	bool "Utility shell in nRF71 driver"
 	depends on SHELL
 
-config NRF71_DEBUG_SHELL
-	bool "Debug shell in nRF71 driver"
-	depends on SHELL
-
 config NRF71_PCB_LOSS_2G
 	int "PCB loss for 2.4 GHz band"
 	default 0

drivers/wifi/nrf71/inc/common/rf_params.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief Header containing RF parameters specific declarations
+ */
+
+#ifndef __RF_PARAMS_H__
+#define __RF_PARAMS_H__
+
+#include <stdint.h>
+
+#define NUM_RF_PARAM_ADDRS 22
+
+struct rf_hex_param {
+	const char *hex_str;
+	uint8_t *bytes;
+	int bytes_len;
+};
+
+/**
+ * @brief Configure RF parameters in the RPU.
+ *
+ * @param dev_ctx Pointer to the FMAC device context.
+ * @param rf_params_addr Array of RF parameter buffer addresses (NUM_RF_PARAM_ADDRS entries).
+ *
+ * @retval NRF_WIFI_STATUS_SUCCESS On success.
+ * @retval NRF_WIFI_STATUS_FAIL On failure.
+ */
+enum nrf_wifi_status nrf_wifi_fmac_config_rf_params(void *dev_ctx,
+						    unsigned int *rf_params_addr);
+
+#endif /* __RF_PARAMS_H__ */

drivers/wifi/nrf71/inc/common/vtf.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief Header containing VTF parameters specific declarations
+ */
+
+#ifndef __VTF_H__
+#define __VTF_H__
+
+#include <common/fmac_structs_common.h>
+
+/**
+ * @brief Configure VTF parameters in the RPU.
+ *
+ * @param dev_ctx Pointer to the FMAC device context.
+ * @param voltage Voltage reading used for VTF configuration.
+ * @param temp Temperature reading used for VTF configuration.
+ * @param x0 X0 frequency value used for VTF configuration.
+ * @param vtf_buffer_start_address Output pointer to the allocated VTF parameter buffer.
+ *
+ * @retval NRF_WIFI_STATUS_SUCCESS On success.
+ * @retval NRF_WIFI_STATUS_FAIL On failure.
+ */
+enum nrf_wifi_status nrf_wifi_fmac_config_vtf_params(struct nrf_wifi_fmac_dev_ctx *dev_ctx,
+						     unsigned int voltage,
+						     unsigned int temp,
+						     unsigned int x0,
+						     unsigned int *vtf_buffer_start_address);
+#endif /* __VTF_H__ */

drivers/wifi/nrf71/inc/offload_raw_tx/api.h

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __OFF_RAW_TX_API_H__
+#define __OFF_RAW_TX_API_H__
+
+/**
+ * @brief Header containing offloaded raw TX mode specific API declarations
+ */
+
+#include <zephyr/kernel.h>
+#include <nrf71_wifi_ctrl.h>
+#include <common/rf_params.h>
+#include <common/vtf.h>
+
+/*  Minimum frame size for raw packet transmission */
+#define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MIN 26
+/*  Maximum frame size for raw packet transmission */
+#define NRF_WIFI_OFF_RAW_TX_FRAME_SIZE_MAX 600
+/* Maximum length of country code*/
+#define NRF_WIFI_COUNTRY_CODE_LEN 2
+
+struct nrf_wifi_off_raw_tx_drv_ctx {
+	void *drv_priv;
+	void *rpu_ctx;
+	uint8_t mac_addr[6];
+	unsigned int phy_rf_params_addr[NUM_RF_PARAM_ADDRS];
+	unsigned int vtf_buffer_start_address;
+};
+
+
+struct nrf_wifi_off_raw_tx_drv_priv {
+	struct nrf_wifi_fmac_priv *fmac_priv;
+	struct nrf_wifi_off_raw_tx_drv_ctx drv_ctx;
+	struct k_spinlock lock;
+};
+
+extern struct nrf_wifi_off_raw_tx_drv_priv off_raw_tx_drv_priv;
+#endif /* __OFF_RAW_TX_API_H__ */

drivers/wifi/nrf71/inc/radio_test/api.h

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief Header containing radio test API declarations
+ */
+
+#ifndef __RADIO_TEST_API_H__
+#define __RADIO_TEST_API_H__
+
+#include <zephyr/kernel.h>
+#include <nrf71_wifi_ctrl.h>
+#include <common/rf_params.h>
+#include <radio_test/fmac_api.h>
+#include <common/vtf.h>
+
+struct nrf_wifi_rt_drv_ctx {
+	void *drv_priv;
+	void *rpu_ctx;
+	struct rpu_conf_params conf_params;
+	bool rf_test_run;
+	unsigned char rf_test;
+	struct k_mutex rpu_lock;
+	unsigned int phy_rf_params_addr[NUM_RF_PARAM_ADDRS];
+	unsigned int vtf_buffer_start_address;
+};
+
+struct nrf_wifi_rt_drv_priv {
+	struct nrf_wifi_fmac_priv *fmac_priv;
+	struct nrf_wifi_rt_drv_ctx drv_ctx;
+};
+
+
+enum nrf_wifi_status nrf_wifi_rt_fmac_dev_rem(struct nrf_wifi_rt_drv_priv *drv_priv);
+
+#endif /* __RADIO_TEST_API_H__ */

drivers/wifi/nrf71/inc/radio_test/main.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief Header containing radio test main specific declarations
+ */
+
+#ifndef __RADIO_TEST_MAIN_H__
+#define __RADIO_TEST_MAIN_H__
+
+#include <radio_test/api.h>
+
+extern struct nrf_wifi_rt_drv_priv rt_drv_priv;
+
+#endif /* __RADIO_TEST_MAIN_H__ */

drivers/wifi/nrf71/inc/fmac_main.h drivers/wifi/nrf71/inc/system/main.hdrivers/wifi/nrf71/inc/fmac_main.h renamed to drivers/wifi/nrf71/inc/system/main.h

@@ -5,45 +5,41 @@
  */
 
 /**
- * @brief Header containing FMAC interface specific declarations for the
- * Zephyr OS layer of the Wi-Fi driver.
+ * @brief Header containing system mode specific declarations
  */
 
-#ifndef __ZEPHYR_FMAC_MAIN_H__
-#define __ZEPHYR_FMAC_MAIN_H__
+#ifndef __SYSTEM_MAIN_H__
+#define __SYSTEM_MAIN_H__
 
 #include <stdio.h>
 
 #include <version.h>
 
 #include <zephyr/kernel.h>
 #include <zephyr/net/net_if.h>
-#ifdef CONFIG_NRF71_RADIO_TEST
-#include <nrf71_radio_test.h>
-#else
 #include <zephyr/net/wifi_mgmt.h>
 #include <zephyr/net/ethernet.h>
+
 #ifdef CONFIG_NETWORKING
-#include <net_if.h>
+#include <system/net_if.h>
 #endif /* CONFIG_NETWORKING */
+
 #ifdef CONFIG_NRF71_STA_MODE
 #include <drivers/driver_zephyr.h>
 #endif /* CONFIG_NRF71_STA_MODE */
+
 #include <system/fmac_api.h>
-#endif /* CONFIG_NRF71_RADIO_TEST */
 #include <nrf71_wifi_ctrl.h>
+#include <common/rf_params.h>
+#include <common/vtf.h>
 
 #define NRF71_DRIVER_VERSION "1."KERNEL_VERSION_STRING
 
-#define NUM_RF_PARAM_ADDRS 22
-
 /* Calculate compile-time maximum for vendor stats */
 #ifdef CONFIG_NET_STATISTICS_ETHERNET_VENDOR
 #define MAX_VENDOR_STATS ((sizeof(struct rpu_sys_fw_stats) / sizeof(uint32_t)) + 1)
 #endif /* CONFIG_NET_STATISTICS_ETHERNET_VENDOR */
 
-#ifndef CONFIG_NRF71_OFFLOADED_RAW_TX
-#ifndef CONFIG_NRF71_RADIO_TEST
 struct nrf_wifi_vif_ctx_zep {
 	const struct device *zep_dev_ctx;
 	struct net_if *zep_net_if_ctx;
@@ -155,40 +151,17 @@ struct nrf_wifi_ctx_zep {
 
 struct nrf_wifi_drv_priv_zep {
 	struct nrf_wifi_fmac_priv *fmac_priv;
-	/* TODO: Replace with a linked list to handle unlimited RPUs */
 	struct nrf_wifi_ctx_zep rpu_ctx_zep;
 };
 
 extern struct nrf_wifi_drv_priv_zep rpu_drv_priv_zep;
-#endif /* !CONFIG_NRF71_RADIO_TEST */
-
-void nrf_wifi_scan_timeout_work(struct k_work *work);
-
-void configure_tx_pwr_settings(struct nrf_wifi_tx_pwr_ctrl_params *tx_pwr_ctrl_params,
-				struct nrf_wifi_tx_pwr_ceil_params *tx_pwr_ceil_params);
-void configure_board_dep_params(struct nrf_wifi_board_params *board_params);
-void set_tx_pwr_ceil_default(struct nrf_wifi_tx_pwr_ceil_params *pwr_ceil_params);
-const char *nrf_wifi_get_drv_version(void);
-char *nrf_wifi_sprint_ll_addr_buf(const uint8_t *ll, uint8_t ll_len,
-				   char *buf, int buflen);
-enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
-enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
-struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
+
 #ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
 void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
 		void *event_data,
 		unsigned int event_len);
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
-#if defined(CONFIG_NRF71_RAW_DATA_TX) || defined(CONFIG_NRF71_RAW_DATA_RX)
-unsigned char get_nrf_wifi_op_band(void);
-#endif
-#endif /* !CONFIG_NRF71_OFFLOADED_RAW_TX */
-enum nrf_wifi_status nrf_wifi_fmac_config_rf_params(void *dev_ctx,
-						    unsigned int *rf_params_addr);
-
-enum nrf_wifi_status nrf_wifi_fmac_config_vtf_params(struct nrf_wifi_fmac_dev_ctx *dev_ctx,
-						     unsigned int voltage,
-						     unsigned int temp,
-						     unsigned int x0,
-						     unsigned int *vtf_buffer_start_address);
-#endif /* __ZEPHYR_FMAC_MAIN_H__ */
+
+enum nrf_wifi_status nrf_wifi_sys_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
+enum nrf_wifi_status nrf_wifi_sys_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
+#endif /* __SYSTEM_MAIN_H__ */

drivers/wifi/nrf71/inc/net_if.h drivers/wifi/nrf71/inc/system/net_if.hdrivers/wifi/nrf71/inc/net_if.h renamed to drivers/wifi/nrf71/inc/system/net_if.h

@@ -16,7 +16,7 @@
 #include <zephyr/device.h>
 #include <zephyr/net/wifi_mgmt.h>
 
-#include "osal_api.h"
+#include <osal_api.h>
 
 /** Filter setting defines for sniffer mode. */
 #define WIFI_MGMT_DATA_CTRL_FILTER_SETTING 0xE