drivers: wifi: nrf71: Simplify includes and clean up CMakeLists

Drop redundant include paths and reference fw_if headers via
common/fw_if/ under the single inc/ directory. Flatten and consolidate
the CMakeLists source and compile-definition layout.

Signed-off-by: Sachin D Kulkarni <Sachin.Kulkarni@nordicsemi.no>
Co-authored-by: Cursor <cursoragent@cursor.com>

Author: sachinthegreen

drivers/wifi/nrf71/CMakeLists.txt

@@ -16,7 +16,7 @@
 #define __FMAC_API_COMMON_H__
 
 #include "common/hal_api_common.h"
-#include <nrf71_wifi_ctrl.h>
+#include <common/fw_if/nrf71_wifi_ctrl.h>
 #include "fmac_cmd_common.h"
 #include "fmac_structs_common.h"
 

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

@@ -16,7 +16,7 @@
 #ifndef __FMAC_STRUCTS_COMMON_H__
 #define __FMAC_STRUCTS_COMMON_H__
 
-#include <nrf71_wifi_ctrl.h>
+#include <common/fw_if/nrf71_wifi_ctrl.h>
 
 #define NRF_WIFI_FW_CHUNK_ID_STR_LEN 16
 

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

@@ -14,7 +14,7 @@
 #define __HAL_API_COMMON_H__
 
 #include <common/log_cfg.h>
-#include <nrf71_wifi_ctrl.h>
+#include <common/fw_if/nrf71_wifi_ctrl.h>
 #include <common/ipc_bus.h>
 
 /**

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

@@ -13,8 +13,8 @@
 #define __UTIL_H__
 
 #include <common/log_cfg.h>
-#include <nrf71_wifi_ctrl.h>
-#include <pack_def.h>
+#include <common/fw_if/nrf71_wifi_ctrl.h>
+#include <common/fw_if/pack_def.h>
 
 /* Convert power from mBm to dBm */
 #define MBM_TO_DBM(gain) ((gain) / 100)

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

@@ -12,7 +12,7 @@
  */
 
 #include <zephyr/kernel.h>
-#include <nrf71_wifi_ctrl.h>
+#include <common/fw_if/nrf71_wifi_ctrl.h>
 #include <common/rf_params.h>
 #include <common/vtf.h>
 

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

@@ -15,7 +15,7 @@
 #ifndef __FMAC_API_H__
 #define __FMAC_API_H__
 
-#include <nrf71_wifi_ctrl.h>
+#include <common/fw_if/nrf71_wifi_ctrl.h>
 #include <common/fmac_api_common.h>
 #include <offload_raw_tx/fmac_structs.h>
 #include <common/util.h>

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

@@ -18,7 +18,7 @@
 #ifndef __FMAC_STRUCTS_H__
 #define __FMAC_STRUCTS_H__
 
-#include <nrf71_wifi_ctrl.h>
+#include <common/fw_if/nrf71_wifi_ctrl.h>
 #include "common/fmac_structs_common.h"
 #define NRF_WIFI_FMAC_PARAMS_RECV_TIMEOUT 100 /* ms */
 

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

@@ -12,7 +12,7 @@
 #define __RADIO_TEST_API_H__
 
 #include <zephyr/kernel.h>
-#include <nrf71_wifi_ctrl.h>
+#include <common/fw_if/nrf71_wifi_ctrl.h>
 #include <common/rf_params.h>
 #include <radio_test/fmac_api.h>
 #include <common/vtf.h>

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

@@ -16,7 +16,7 @@
 #ifndef __FMAC_API_RT_H__
 #define __FMAC_API_RT_H__
 
-#include <nrf71_wifi_ctrl.h>
+#include <common/fw_if/nrf71_wifi_ctrl.h>
 
 #include <radio_test/fmac_structs.h>
 #include <radio_test/fmac_cmd.h>