Changes as per new interface firmware files

Signed-off-by: Ajay Parida <ajay.parida@nordicsemi.no>

Author: ajayparida

drivers/wifi/nrf_wifi/CMakeLists.txt

@@ -27,7 +27,7 @@ zephyr_library_sources_ifndef(CONFIG_NRF70_OFFLOADED_RAW_TX
   src/fmac_main.c
 )
 
-if(NOT CONFIG_NRF71_ON_IPC)
+if(NOT CONFIG_NRF71_ON_IPC OR NOT CONFIG_WIFI_NRF71)
   zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
     src/fw_load.c
   )

drivers/wifi/nrf_wifi/inc/fmac_main.h

@@ -32,7 +32,10 @@
 #include <radio_test/fmac_api.h>
 #endif /* !CONFIG_NRF70_RADIO_TEST */
 
+#ifndef WIFI_NRF71
 #include <host_rpu_umac_if.h>
+#endif /* !WIFI_NRF71 */
+
 
 #define NRF70_DRIVER_VERSION "1."KERNEL_VERSION_STRING
 

drivers/wifi/nrf_wifi/src/fmac_main.c

@@ -43,6 +43,10 @@
 #include <radio_test/fmac_api.h>
 #endif /* !CONFIG_NRF70_RADIO_TEST */
 
+#ifdef WIFI_NRF71
+#include "nrf71_wifi_rf.h"
+#endif /* WIFI_NRF71 */
+
 #define DT_DRV_COMPAT nordic_wlan
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
@@ -519,6 +523,7 @@ void configure_tx_pwr_settings(struct nrf_wifi_tx_pwr_ctrl_params *tx_pwr_ctrl_p
 	tx_pwr_ctrl_params->ant_gain_5g_band1 = CONFIG_NRF70_ANT_GAIN_5G_BAND1;
 	tx_pwr_ctrl_params->ant_gain_5g_band2 = CONFIG_NRF70_ANT_GAIN_5G_BAND2;
 	tx_pwr_ctrl_params->ant_gain_5g_band3 = CONFIG_NRF70_ANT_GAIN_5G_BAND3;
+#ifndef WIFI_NRF71
 	tx_pwr_ctrl_params->band_edge_2g_lo_dss = CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_DSSS;
 	tx_pwr_ctrl_params->band_edge_2g_lo_ht = CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HT;
 	tx_pwr_ctrl_params->band_edge_2g_lo_he = CONFIG_NRF70_BAND_2G_LOWER_EDGE_BACKOFF_HE;
@@ -565,7 +570,7 @@ void configure_tx_pwr_settings(struct nrf_wifi_tx_pwr_ctrl_params *tx_pwr_ctrl_p
 		CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HT;
 	tx_pwr_ctrl_params->band_edge_5g_unii_4_hi_he =
 		CONFIG_NRF70_BAND_UNII_4_UPPER_EDGE_BACKOFF_HE;
-
+#endif /* !WIFI_NRF71 */
 
 	tx_pwr_ceil_params->max_pwr_2g_dsss = MAX_TX_PWR(wifi_max_tx_pwr_2g_dsss);
 	tx_pwr_ceil_params->max_pwr_2g_mcs7 = MAX_TX_PWR(wifi_max_tx_pwr_2g_mcs7);

modules/nrf_wifi/bus/Kconfig

@@ -58,4 +58,14 @@ config WIFI_NRF71
 	select EXPERIMENTAL
 	help
 	  Enable to do system testn with nrf71 and fpga
+config NRF71_SOFT_HPQM
+	bool "Soft hpqm for nrf71 testing with fpga"
+	select EXPERIMENTAL
+	help
+	  Enable to do system test with nrf71 and fpga
+config NRF71_CMD_RX_BUFF
+	bool "RX BUFF Programming for nrf71 testing with fpga"
+	select EXPERIMENTAL
+	help
+	  Enable to do system test with nrf71 and fpga
 endif # NRF70_BUSLIB

modules/nrf_wifi/os/CMakeLists.txt

@@ -25,3 +25,4 @@ zephyr_library_compile_definitions_ifdef(CONFIG_NRF71_ON_IPC
 )
 
 zephyr_library_link_libraries(nrf-wifi-osal)
+