Changes for radio test build

Changes to build radio test application
with latest firmware hdr files.

Signed-off-by: Ajay Parida <[email protected]>

Author: ajayparida

fw_if/umac_if/src/radio_test/fmac_cmd.c

@@ -11,6 +11,7 @@
 
 #include "radio_test/fmac_cmd.h"
 #include "common/hal_api_common.h"
+#include "nrf71_wifi_rf.h"
 
 enum nrf_wifi_status umac_cmd_rt_init(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx,
 				      struct nrf_wifi_phy_rf_params *rf_params,
@@ -101,11 +102,11 @@ enum nrf_wifi_status umac_cmd_rt_init(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx
 	nrf_wifi_osal_mem_cpy(&umac_cmd_data->sys_params.rf_params[ANT_GAIN_2G_OFST],
 			      &tx_pwr_ctrl_params->ant_gain_2g,
 			      NUM_ANT_GAIN);
-
+#ifndef WIFI_NRF71
 	nrf_wifi_osal_mem_cpy(&umac_cmd_data->sys_params.rf_params[BAND_2G_LW_ED_BKF_DSSS_OFST],
 			      &tx_pwr_ctrl_params->band_edge_2g_lo_dss,
 			      NUM_EDGE_BACKOFF);
-
+#endif /* CONFIG_WIFI_NRF71*/
 	nrf_wifi_osal_mem_cpy(umac_cmd_data->country_code,
 			      country_code,
 			      NRF_WIFI_COUNTRY_CODE_LEN);

fw_if/umac_if/src/radio_test/fmac_event.c

@@ -16,6 +16,8 @@
 #include "common/hal_mem.h"
 #include "common/fmac_util.h"
 
+#define RPU_MEM_RF_TEST_CAP_BASE 0xB0006000
+
 static enum nrf_wifi_status umac_event_rt_stats_process(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx,
 							void *event)
 {

hw_if/hal/inc/common/phy_rf_params_common.h

@@ -12,6 +12,7 @@
 #define _PHY_RF_PARAMS_COMMON_H_
 #include "pack_def.h"
 
+#ifndef WIFI_NRF71
 #define NRF_WIFI_RF_PARAMS_SIZE 200
 #define NRF_WIFI_RF_PARAMS_CONF_SIZE 42
 #define NUM_PCB_LOSS_OFFSET 4
@@ -24,19 +25,10 @@
 	#define NRF_WIFI_PHY_CALIB_FLAG_TXDC 2
 #endif
 
-#ifdef WIFI_NRF71
-#define NRF_WIFI_PHY_CALIB_FLAG_RXDC 1
-#define NRF_WIFI_PHY_CALIB_FLAG_TXDC 2
-#define NRF_WIFI_PHY_CALIB_FLAG_TXPOW 0
-#define NRF_WIFI_PHY_CALIB_FLAG_TXIQ 8//8
-#define NRF_WIFI_PHY_CALIB_FLAG_RXIQ 16//16
-#define NRF_WIFI_PHY_CALIB_FLAG_DPD  0
-#else /* WIFI_NRF71 */
 #define NRF_WIFI_PHY_CALIB_FLAG_TXPOW 0
 #define NRF_WIFI_PHY_CALIB_FLAG_TXIQ 8
 #define NRF_WIFI_PHY_CALIB_FLAG_RXIQ 16
 #define NRF_WIFI_PHY_CALIB_FLAG_DPD 32
-#endif /* !WIFI_NRF71 */
 
 #define NRF_WIFI_PHY_CALIB_FLAG_ENHANCED_TXDC 64
 #define NRF_WIFI_PHY_SCAN_CALIB_FLAG_RXDC (1<<16)
@@ -328,9 +320,7 @@ struct nrf_wifi_temp_volt_depend_params {
  * first 42 bytes of RF parameters.
  */
 struct nrf_wifi_phy_rf_params {
-#ifdef WIFI_NRF71
 	unsigned char phy_params[NRF_WIFI_RF_PARAMS_SIZE];
-#else /* WIFI_NRF71 */
 	unsigned char reserved[6];
 	struct nrf_wifi_xo_freq_offset xo_offset;
 	struct nrf_wifi_pd_adst_val pd_adjust_val;
@@ -339,7 +329,6 @@ struct nrf_wifi_phy_rf_params {
 	struct nrf_wifi_rx_gain_offset rx_gain_offset;
 	struct nrf_wifi_temp_volt_depend_params temp_volt_backoff;
 	unsigned char phy_params[NRF_WIFI_RF_PARAMS_SIZE - NRF_WIFI_RF_PARAMS_CONF_SIZE];
-#endif /* !WIFI_NRF71 */
 } __NRF_WIFI_PKD;
 
 /** The byte offsets of RF parameters indicate the start offset
@@ -503,5 +492,5 @@ enum ft_prog_ver {
 #define FT_PROG_VER3_5G_LOW_OFDM_TXCEIL_BKOFF 0
 #define FT_PROG_VER3_5G_MID_OFDM_TXCEIL_BKOFF 0
 #define FT_PROG_VER3_5G_HIGH_OFDM_TXCEIL_BKOFF 0
-
+#endif /* WIFI_NRF71 */
 #endif /* _PHY_RF_PARAMS_COMMON_H_ */

hw_if/hal/inc/radio_test/phy_rf_params.h

@@ -18,7 +18,6 @@
 #else /* WIFI_NRF71 */
 #define NRF_WIFI_RT_DEF_RF_PARAMS "007077003F032424001000002800323500000C0008087D8105010071630300EED501001F6F00003B350100F52E0000E35E0000B7B6000066EFFEFFB5F60000896200007A840200E28FFCFF080808080408120100000000A1A10178000000080050003B020726181818181A120A140E0600"
 #endif  /* !WIFI_NRF71 */
-
 #define MAX_TX_PWR_SYS_TEST 30
 #define MAX_TX_PWR_RADIO_TEST 24
 
@@ -29,6 +28,7 @@
 
 #define VBAT_OFFSET_MILLIVOLT (2500)
 #define VBAT_SCALING_FACTOR (70)
+#ifndef WIFI_NRF71
 
 enum nrf_wifi_rf_test {
 	NRF_WIFI_RF_TEST_RX_ADC_CAP,
@@ -176,5 +176,5 @@ struct nrf_wifi_rf_get_xo_value {
 	/* Optimal XO value computed. */
 	unsigned char xo_value;
 } __NRF_WIFI_PKD;
-
+#endif
 #endif /* _PHY_RF_PARAMS_RT_H_ */