Browse Source

qcacmn: Add spectral scan feature flag

Add spectral scan feature flag which can be
used to control the feature through build options.

Change-Id: Ic56416fc99b521174cccb3af27cc841bfb2ad27d
CRs-Fixed: 2244334
Sandeep Puligilla 7 years ago
parent
commit
0a341a5e92

+ 2 - 1
global_lmac_if/src/wlan_global_lmac_if.c

@@ -22,8 +22,9 @@
 #include "wlan_lmac_if_def.h"
 #include "wlan_lmac_if_api.h"
 #include "wlan_global_lmac_if_api.h"
+#ifdef WLAN_CONV_SPECTRAL_ENABLE
 #include <wlan_spectral_utils_api.h>
-
+#endif
 /* Function pointer to call DA/OL specific tx_ops registration function */
 QDF_STATUS (*wlan_global_lmac_if_tx_ops_register[MAX_DEV_TYPE])
 				(struct wlan_lmac_if_tx_ops *tx_ops);

+ 28 - 2
init_deinit/dispatcher/src/dispatcher_init_deinit.c

@@ -67,8 +67,9 @@
 #ifdef WLAN_SUPPORT_SPLITMAC
 #include <wlan_splitmac.h>
 #endif
-
+#ifdef WLAN_CONV_SPECTRAL_ENABLE
 #include <wlan_spectral_utils_api.h>
+#endif
 #ifdef WLAN_SUPPORT_FILS
 #include <wlan_fd_utils_api.h>
 #endif
@@ -349,6 +350,7 @@ static QDF_STATUS dispatcher_regulatory_pdev_open(struct wlan_objmgr_pdev
 	return regulatory_pdev_open(pdev);
 }
 
+#ifdef WLAN_CONV_SPECTRAL_ENABLE
 #ifdef CONFIG_WIN
 QDF_STATUS dispatcher_register_spectral_pdev_open_handler(
 			spectral_pdev_open_handler handler)
@@ -376,6 +378,18 @@ static QDF_STATUS dispatcher_spectral_pdev_open(struct wlan_objmgr_pdev
 	return spectral_pdev_open(pdev);
 }
 
+static QDF_STATUS dispatcher_spectral_pdev_close(struct wlan_objmgr_pdev *pdev)
+{
+	return QDF_STATUS_SUCCESS;
+}
+#endif
+#else
+static QDF_STATUS dispatcher_spectral_pdev_open(struct wlan_objmgr_pdev
+						  *pdev)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
 static QDF_STATUS dispatcher_spectral_pdev_close(struct wlan_objmgr_pdev *pdev)
 {
 	return QDF_STATUS_SUCCESS;
@@ -755,6 +769,7 @@ static QDF_STATUS dispatcher_splitmac_deinit(void)
 }
 #endif  /* WLAN_SUPPORT_SPLITMAC */
 
+#ifdef WLAN_CONV_SPECTRAL_ENABLE
 #ifdef CONFIG_MCL
 static QDF_STATUS dispatcher_spectral_init(void)
 {
@@ -775,7 +790,18 @@ static QDF_STATUS dispatcher_spectral_deinit(void)
 {
 	return QDF_STATUS_SUCCESS;
 }
-#endif /*CONFIG_MCL*/
+#endif
+#else
+static QDF_STATUS dispatcher_spectral_init(void)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static QDF_STATUS dispatcher_spectral_deinit(void)
+{
+	return QDF_STATUS_SUCCESS;
+}
+#endif
 
 #ifdef DIRECT_BUF_RX_ENABLE
 static QDF_STATUS dispatcher_dbr_psoc_enable(struct wlan_objmgr_psoc *psoc)

+ 6 - 1
os_if/linux/spectral/inc/os_if_spectral_netlink.h

@@ -51,8 +51,13 @@ extern struct net init_net;
  *
  * Return: None
  */
+#ifdef WLAN_CONV_SPECTRAL_ENABLE
 void os_if_spectral_netlink_init(struct wlan_objmgr_pdev *pdev);
-
+#else
+static inline void os_if_spectral_netlink_init(struct wlan_objmgr_pdev *pdev)
+{
+}
+#endif
 /**
  * os_if_spectral_prep_skb() - Prepare socket buffer
  * @pdev : Pointer to pdev

+ 2 - 0
target_if/spectral/target_if_spectral.h

@@ -905,6 +905,7 @@ struct target_if_samp_msg_params {
 	struct ath_softc *sc;
 };
 
+#ifdef WLAN_CONV_SPECTRAL_ENABLE
 /**
  * target_if_spectral_dump_fft() - Dump Spectral FFT
  * @pfft: Pointer to Spectral Phyerr FFT
@@ -1607,4 +1608,5 @@ target_if_consume_spectral_report_gen3(
 #undef __ATTRIB_PACK
 #endif
 
+#endif /* WLAN_CONV_SPECTRAL_ENABLE */
 #endif /* _TARGET_IF_SPECTRAL_H_ */

+ 2 - 2
target_if/spectral/target_if_spectral_phyerr.c

@@ -34,7 +34,7 @@
 #include <target_if_direct_buf_rx_api.h>
 extern int spectral_debug_level;
 
-#if WLAN_SPECTRAL_ENABLE
+#ifdef WLAN_CONV_SPECTRAL_ENABLE
 
 /**
  * target_if_print_buf() - Prints given buffer for given length
@@ -1625,4 +1625,4 @@ int target_if_spectral_process_report_gen3(
 qdf_export_symbol(target_if_spectral_process_report_gen3);
 /* END of spectral GEN III HW specific functions */
 
-#endif  /* WLAN_SPECTRAL_ENABLE */
+#endif  /* WLAN_CONV_SPECTRAL_ENABLE */