From d96403461fa2c1cf98e8743fefcaeecb43d319dd Mon Sep 17 00:00:00 2001 From: Manishekar Chandrasekaran Date: Wed, 27 Apr 2016 12:28:26 +0530 Subject: qcacld-3.0: Replace soc level references of set hw request and response Replace the obsolete WMI command WMI_SOC_SET_HW_MODE_CMDID with WMI_PDEV_SET_HW_MODE_CMDID and event WMI_SOC_SET_HW_MODE_RESP_EVENTID with WMI_PDEV_SET_HW_MODE_RESP_EVENTID respectively. These new WMI commands and events additionally carry the pdev id and all mac id references are replaced with pdev id. Change-Id: If2a3f93dcd1947eedce8d4eac8ed936166f7e078 CRs-Fixed: 989502 --- core/mac/src/include/sir_params.h | 4 ++-- core/mac/src/pe/lim/lim_process_message_queue.c | 2 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 2 +- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'core/mac/src') diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index 75dc58bc40a0..cc433c1a65b2 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -587,8 +587,8 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_FW_MEM_DUMP_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 327) #define SIR_HAL_START_STOP_LOGGING (SIR_HAL_ITC_MSG_TYPES_BEGIN + 328) -#define SIR_HAL_SOC_SET_HW_MODE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 329) -#define SIR_HAL_SOC_SET_HW_MODE_RESP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 330) +#define SIR_HAL_PDEV_SET_HW_MODE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 329) +#define SIR_HAL_PDEV_SET_HW_MODE_RESP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 330) #define SIR_HAL_SOC_HW_MODE_TRANS_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 331) #define SIR_HAL_SET_RSSI_MONITOR_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 333) diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 27d6a4159760..0bd956256ad6 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -2046,7 +2046,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) msg->bodyptr = NULL; break; #endif - case SIR_HAL_SOC_SET_HW_MODE_RESP: + case SIR_HAL_PDEV_SET_HW_MODE_RESP: lim_process_set_hw_mode_resp(mac_ctx, msg->bodyptr); qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 8de45fe8734f..96a428d83144 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -165,7 +165,7 @@ static QDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg) /* Other parameters are not needed for WMA */ cds_message.bodyptr = req_msg; - cds_message.type = SIR_HAL_SOC_SET_HW_MODE; + cds_message.type = SIR_HAL_PDEV_SET_HW_MODE; lim_log(mac, LOG1, FL("Posting SIR_HAL_SOC_SET_HW_MOD to WMA")); status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index db836f05c46f..1c1252e098ef 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -527,7 +527,7 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) CASE_RETURN_STRING(SIR_HAL_START_STOP_LOGGING); CASE_RETURN_STRING(SIR_HAL_FLUSH_LOG_TO_FW); CASE_RETURN_STRING(SIR_HAL_PDEV_SET_PCL_TO_FW); - CASE_RETURN_STRING(SIR_HAL_SOC_SET_HW_MODE); + CASE_RETURN_STRING(SIR_HAL_PDEV_SET_HW_MODE); CASE_RETURN_STRING(SIR_HAL_SOC_DUAL_MAC_CFG_REQ); CASE_RETURN_STRING(WMA_RADAR_DETECTED_IND); CASE_RETURN_STRING(WMA_TIMER_TRAFFIC_STATS_IND); -- cgit v1.2.3