From e0751be2eebbdb681336cfa5fc7b715ad0039960 Mon Sep 17 00:00:00 2001 From: Himanshu Agarwal Date: Thu, 26 May 2016 11:02:37 +0530 Subject: =?UTF-8?q?qcacld-2.0:=20CL=201508507=20=E2=80=93=20update=20fw=20?= =?UTF-8?q?common=20interface=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replacing WMI RMC leader cmd and event msgs with dummy CMDID and EVENTID and removing tlv structures and definitions for the time being. Change-Id: Ic564e247baa43c58dd63e369ff3ef82ef32f6ca5 CRs-Fixed: 865207 --- CORE/SERVICES/COMMON/wmi_tlv_defs.h | 14 ++------------ CORE/SERVICES/COMMON/wmi_unified.h | 36 ++---------------------------------- CORE/SERVICES/WMI/wmi_unified.c | 2 +- 3 files changed, 5 insertions(+), 47 deletions(-) diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h index b90cdd7f6f65..4fb2f7cfa854 100644 --- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h +++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h @@ -707,8 +707,8 @@ typedef enum { WMITLV_TAG_STRUC_wmi_peer_bwf_request_fixed_param, WMITLV_TAG_STRUC_wmi_bwf_peer_info, WMITLV_TAG_STRUC_wmi_dbglog_time_stamp_sync_cmd_fixed_param, - WMITLV_TAG_STRUC_wmi_rmc_set_leader_cmd_fixed_param, - WMITLV_TAG_STRUC_wmi_rmc_manual_leader_event_fixed_param, + _place_holder_tlv_tag_1, + _place_holder_tlv_tag_2, WMITLV_TAG_STRUC_wmi_per_chain_rssi_stats, WMITLV_TAG_STRUC_wmi_rssi_stats, } WMITLV_TAG_ID; @@ -998,7 +998,6 @@ typedef enum { OP(WMI_WOW_SET_ACTION_WAKE_UP_CMDID) \ OP(WMI_PEER_BWF_REQUEST_CMDID) \ OP(WMI_DBGLOG_TIME_STAMP_SYNC_CMDID) \ - OP(WMI_RMC_SET_MANUAL_LEADER_CMDID) \ /* add new CMD_LIST elements above this line */ /* @@ -1149,7 +1148,6 @@ typedef enum { OP(WMI_PDEV_HW_MODE_TRANSITION_EVENTID) \ OP(WMI_PDEV_SET_MAC_CONFIG_RESP_EVENTID) \ OP(WMI_RADIO_TX_POWER_LEVEL_STATS_EVENTID) \ - OP(WMI_RMC_NEW_LEADER_EVENTID) \ /* add new EVT_LIST elements above this line */ @@ -2861,10 +2859,6 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_WAL_POWER_DEBUG_CMDID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_bwf_peer_info, peer_info, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_PEER_BWF_REQUEST_CMDID); -#define WMITLV_TABLE_WMI_RMC_SET_MANUAL_LEADER_CMDID(id,op,buf,len) \ - WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_rmc_set_leader_cmd_fixed_param, wmi_rmc_set_leader_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) -WMITLV_CREATE_PARAM_STRUC(WMI_RMC_SET_MANUAL_LEADER_CMDID); - /************************** TLV definitions of WMI events *******************************/ /* Service Ready event */ @@ -3687,10 +3681,6 @@ WMITLV_CREATE_PARAM_STRUC(WMI_INST_RSSI_STATS_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, tx_time_per_power_level, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_RADIO_TX_POWER_LEVEL_STATS_EVENTID); -#define WMITLV_TABLE_WMI_RMC_NEW_LEADER_EVENTID(id, op, buf, len) \ - WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_rmc_manual_leader_event_fixed_param, wmi_rmc_manual_leader_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) -WMITLV_CREATE_PARAM_STRUC(WMI_RMC_NEW_LEADER_EVENTID); - #ifdef __cplusplus } diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h index 3a97eabbada9..5a4dc3f68f48 100644 --- a/CORE/SERVICES/COMMON/wmi_unified.h +++ b/CORE/SERVICES/COMMON/wmi_unified.h @@ -829,8 +829,7 @@ typedef enum { /** For debug/future enhancement purposes only, * configures/finetunes RMC algorithms */ WMI_RMC_CONFIG_CMDID, - /** select manual leader */ - WMI_RMC_SET_MANUAL_LEADER_CMDID, + _place_holder_cmd_1, /** WLAN MHF offload commands */ /** enable/disable MHF offload */ @@ -1318,9 +1317,7 @@ typedef enum { WMI_BPF_CAPABILIY_INFO_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_BPF_OFFLOAD), WMI_BPF_VDEV_STATS_INFO_EVENTID, - /* RMC specific event */ - /* RMC manual leader selected event */ - WMI_RMC_NEW_LEADER_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_RMC), + _place_holder_evt_1 = WMI_EVT_GRP_START_ID(WMI_GRP_RMC), /** Events in Prototyping phase */ WMI_NDI_CAP_RSP_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_PROTOTYPE), @@ -14681,35 +14678,6 @@ typedef struct { **/ } wmi_pdev_wal_power_debug_cmd_fixed_param; -typedef struct { - /** TLV tag and len; tag equals - * WMITLV_TAG_STRUC_wmi_rmc_set_leader_cmd_fixed_param - */ - A_UINT32 tlv_header; - /* VDEV identifier */ - A_UINT32 vdev_id; - /* Leader's mac address */ - wmi_mac_addr leader_mac_addr; -} wmi_rmc_set_leader_cmd_fixed_param; - -typedef struct { - /** TLV tag and len; tag equals - * WMITLV_TAG_STRUC_wmi_rmc_manual_leader_event_fixed_param - */ - A_UINT32 tlv_header; - /* VDEV identifier */ - A_UINT32 vdev_id; - /* 0: success - * 1: selected leader not found in network, able to find using auto selection - * -1: error - * non zero value should be return to userspace in case of failure - */ - A_INT32 status; - /* bssid of new leader */ - wmi_mac_addr leader_mac_addr; -} wmi_rmc_manual_leader_event_fixed_param; - - typedef enum { WLAN_2G_CAPABILITY = 0x1, WLAN_5G_CAPABILITY = 0x2, diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c index 699f6c590156..c5bd9ad31b7e 100644 --- a/CORE/SERVICES/WMI/wmi_unified.c +++ b/CORE/SERVICES/WMI/wmi_unified.c @@ -702,7 +702,7 @@ static u_int8_t* get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_WOW_SET_ACTION_WAKE_UP_CMDID); CASE_RETURN_STRING(WMI_PEER_BWF_REQUEST_CMDID); CASE_RETURN_STRING(WMI_DBGLOG_TIME_STAMP_SYNC_CMDID); - CASE_RETURN_STRING(WMI_RMC_SET_MANUAL_LEADER_CMDID); + CASE_RETURN_STRING(_place_holder_cmd_1); } return "Invalid WMI cmd"; } -- cgit v1.2.3