Bladeren bron

qcacmn: Add monitor includes into 2_0 support

Add monitor 2.0 code into QCA_MONITOR_2_0_SUPPORT macro.

Change-Id: Icd001a007c513750811b26eb7928c56dad1f9a79
CRs-Fixed: 3342797
Nandha Kishore Easwaran 2 jaren geleden
bovenliggende
commit
70a8c0b8f8
3 gewijzigde bestanden met toevoegingen van 8 en 1 verwijderingen
  1. 0 1
      hal/wifi3.0/be/hal_be_generic_api.h
  2. 4 0
      hal/wifi3.0/qca5332/hal_5332.c
  3. 4 0
      hal/wifi3.0/qcn9224/hal_9224.h

+ 0 - 1
hal/wifi3.0/be/hal_be_generic_api.h

@@ -25,7 +25,6 @@
 #include "hal_be_reo.h"
 #include <hal_api_mon.h>
 #include <hal_generic_api.h>
-#include <hal_be_api_mon.h>
 
 /**
  * Debug macro to print the TLV header tag

+ 4 - 0
hal/wifi3.0/qca5332/hal_5332.c

@@ -96,7 +96,9 @@
 #define UNIFIED_WBM_RELEASE_RING_6_TX_RATE_STATS_INFO_TX_RATE_STATS_LSB \
 	WBM_RELEASE_RING_TX_TX_RATE_STATS_PPDU_TRANSMISSION_TSF_LSB
 
+#ifdef QCA_MONITOR_2_0_SUPPORT
 #include "hal_be_api_mon.h"
+#endif
 
 #define CMEM_REG_BASE 0x00100000
 
@@ -1310,8 +1312,10 @@ static void hal_hw_txrx_ops_attach_qca5332(struct hal_soc *hal_soc)
 					hal_rx_link_desc_msdu0_ptr_5332;
 	hal_soc->ops->hal_reo_status_get_header =
 					hal_reo_status_get_header_5332;
+#ifdef QCA_MONITOR_2_0_SUPPORT
 	hal_soc->ops->hal_rx_status_get_tlv_info =
 					hal_rx_status_get_tlv_info_wrapper_be;
+#endif
 	hal_soc->ops->hal_rx_wbm_err_info_get =
 					hal_rx_wbm_err_info_get_generic_be;
 	hal_soc->ops->hal_tx_set_pcp_tid_map =

+ 4 - 0
hal/wifi3.0/qcn9224/hal_9224.h

@@ -98,7 +98,9 @@
 #define UNIFIED_WBM_RELEASE_RING_6_TX_RATE_STATS_INFO_TX_RATE_STATS_LSB \
 	WBM_RELEASE_RING_TX_TX_RATE_STATS_PPDU_TRANSMISSION_TSF_LSB
 
+#ifdef QCA_MONITOR_2_0_SUPPORT
 #include "hal_be_api_mon.h"
+#endif
 
 #ifdef CONFIG_WIFI_EMULATION_WIFI_3_0
 #define CMEM_REG_BASE 0x0010e000
@@ -1618,8 +1620,10 @@ static void hal_hw_txrx_ops_attach_qcn9224(struct hal_soc *hal_soc)
 					hal_rx_link_desc_msdu0_ptr_9224;
 	hal_soc->ops->hal_reo_status_get_header =
 					hal_reo_status_get_header_9224;
+#ifdef QCA_MONITOR_2_0_SUPPORT
 	hal_soc->ops->hal_rx_status_get_tlv_info =
 					hal_rx_status_get_tlv_info_wrapper_be;
+#endif
 	hal_soc->ops->hal_rx_wbm_err_info_get =
 					hal_rx_wbm_err_info_get_generic_be;
 	hal_soc->ops->hal_tx_set_pcp_tid_map =