diff options
| author | Himanshu Agarwal <himanaga@qti.qualcomm.com> | 2016-05-20 10:49:47 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-25 02:30:14 -0700 |
| commit | 5ac1339599db94bd898fdadeef8ff39b21e79aaf (patch) | |
| tree | 52f2353f893cb8ec4c3891bf74bc211595faee85 | |
| parent | 7b6f426ea4cbe304bc4c99ceca6d2d620186084f (diff) | |
qcacld-2.0: CL 1511668 – update fw common interface files
Fix union in WMI_MAC_PHY_CAPABILITIES
WMI changes to control transmit power for beacon frames
Change-Id: I4acd731ec8850766d4d47715ff78b813281d0b6a
CRs-Fixed: 865207
| -rw-r--r-- | CORE/SERVICES/COMMON/wmi_tlv_defs.h | 2 | ||||
| -rw-r--r-- | CORE/SERVICES/COMMON/wmi_unified.h | 20 | ||||
| -rw-r--r-- | CORE/SERVICES/COMMON/wmi_version.h | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h index 733fae756ab1..06254bb5a6cd 100644 --- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h +++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h @@ -3681,7 +3681,7 @@ WMITLV_CREATE_PARAM_STRUC(WMI_INST_RSSI_STATS_EVENTID); #define WMITLV_TABLE_WMI_RADIO_TX_POWER_LEVEL_STATS_EVENTID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_tx_power_level_stats_evt_fixed_param, wmi_tx_power_level_stats_evt_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ 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) +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) diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h index 1cb14dc6bad2..f462369a9ccc 100644 --- a/CORE/SERVICES/COMMON/wmi_unified.h +++ b/CORE/SERVICES/COMMON/wmi_unified.h @@ -5204,7 +5204,8 @@ typedef enum { */ WMI_VDEV_PARAM_TSF_INCREMENT, - /* Disable/Enable AMPDU of vdev per AC: + /* + * Disable/Enable AMPDU of vdev per AC: * bit | AC * -------- * 0 | VO @@ -5223,6 +5224,9 @@ typedef enum { * a bit-or mask of wmi_vdev_param_filter enum values. */ WMI_VDEV_PARAM_RX_FILTER, + + /* vdev-specific mgmt tx power in dBm units (signed integer value) */ + WMI_VDEV_PARAM_MGMT_TX_POWER, } WMI_VDEV_PARAM; /* vdev capabilities bit mask */ @@ -14683,12 +14687,14 @@ typedef struct { A_UINT32 phy_id; /* supported modulations */ union { - A_UINT32 supports_11b:1, - supports_11g:1, - supports_11a:1, - supports_11n:1, - supports_11ac:1, - supports_11ax:1; + struct { + A_UINT32 supports_11b:1, + supports_11g:1, + supports_11a:1, + supports_11n:1, + supports_11ac:1, + supports_11ax:1; + }; A_UINT32 supported_flags; }; /* supported bands, enum WLAN_BAND_CAPABILITY */ diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h index d73d10a8af48..4e46242c797d 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_ 248 +#define __WMI_REVISION_ 250 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work |