Просмотр исходного кода

qcacld-3.0: Remove legacy P2P codes in WMA

To reduce code size, remove legacy P2P codes in WMA layer

Change-Id: Id34951ac907365ab4fcff6783000d745e84a8de7
CRs-Fixed: 2111575
Wu Gao 7 лет назад
Родитель
Сommit
7afc615be0
4 измененных файлов с 0 добавлено и 108 удалено
  1. 0 3
      core/wma/inc/wma_internal.h
  2. 0 2
      core/wma/inc/wma_types.h
  3. 0 28
      core/wma/src/wma_main.c
  4. 0 75
      core/wma/src/wma_power.c

+ 0 - 3
core/wma/inc/wma_internal.h

@@ -733,9 +733,6 @@ void wma_update_probe_resp_noa(tp_wma_handle wma_handle,
 int wma_p2p_noa_event_handler(void *handle, uint8_t *event,
 				     uint32_t len);
 
-void wma_process_set_p2pgo_noa_req(tp_wma_handle wma,
-					  tP2pPsParams *ps_params);
-
 void wma_process_set_mimops_req(tp_wma_handle wma_handle,
 				       tSetMIMOPS *mimops);
 

+ 0 - 2
core/wma/inc/wma_types.h

@@ -256,8 +256,6 @@
 #define WMA_ADD_STA_SELF_REQ           SIR_HAL_ADD_STA_SELF_REQ
 #define WMA_DEL_STA_SELF_REQ           SIR_HAL_DEL_STA_SELF_REQ
 
-#define WMA_SET_P2P_GO_NOA_REQ         SIR_HAL_SET_P2P_GO_NOA_REQ
-
 #ifdef FEATURE_WLAN_TDLS
 #define WMA_SET_TDLS_LINK_ESTABLISH_REQ SIR_HAL_TDLS_LINK_ESTABLISH_REQ
 #define WMA_SET_TDLS_LINK_ESTABLISH_REQ_RSP SIR_HAL_TDLS_LINK_ESTABLISH_REQ_RSP

+ 0 - 28
core/wma/src/wma_main.c

@@ -3610,19 +3610,6 @@ QDF_STATUS wma_start(void)
 		goto end;
 	}
 
-#ifndef CONVERGED_P2P_ENABLE
-	/* Initialize the P2P Listen Offload event handler */
-	status = wmi_unified_register_event_handler(wma_handle->wmi_handle,
-			WMI_P2P_LISTEN_OFFLOAD_STOPPED_EVENTID,
-			wma_p2p_lo_event_handler,
-			WMA_RX_SERIALIZER_CTX);
-	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		WMA_LOGE("Failed to register p2p lo event cb");
-		qdf_status = QDF_STATUS_E_FAILURE;
-		goto end;
-	}
-#endif
-
 	status = wmi_unified_register_event_handler(wma_handle->wmi_handle,
 			WMI_WLAN_COEX_BT_ACTIVITY_EVENTID,
 			wma_wlan_bt_activity_evt_handler,
@@ -5134,22 +5121,12 @@ int wma_rx_service_ready_event(void *handle, uint8_t *cmd_param_info,
 	}
 #endif /* WLAN_FEATURE_GTK_OFFLOAD */
 
-#ifndef CONVERGED_P2P_ENABLE
 	if (WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap,
 				   WMI_SERVICE_FW_MEM_DUMP_SUPPORT))
 		wma_handle->fw_mem_dump_enabled = true;
 	else
 		wma_handle->fw_mem_dump_enabled = false;
 
-	status = wmi_unified_register_event_handler(wma_handle->wmi_handle,
-						    WMI_P2P_NOA_EVENTID,
-						    wma_p2p_noa_event_handler,
-						    WMA_RX_SERIALIZER_CTX);
-	if (status) {
-		WMA_LOGE("Failed to register WMI_P2P_NOA_EVENTID callback");
-		return -EINVAL;
-	}
-#endif
 	status = wmi_unified_register_event_handler(wma_handle->wmi_handle,
 				WMI_TBTTOFFSET_UPDATE_EVENTID,
 				wma_tbttoffset_update_event_handler,
@@ -7399,11 +7376,6 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
 		qdf_mem_free(msg->bodyptr);
 			break;
 #endif
-	case WMA_SET_P2P_GO_NOA_REQ:
-		wma_process_set_p2pgo_noa_req(wma_handle,
-					      (tP2pPsParams *) msg->bodyptr);
-		qdf_mem_free(msg->bodyptr);
-		break;
 	case WMA_SET_MIMOPS_REQ:
 		wma_process_set_mimops_req(wma_handle,
 					   (tSetMIMOPS *) msg->bodyptr);

+ 0 - 75
core/wma/src/wma_power.c

@@ -1560,81 +1560,6 @@ int wma_p2p_noa_event_handler(void *handle, uint8_t *event,
 	return 0;
 }
 
-/**
- * wma_set_p2pgo_noa_req() - send p2p go noa request to fw
- * @wma: wma handle
- * @noa: p2p power save parameters
- *
- * Return: none
- */
-static void wma_set_p2pgo_noa_req(tp_wma_handle wma, tP2pPsParams *noa)
-{
-	QDF_STATUS ret;
-	struct p2p_ps_params cmd = {0};
-
-	cmd.opp_ps = noa->opp_ps;
-	cmd.ctwindow = noa->ctWindow;
-	cmd.count = noa->count;
-	cmd.duration = noa->duration;
-	cmd.interval = noa->interval;
-	cmd.single_noa_duration = noa->single_noa_duration;
-	cmd.ps_selection = noa->psSelection;
-	cmd.session_id =  noa->sessionId;
-
-	ret = wmi_unified_set_p2pgo_noa_req_cmd(wma->wmi_handle,
-				   &cmd);
-	if (QDF_IS_STATUS_ERROR(ret))
-		WMA_LOGE("Failed to send set uapsd param ret = %d", ret);
-
-}
-
-/**
- * wma_set_p2pgo_oppps_req() - send p2p go opp power save request to fw
- * @wma: wma handle
- * @noa: p2p opp power save parameters
- *
- * Return: none
- */
-static void wma_set_p2pgo_oppps_req(tp_wma_handle wma, tP2pPsParams *oppps)
-{
-	QDF_STATUS ret;
-	struct p2p_ps_params cmd = {0};
-
-	cmd.opp_ps = oppps->opp_ps;
-	cmd.ctwindow = oppps->ctWindow;
-	cmd.count = oppps->count;
-	cmd.duration = oppps->duration;
-	cmd.interval = oppps->interval;
-	cmd.single_noa_duration = oppps->single_noa_duration;
-	cmd.ps_selection = oppps->psSelection;
-	cmd.session_id =  oppps->sessionId;
-
-	ret = wmi_unified_set_p2pgo_oppps_req(wma->wmi_handle,
-				   &cmd);
-	if (QDF_IS_STATUS_ERROR(ret))
-		WMA_LOGE("Failed to send set uapsd param ret = %d", ret);
-
-}
-
-/**
- * wma_process_set_p2pgo_noa_req() - process p2pgo noa request
- * @handle: wma handle
- * @ps_params: powersave params
- *
- * Return: none
- */
-void wma_process_set_p2pgo_noa_req(tp_wma_handle wma,
-				   tP2pPsParams *ps_params)
-{
-	WMA_LOGD("%s: Enter", __func__);
-	if (ps_params->opp_ps)
-		wma_set_p2pgo_oppps_req(wma, ps_params);
-	else
-		wma_set_p2pgo_noa_req(wma, ps_params);
-
-	WMA_LOGD("%s: Exit", __func__);
-}
-
 /**
  * wma_process_set_mimops_req() - Set the received MiMo PS state to firmware
  * @handle: wma handle