From a9b198c9e89e177e00091957305fa2b581156800 Mon Sep 17 00:00:00 2001 From: gaolez Date: Sat, 22 Apr 2017 10:09:46 +0800 Subject: qcacld-2.0: CL 3018077 - update fw common interface files add WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID Change-Id: I632fb31f8cf71ccc16ad62e75a075d36bf8da504 CRs-fixed: 865207 --- CORE/SERVICES/COMMON/wmi_tlv_defs.h | 8 ++++++++ CORE/SERVICES/COMMON/wmi_unified.h | 14 ++++++++++++++ CORE/SERVICES/COMMON/wmi_version.h | 2 +- CORE/SERVICES/WMI/wmi_unified.c | 1 + 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h index 18e03c374218..3dfe4c584932 100644 --- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h +++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h @@ -815,6 +815,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_set_init_country_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_scan_dbs_duty_cycle_fixed_param, WMITLV_TAG_STRUC_wmi_scan_dbs_duty_cycle_param_tlv, + WMITLV_TAG_STRUC_wmi_pdev_div_get_rssi_antid_fixed_param, } WMITLV_TAG_ID; /* @@ -1145,6 +1146,7 @@ typedef enum { OP(WMI_OFFCHAN_DATA_TX_SEND_CMDID) \ OP(WMI_SET_INIT_COUNTRY_CMDID) \ OP(WMI_SET_SCAN_DBS_DUTY_CYCLE_CMDID) \ + OP(WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID) \ /* add new CMD_LIST elements above this line */ /* @@ -2140,6 +2142,12 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID); WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_TPC_CONFIG_CMDID); +/* PDEV Get Antenna diversity chains rssi and antenna index Cmd */ +#define WMITLV_TABLE_WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_div_get_rssi_antid_fixed_param, wmi_pdev_div_get_rssi_antid_fixed_param, fixed_param, WMITLV_SIZE_FIX) + +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID); + /* VDEV Get Tx power Cmd */ #define WMITLV_TABLE_WMI_VDEV_GET_TX_POWER_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_get_tx_power_cmd_fixed_param, wmi_vdev_get_tx_power_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h index d1d91f24ce0e..c3fd4b2b45bf 100644 --- a/CORE/SERVICES/COMMON/wmi_unified.h +++ b/CORE/SERVICES/COMMON/wmi_unified.h @@ -368,6 +368,8 @@ typedef enum { WMI_PDEV_CHECK_CAL_VERSION_CMDID, /* Set Diversity Gain */ WMI_PDEV_SET_DIVERSITY_GAIN_CMDID, + /** Get chain RSSI and antena index command */ + WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID, /* VDEV (virtual device) specific commands */ /** vdev create */ @@ -4377,6 +4379,18 @@ typedef struct { A_UINT32 param; } wmi_pdev_get_tpc_config_cmd_fixed_param; +typedef struct { + A_UINT32 tlv_header; /* WMITLV_TAG_STRUC_wmi_pdev_div_get_rssi_antid_fixed_param */ + /** pdev_id for identifying the MAC */ + A_UINT32 pdev_id; + /** RSSI (rssi_chain_x_pri20) on each chain (units: dB above noise floor) */ + A_UINT32 chain_rssi[WMI_MAX_CHAINS]; + /** index of the last-used antenna for each chain */ + A_UINT32 ant_id[WMI_MAX_CHAINS]; + /** mac address of diversity peer */ + wmi_mac_addr macaddr; +} wmi_pdev_div_get_rssi_antid_fixed_param; + #define WMI_FAST_DIVERSITY_BIT_OFFSET 0 #define WMI_SLOW_DIVERSITY_BIT_OFFSET 1 diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h index be2ba5e8406d..3e064294cc74 100644 --- a/CORE/SERVICES/COMMON/wmi_version.h +++ b/CORE/SERVICES/COMMON/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility. */ -#define __WMI_REVISION_ 377 +#define __WMI_REVISION_ 378 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c index 120f0fef8ef7..9ae9f7282248 100644 --- a/CORE/SERVICES/WMI/wmi_unified.c +++ b/CORE/SERVICES/WMI/wmi_unified.c @@ -747,6 +747,7 @@ static u_int8_t* get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_OFFCHAN_DATA_TX_SEND_CMDID); CASE_RETURN_STRING(WMI_SET_INIT_COUNTRY_CMDID); CASE_RETURN_STRING(WMI_SET_SCAN_DBS_DUTY_CYCLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID); } return "Invalid WMI cmd"; } -- cgit v1.2.3