浏览代码

qcacld-3.0: Remove obsolete CDS mq APIs reference from SME module

After control path scheduler componentization CDS message queue
APIs are no longer used hence replace CDS mq APIs in SME by
scheduler mq APIs.

Change-Id: I645209741a602798fc077a50ac66de198e292038
CRs-Fixed: 1114363
Rajeev Kumar 8 年之前
父节点
当前提交
8eaedf65a1

+ 1 - 2
core/cds/inc/cds_mq.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -43,7 +43,6 @@
    ------------------------------------------------------------------------*/
 #include <qdf_types.h>
 #include <qdf_status.h>
-#include <scheduler_api.h>
 
 /*--------------------------------------------------------------------------
    Preprocessor definitions and constants

+ 2 - 3
core/sme/inc/sme_api.h

@@ -38,7 +38,6 @@
   Include Files
   ------------------------------------------------------------------------*/
 #include "csr_api.h"
-#include "cds_mq.h"
 #include "qdf_lock.h"
 #include "qdf_types.h"
 #include "sir_api.h"
@@ -242,9 +241,9 @@ QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal,
 		v_REGDOMAIN_t *domainIdSoftAp);
 QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode);
 QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal);
-QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg);
+QDF_STATUS sme_process_msg(tHalHandle hHal, struct scheduler_msg *pMsg);
 QDF_STATUS sme_mc_process_handler(struct scheduler_msg *msg);
-void sme_free_msg(tHalHandle hHal, cds_msg_t *pMsg);
+void sme_free_msg(tHalHandle hHal, struct scheduler_msg *pMsg);
 QDF_STATUS sme_scan_request(tHalHandle hHal, uint8_t sessionId,
 		tCsrScanRequest *, csr_scan_completeCallback callback,
 		void *pContext);

+ 4 - 3
core/sme/inc/sme_nan_datapath.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -105,7 +105,7 @@ QDF_STATUS csr_process_ndp_initiator_request(tpAniSirGlobal mac_ctx,
 QDF_STATUS csr_process_ndp_data_end_request(tpAniSirGlobal mac_ctx,
 					    tSmeCmd *cmd);
 
-void sme_ndp_msg_processor(tpAniSirGlobal mac_ctx, cds_msg_t *msg);
+void sme_ndp_msg_processor(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg);
 
 QDF_STATUS csr_process_ndp_responder_request(tpAniSirGlobal mac_ctx,
 							tSmeCmd *cmd);
@@ -163,7 +163,8 @@ static inline QDF_STATUS csr_process_ndp_initiator_request(
 	return QDF_STATUS_SUCCESS;
 }
 
-static inline void sme_ndp_msg_processor(tpAniSirGlobal mac_ctx, cds_msg_t *msg)
+static inline void sme_ndp_msg_processor(tpAniSirGlobal mac_ctx,
+					 struct scheduler_msg *msg)
 {
 }
 

文件差异内容过多而无法显示
+ 173 - 171
core/sme/src/common/sme_api.c


+ 12 - 11
core/sme/src/common/sme_power_save.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -45,14 +45,14 @@
  */
 static QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body)
 {
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 
 	msg.type = type;
 	msg.reserved = 0;
 	msg.bodyptr = body;
 	msg.bodyval = 0;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(
 				QDF_MODULE_ID_WMA, &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s: Posting message %d failed",
@@ -728,7 +728,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx,
 		void *callback_context)
 {
 	tpSirPNOScanReq request_buf;
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
 	tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id);
 	uint8_t uc_dot11_mode;
@@ -828,7 +828,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx,
 	msg.reserved = 0;
 	msg.bodyptr = request_buf;
 	if (!QDF_IS_STATUS_SUCCESS
-			(cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
+			(scheduler_post_msg(QDF_MODULE_ID_WMA, &msg))) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to post WMA_SET_PNO_REQ message to WMA"));
 		qdf_mem_free(request_buf);
@@ -861,7 +861,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx,
 		uint8_t session_id)
 {
 	tpSirHostOffloadReq request_buf;
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
 	tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id);
 
@@ -895,7 +895,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx,
 	MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 			 session_id, msg.type));
 	if (QDF_STATUS_SUCCESS !=
-			cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+			scheduler_post_msg(QDF_MODULE_ID_WMA, &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		      FL("Not able to post WMA_SET_HOST_OFFLOAD msg to WMA"));
 		qdf_mem_free(request_buf);
@@ -921,7 +921,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
 {
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
 	tpSirHostOffloadReq request_buf;
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 	tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id);
 
 	if (NULL == session) {
@@ -945,7 +945,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
 	MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 			 session_id, msg.type));
 	if (QDF_STATUS_SUCCESS !=
-			cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+			scheduler_post_msg(QDF_MODULE_ID_WMA, &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL"));
 		qdf_mem_free(request_buf);
@@ -976,10 +976,11 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
 tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 {
 	QDF_STATUS qdf_status;
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_PE, (cds_msg_t *) msg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_PE,
+					(struct scheduler_msg *) msg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		sms_log(mac_ctx, LOGP,
-			FL("cds_mq_post_message failed with status code %d"),
+			FL("scheduler_post_msg failed with status code %d"),
 			qdf_status);
 		return eSIR_FAILURE;
 	}

+ 10 - 11
core/sme/src/csr/csr_api_roam.c

@@ -35,7 +35,6 @@
 #include "ani_global.h"          /* for tpAniSirGlobal */
 #include "wma_types.h"
 #include "wma_if.h"          /* for STA_INVALID_IDX. */
-#include "cds_mq.h"
 #include "csr_inside_api.h"
 #include "sms_debug.h"
 #include "sme_trace.h"
@@ -692,7 +691,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac)
 	uint8_t numChan = pScan->base_channels.numChannels;
 	uint8_t num_channel = 0;
 	uint32_t bufLen;
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 	uint8_t i, j, social_channel[MAX_SOCIAL_CHANNELS] = { 1, 6, 11 };
 	uint8_t channel_state;
 	uint16_t unsafe_chan[NUM_CHANNELS];
@@ -878,7 +877,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac)
 	pChanList->numChan = num_channel;
 	MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
 			 NO_SESSION, msg.type));
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(QDF_MODULE_ID_WMA,
 						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to post msg to WMA", __func__);
@@ -6184,7 +6183,7 @@ static eCsrPhyMode csr_roamdot11mode_to_phymode(uint8_t dot11mode)
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 static void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id)
 {
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 	struct roam_offload_synch_fail *roam_offload_failed = NULL;
 	tCsrRoamSession *session = &mac->roam.roamSession[session_id];
 
@@ -6206,7 +6205,7 @@ static void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id)
 	msg.type     = WMA_ROAM_OFFLOAD_SYNCH_FAIL;
 	msg.reserved = 0;
 	msg.bodyptr  = roam_offload_failed;
-	if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA,
+	if (!QDF_IS_STATUS_SUCCESS(scheduler_post_msg(QDF_MODULE_ID_WMA,
 						       &msg))) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"%s: Unable to post WMA_ROAM_OFFLOAD_SYNCH_FAIL to WMA",
@@ -16522,7 +16521,7 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac,
 			int8_t lastRSSI, void *pContext, void *p_cds_context)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 	uint32_t sessionId;
 
 	tAniGetRssiReq *pMsg;
@@ -16557,7 +16556,7 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac,
 	msg.type = eWNI_SME_GET_RSSI_REQ;
 	msg.bodyptr = pMsg;
 	msg.reserved = 0;
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_SME,
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(QDF_MODULE_ID_SME,
 						      &msg)) {
 		sms_log(pMac, LOGE, " csr_get_rssi failed to post msg to self ");
 		qdf_mem_free((void *)pMsg);
@@ -16572,7 +16571,7 @@ QDF_STATUS csr_get_snr(tpAniSirGlobal pMac,
 		       uint8_t staId, struct qdf_mac_addr bssId, void *pContext)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 	uint32_t sessionId;
 
 	tAniGetSnrReq *pMsg;
@@ -16598,7 +16597,7 @@ QDF_STATUS csr_get_snr(tpAniSirGlobal pMac,
 	msg.bodyptr = pMsg;
 	msg.reserved = 0;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_SME,
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(QDF_MODULE_ID_SME,
 						      &msg)) {
 		sms_log(pMac, LOGE, "%s failed to post msg to self", __func__);
 		qdf_mem_free((void *)pMsg);
@@ -18574,7 +18573,7 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac,
 			       tCsrHandoffRequest *pHandoffInfo)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 
 	tAniHandoffReq *pMsg;
 	pMsg = qdf_mem_malloc(sizeof(tAniHandoffReq));
@@ -18592,7 +18591,7 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac,
 	msg.type = eWNI_SME_HANDOFF_REQ;
 	msg.bodyptr = pMsg;
 	msg.reserved = 0;
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_SME,
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(QDF_MODULE_ID_SME,
 						      &msg)) {
 		sms_log(pMac, LOGE,
 			" csr_handoff_request failed to post msg to self ");

+ 0 - 1
core/sme/src/csr/csr_api_scan.c

@@ -35,7 +35,6 @@
 
 #include "ani_global.h"
 
-#include "cds_mq.h"
 #include "csr_inside_api.h"
 #include "sme_inside.h"
 #include "sms_debug.h"

+ 1 - 2
core/sme/src/csr/csr_host_scan_roam.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -25,7 +25,6 @@
  */
 
 #include "wma_types.h"
-#include "cds_mq.h"
 #include "csr_inside_api.h"
 #include "sms_debug.h"
 #include "sme_qos_internal.h"

+ 0 - 1
core/sme/src/csr/csr_neighbor_roam.c

@@ -35,7 +35,6 @@
    ========================================================================== */
 
 #include "wma_types.h"
-#include "cds_mq.h"
 #include "csr_inside_api.h"
 #include "sms_debug.h"
 #include "sme_qos_internal.h"

+ 0 - 1
core/sme/src/csr/csr_roam_preauth.c

@@ -25,7 +25,6 @@
  */
 
 #include "wma_types.h"
-#include "cds_mq.h"
 #include "csr_inside_api.h"
 #include "sms_debug.h"
 #include "sme_qos_internal.h"

+ 1 - 2
core/sme/src/csr/csr_tdls_process.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -36,7 +36,6 @@
 #ifdef FEATURE_WLAN_TDLS
 
 #include "ani_global.h"          /* for tpAniSirGlobal */
-#include "cds_mq.h"
 #include "csr_inside_api.h"
 #include "sme_inside.h"
 #include "sms_debug.h"

+ 3 - 3
core/sme/src/nan/nan_api.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -96,7 +96,7 @@ void sme_nan_deregister_callback(tHalHandle h_hal)
  *****************************************************************************/
 QDF_STATUS sme_nan_request(tpNanRequestReq input)
 {
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 	tpNanRequest data;
 	size_t data_len;
 
@@ -118,7 +118,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input)
 	msg.reserved = 0;
 	msg.bodyptr = data;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(QDF_MODULE_ID_WMA,
 						      &msg)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL

+ 1 - 1
core/sme/src/nan/nan_datapath_api.c

@@ -614,7 +614,7 @@ QDF_STATUS csr_process_ndp_data_end_request(tpAniSirGlobal mac_ctx,
  *
  * Return: nothing
  */
-void sme_ndp_msg_processor(tpAniSirGlobal mac_ctx, cds_msg_t *msg)
+void sme_ndp_msg_processor(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg)
 {
 	tCsrRoamInfo roam_info = {0};
 	eCsrRoamResult result;

部分文件因为文件数量过多而无法显示