qcacmn: Removing WIN specific structures from spectral

Removing WIN specific structures 'scn' and 'ic'
from the spectral module in cmn_dev

CRs-Fixed: 2146258
Change-Id: Ie4def4dfb401f4b1a5920277f8fa79acb67dd46b

spectral/core/spectral_common.c

@@ -244,11 +244,11 @@ int spectral_control_cmn(
 				error = -EINVAL;
 		}
 
-		if (sp_in->ss_dBm_adj != SPECTRAL_PHYERR_PARAM_NOVAL) {
+		if (sp_in->ss_dbm_adj != SPECTRAL_PHYERR_PARAM_NOVAL) {
 			if (!sc->sptrlc_set_spectral_config(
 				pdev,
 				SPECTRAL_PARAM_DBM_ADJ,
-				sp_in->ss_dBm_adj))
+				sp_in->ss_dbm_adj))
 				error = -EINVAL;
 		}
 
@@ -308,7 +308,7 @@ int spectral_control_cmn(
 		spectralparams->ss_pwr_format      = sp_out.ss_pwr_format;
 		spectralparams->ss_rpt_mode        = sp_out.ss_rpt_mode;
 		spectralparams->ss_bin_scale       = sp_out.ss_bin_scale;
-		spectralparams->ss_dBm_adj         = sp_out.ss_dBm_adj;
+		spectralparams->ss_dbm_adj         = sp_out.ss_dbm_adj;
 		spectralparams->ss_chn_mask        = sp_out.ss_chn_mask;
 	}
 	break;

spectral/core/spectral_defs_i.h

@@ -61,6 +61,7 @@ struct pdev_spectral {
 	void                       *psptrl_target_handle;
 };
 
+struct wmi_spectral_cmd_ops;
 /**
  * struct spectral_context : spectral global context
  *
@@ -107,6 +108,9 @@ struct spectral_context {
 					    void *outdata);
 	void (*sptrlc_get_spectral_diagstats)(struct wlan_objmgr_pdev *pdev,
 					      void *outdata);
+	void (*sptrlc_register_wmi_spectral_cmd_ops)(
+		struct wlan_objmgr_pdev *pdev,
+		struct wmi_spectral_cmd_ops *cmd_ops);
 };
 
 #endif /* _SPECTRAL_DEFS_I_H_ */

spectral/core/spectral_direct_attach.c

@@ -186,6 +186,23 @@ static void get_spectral_diagstats_da(struct wlan_objmgr_pdev *pdev,
 		 outdata);
 }
 
+static void register_wmi_spectral_cmd_ops_da(
+		struct wlan_objmgr_pdev *pdev,
+		struct wmi_spectral_cmd_ops *cmd_ops)
+{
+	struct wlan_objmgr_psoc *psoc = NULL;
+	struct wlan_lmac_if_sptrl_tx_ops *psptrl_tx_ops = NULL;
+
+	psoc = wlan_pdev_get_psoc(pdev);
+
+	psptrl_tx_ops = &psoc->soc_cb.tx_ops.sptrl_tx_ops;
+
+	return psptrl_tx_ops->sptrlto_register_wmi_spectral_cmd_ops(
+		pdev,
+		cmd_ops);
+}
+
+
 void spectral_ctx_init_da(struct spectral_context *sc)
 {
 	if (!sc) {
@@ -205,5 +222,7 @@ void spectral_ctx_init_da(struct spectral_context *sc)
 	sc->sptrlc_get_debug_level        = get_debug_level_da;
 	sc->sptrlc_get_spectral_capinfo   = get_spectral_capinfo_da;
 	sc->sptrlc_get_spectral_diagstats = get_spectral_diagstats_da;
+	sc->sptrlc_register_wmi_spectral_cmd_ops =
+		register_wmi_spectral_cmd_ops_da;
 }
 

spectral/core/spectral_offload.c

@@ -154,6 +154,22 @@ static void get_spectral_diagstats_ol(struct wlan_objmgr_pdev *pdev,
 		 outdata);
 }
 
+static void register_wmi_spectral_cmd_ops_ol(
+		struct wlan_objmgr_pdev *pdev,
+		struct wmi_spectral_cmd_ops *cmd_ops)
+{
+	struct wlan_objmgr_psoc *psoc = NULL;
+	struct wlan_lmac_if_sptrl_tx_ops *psptrl_tx_ops = NULL;
+
+	psoc = wlan_pdev_get_psoc(pdev);
+
+	psptrl_tx_ops = &psoc->soc_cb.tx_ops.sptrl_tx_ops;
+
+	return psptrl_tx_ops->sptrlto_register_wmi_spectral_cmd_ops(
+		pdev,
+		cmd_ops);
+}
+
 void spectral_ctx_init_ol(struct spectral_context *sc)
 {
 	if (!sc) {
@@ -173,5 +189,7 @@ void spectral_ctx_init_ol(struct spectral_context *sc)
 	sc->sptrlc_get_debug_level        = get_debug_level_ol;
 	sc->sptrlc_get_spectral_capinfo   = get_spectral_capinfo_ol;
 	sc->sptrlc_get_spectral_diagstats = get_spectral_diagstats_ol;
+	sc->sptrlc_register_wmi_spectral_cmd_ops =
+		register_wmi_spectral_cmd_ops_ol;
 }
 

spectral/dispatcher/inc/wlan_spectral_public_structs.h

@@ -258,7 +258,7 @@ struct spectral_caps {
  *                        3: 2-dword summary + 2x-oversampled bins (all) per FFT
  * @ss_bin_scale:         Number of LSBs to shift out to scale the FFT bins
  *                        for spectral scan triggered FFTs
- * @ss_dBm_adj:           Set (with ss_pwr_format=1), to report bin
+ * @ss_dbm_adj:           Set (with ss_pwr_format=1), to report bin
  *                        magnitudes
  *                        converted to dBm power using the noisefloor
  *                        calibration results
@@ -288,7 +288,7 @@ struct spectral_config {
 	u_int16_t   ss_pwr_format;
 	u_int16_t   ss_rpt_mode;
 	u_int16_t   ss_bin_scale;
-	u_int16_t   ss_dBm_adj;
+	u_int16_t   ss_dbm_adj;
 	u_int16_t   ss_chn_mask;
 	int8_t      ss_nf_cal[AH_MAX_CHAINS * 2];
 	int8_t      ss_nf_pwr[AH_MAX_CHAINS * 2];

spectral/dispatcher/inc/wlan_spectral_utils_api.h

@@ -55,4 +55,16 @@ QDF_STATUS wlan_spectral_deinit(void);
  */
 void wlan_lmac_if_sptrl_register_rx_ops(struct wlan_lmac_if_rx_ops *rx_ops);
 
+/**
+* wlan_register_wmi_spectral_cmd_ops(): Register operations related to wmi
+					commands on spectral parameters
+* @pdev    - the physical device object
+* @cmd_ops - pointer to the structure holding the operations
+*	     related to wmi commands on spectral parameters
+*
+* Return: None
+*/
+void wlan_register_wmi_spectral_cmd_ops(
+		struct wlan_objmgr_pdev *pdev,
+		struct wmi_spectral_cmd_ops *cmd_ops);
 #endif /* _WLAN_SPECTRAL_UTILS_API_H_*/

spectral/dispatcher/src/wlan_spectral_utils_api.c

@@ -21,6 +21,7 @@
 #include <qdf_module.h>
 #include "../../core/spectral_cmn_api_i.h"
 #include <wlan_spectral_tgt_api.h>
+#include <linux/export.h>
 
 QDF_STATUS wlan_spectral_init(void)
 {
@@ -89,3 +90,23 @@ void wlan_lmac_if_sptrl_register_rx_ops(struct wlan_lmac_if_rx_ops *rx_ops)
 	sptrl_rx_ops->sptrlro_send_phydata = tgt_send_phydata;
 	sptrl_rx_ops->sptrlro_get_target_handle = tgt_get_target_handle;
 }
+
+void wlan_register_wmi_spectral_cmd_ops(
+		struct wlan_objmgr_pdev *pdev,
+		struct wmi_spectral_cmd_ops *cmd_ops)
+{
+	struct spectral_context *sc;
+
+	if (!pdev)
+		spectral_err("PDEV is NULL!\n");
+
+	sc = spectral_get_spectral_ctx_from_pdev(pdev);
+	if (!sc)
+		spectral_err("spectral context is NULL!\n");
+
+	return sc->sptrlc_register_wmi_spectral_cmd_ops(
+		pdev,
+		cmd_ops
+		);
+}
+EXPORT_SYMBOL(wlan_register_wmi_spectral_cmd_ops);