Browse Source

qcacld-3.0: Replace target params with host params

Currently host uses target params directly
which leads to layering violation

Replace target wmi pdev/vdev params with host wmi
pdev/vdev params in host to fix existing broken layering
violation.

Change-Id: Ifdfbc3151a1d81466c768e4d016a8f70971d651e
CRs-Fixed: 3333879
Divyajyothi Goparaju 2 years ago
parent
commit
e62e4f2ccb

+ 1 - 1
components/target_if/dp/src/target_if_dp_comp.c

@@ -338,7 +338,7 @@ target_if_dp_send_dhcp_ind(uint16_t vdev_id,
 
 	/* fill in values */
 	peer_set_param_fp.vdev_id = vdev_id;
-	peer_set_param_fp.param_id = WMI_PEER_CRIT_PROTO_HINT_ENABLED;
+	peer_set_param_fp.param_id = WMI_HOST_PEER_CRIT_PROTO_HINT_ENABLED;
 
 	if (dhcp_ind->dhcp_start)
 		peer_set_param_fp.param_value = 1;

+ 1 - 1
core/hdd/src/wlan_hdd_hostapd.c

@@ -6068,7 +6068,7 @@ hdd_softap_update_pasn_vdev_params(struct hdd_context *hdd_ctx,
 		pasn_vdev_param |= WLAN_CRYPTO_URNM_MFPR;
 
 	wlan_crypto_vdev_set_param(hdd_ctx->psoc, vdev_id,
-				   WMI_VDEV_PARAM_11AZ_SECURITY_CONFIG,
+				   wmi_vdev_param_11az_security_config,
 				   pasn_vdev_param);
 }
 

+ 1 - 1
core/hdd/src/wlan_hdd_ioctl.c

@@ -4540,7 +4540,7 @@ static int drv_cmd_miracast(struct hdd_adapter *adapter,
 		{
 			wma_cli_set_command(
 				adapter->vdev_id,
-				WMI_PDEV_PARAM_POWER_COLLAPSE_ENABLE,
+				wmi_pdev_param_power_collapse_enable,
 				(filter_type == MIRACAST_CONN_OPT_ENABLED ?
 				 0 : 1), PDEV_CMD);
 			return 0;

+ 1 - 1
core/hdd/src/wlan_hdd_nan_datapath.c

@@ -635,7 +635,7 @@ int hdd_init_nan_data_mode(struct hdd_adapter *adapter)
 		hdd_err("FAILED TO GET RTSCTS Profile status:%d", status);
 
 	ret_val = sme_cli_set_command(adapter->vdev_id,
-				      WMI_VDEV_PARAM_ENABLE_RTSCTS, rts_profile,
+				      wmi_vdev_param_enable_rtscts, rts_profile,
 				      VDEV_CMD);
 	if (ret_val)
 		hdd_err("FAILED TO SET RTSCTS Profile ret:%d", ret_val);

+ 1 - 1
core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -730,7 +730,7 @@ QDF_STATUS hdd_softap_stop_bss(struct hdd_adapter *adapter)
 	}
 
 	/* Setting the RTS profile to original value */
-	if (sme_cli_set_command(adapter->vdev_id, WMI_VDEV_PARAM_ENABLE_RTSCTS,
+	if (sme_cli_set_command(adapter->vdev_id, wmi_vdev_param_enable_rtscts,
 				cfg_get(hdd_ctx->psoc,
 					CFG_ENABLE_FW_RTS_PROFILE),
 				VDEV_CMD))

+ 5 - 5
core/mac/src/pe/lim/lim_utils.c

@@ -5302,11 +5302,11 @@ static void lim_check_conc_and_send_edca(struct mac_context *mac,
 	     sap_session->curr_op_freq)) {
 	/* RTS profile update to FW */
 		wma_cli_set_command(sap_session->vdev_id,
-				    WMI_VDEV_PARAM_ENABLE_RTSCTS,
+				    wmi_vdev_param_enable_rtscts,
 				    A_EDCA_SCC_RTS_PROFILE_VALUE,
 				    VDEV_CMD);
 		wma_cli_set_command(sta_session->vdev_id,
-				    WMI_VDEV_PARAM_ENABLE_RTSCTS,
+				    wmi_vdev_param_enable_rtscts,
 				    A_EDCA_SCC_RTS_PROFILE_VALUE,
 				    VDEV_CMD);
 
@@ -5374,7 +5374,7 @@ static void lim_check_conc_and_send_edca(struct mac_context *mac,
 	 */
 
 		wma_cli_set_command(sta_session->vdev_id,
-				    WMI_VDEV_PARAM_ENABLE_RTSCTS,
+				    wmi_vdev_param_enable_rtscts,
 				    cfg_get(mac->psoc,
 					    CFG_ENABLE_FW_RTS_PROFILE),
 				    VDEV_CMD);
@@ -5398,13 +5398,13 @@ static void lim_check_conc_and_send_edca(struct mac_context *mac,
 	 */
 
 		wma_cli_set_command(sap_session->vdev_id,
-				    WMI_VDEV_PARAM_ENABLE_RTSCTS,
+				    wmi_vdev_param_enable_rtscts,
 				    cfg_get(mac->psoc,
 					    CFG_ENABLE_FW_RTS_PROFILE),
 				    VDEV_CMD);
 		if (sta_session)
 			wma_cli_set_command(sta_session->vdev_id,
-					    WMI_VDEV_PARAM_ENABLE_RTSCTS,
+					    wmi_vdev_param_enable_rtscts,
 					    cfg_get(mac->psoc,
 						    CFG_ENABLE_FW_RTS_PROFILE),
 					    VDEV_CMD);

+ 16 - 16
core/wma/inc/wma.h

@@ -1357,24 +1357,24 @@ typedef enum {
 
 /**
  * enum green_tx_param - green tx parameters
- * @WMI_VDEV_PARAM_GTX_HT_MCS: ht mcs param
- * @WMI_VDEV_PARAM_GTX_VHT_MCS: vht mcs param
- * @WMI_VDEV_PARAM_GTX_USR_CFG: user cfg param
- * @WMI_VDEV_PARAM_GTX_THRE: thre param
- * @WMI_VDEV_PARAM_GTX_MARGIN: green tx margin param
- * @WMI_VDEV_PARAM_GTX_STEP: green tx step param
- * @WMI_VDEV_PARAM_GTX_MINTPC: mintpc param
- * @WMI_VDEV_PARAM_GTX_BW_MASK: bandwidth mask
+ * @wmi_vdev_param_gtx_ht_mcs: ht mcs param
+ * @wmi_vdev_param_gtx_vht_mcs: vht mcs param
+ * @wmi_vdev_param_gtx_usr_cfg: user cfg param
+ * @wmi_vdev_param_gtx_thre: thre param
+ * @wmi_vdev_param_gtx_margin: green tx margin param
+ * @wmi_vdev_param_gtx_step: green tx step param
+ * @wmi_vdev_param_gtx_mintpc: mintpc param
+ * @wmi_vdev_param_gtx_bw_mask: bandwidth mask
  */
 typedef enum {
-	WMI_VDEV_PARAM_GTX_HT_MCS,
-	WMI_VDEV_PARAM_GTX_VHT_MCS,
-	WMI_VDEV_PARAM_GTX_USR_CFG,
-	WMI_VDEV_PARAM_GTX_THRE,
-	WMI_VDEV_PARAM_GTX_MARGIN,
-	WMI_VDEV_PARAM_GTX_STEP,
-	WMI_VDEV_PARAM_GTX_MINTPC,
-	WMI_VDEV_PARAM_GTX_BW_MASK,
+	wmi_vdev_param_gtx_ht_mcs,
+	wmi_vdev_param_gtx_vht_mcs,
+	wmi_vdev_param_gtx_usr_cfg,
+	wmi_vdev_param_gtx_thre,
+	wmi_vdev_param_gtx_margin,
+	wmi_vdev_param_gtx_step,
+	wmi_vdev_param_gtx_mintpc,
+	wmi_vdev_param_gtx_bw_mask,
 } green_tx_param;
 
 /**

+ 1 - 1
core/wma/src/wma_features.c

@@ -661,7 +661,7 @@ static void wma_sr_send_pd_threshold(tp_wma_handle wma,
 
 	if (sr_supported) {
 		vparam.vdev_id = vdev_id;
-		vparam.param_id = WMI_VDEV_PARAM_SET_CMD_OBSS_PD_THRESHOLD;
+		vparam.param_id = wmi_vdev_param_set_cmd_obss_pd_threshold;
 		vparam.param_value = val;
 		wmi_unified_vdev_set_param_send(wmi_handle, &vparam);
 	} else {