diff options
| author | spuligil <spuligil@codeaurora.org> | 2019-12-17 06:00:32 -0800 |
|---|---|---|
| committer | spuligil <spuligil@codeaurora.org> | 2019-12-17 06:00:32 -0800 |
| commit | 2a28e4a3cc0242450b2019bb6eb6773e66059cfc (patch) | |
| tree | 4f01967824a0930bdd5739949e712c7709351ba1 | |
| parent | bd37e530d4469f3951450c4328f23e711c8784a9 (diff) | |
fw-api: CL 9068648 - update fw common interface files
Change-Id: Ieba68fab125eba02fe3110c928717b4007d93844
WMI: add defs of AUDIO_SET_GROUP_AUTO_RATE_CMD and _PROBE_CMD msgs
CRs-Fixed: 2262693
| -rwxr-xr-x | fw/wmi_tlv_defs.h | 12 | ||||
| -rwxr-xr-x | fw/wmi_unified.h | 37 | ||||
| -rwxr-xr-x | fw/wmi_version.h | 2 |
3 files changed, 50 insertions, 1 deletions
diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 179a85cd6ad4..7cc873db4304 100755 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -1032,6 +1032,8 @@ typedef enum { WMITLV_TAG_STRUC_wmi_roam_neighbor_report_info_tlv_param, WMITLV_TAG_STRUC_wmi_roam_neighbor_report_channel_info_tlv_param, WMITLV_TAG_STRUC_wmi_set_ocl_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_audio_aggr_set_group_auto_rate, + WMITLV_TAG_STRUC_wmi_audio_aggr_set_group_probe, } WMITLV_TAG_ID; /* @@ -1453,6 +1455,8 @@ typedef enum { OP(WMI_GET_CHANNEL_ANI_CMDID) \ OP(WMI_PEER_CONFIG_VLAN_CMDID) \ OP(WMI_SET_OCL_CMDID) \ + OP(WMI_AUDIO_AGGR_SET_GROUP_AUTO_RATE_CMDID) \ + OP(WMI_AUDIO_AGGR_SET_GROUP_PROBE_CMDID) \ /* add new CMD_LIST elements above this line */ @@ -4211,6 +4215,14 @@ WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_SET_GROUP_RATE_CMDID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_audio_aggr_set_group_retry, wmi_audio_aggr_set_group_retry_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_SET_GROUP_RETRY_CMDID); +#define WMITLV_TABLE_WMI_AUDIO_AGGR_SET_GROUP_AUTO_RATE_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_audio_aggr_set_group_auto_rate, wmi_audio_aggr_set_group_auto_rate_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_SET_GROUP_AUTO_RATE_CMDID); + +#define WMITLV_TABLE_WMI_AUDIO_AGGR_SET_GROUP_PROBE_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_audio_aggr_set_group_probe, wmi_audio_aggr_set_group_probe_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_AUDIO_AGGR_SET_GROUP_PROBE_CMDID); + /* CFR Capture Filter cmd */ #define WMITLV_TABLE_WMI_CFR_CAPTURE_FILTER_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_cfr_capture_filter_cmd_fixed_param, wmi_cfr_capture_filter_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index ec838897ecc6..2be6161594f6 100755 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -1264,6 +1264,8 @@ typedef enum { WMI_AUDIO_AGGR_DEL_GROUP_CMDID, WMI_AUDIO_AGGR_SET_GROUP_RATE_CMDID, WMI_AUDIO_AGGR_SET_GROUP_RETRY_CMDID, + WMI_AUDIO_AGGR_SET_GROUP_AUTO_RATE_CMDID, + WMI_AUDIO_AGGR_SET_GROUP_PROBE_CMDID, /** WMI commands related to Channel Frequency Response Capture **/ WMI_CFR_CAPTURE_FILTER_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_CFR_CAPTURE), @@ -25024,6 +25026,8 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command) WMI_RETURN_STRING(WMI_PEER_ATF_EXT_REQUEST_CMDID); WMI_RETURN_STRING(WMI_GET_CHANNEL_ANI_CMDID); WMI_RETURN_STRING(WMI_SET_OCL_CMDID); + WMI_RETURN_STRING(WMI_AUDIO_AGGR_SET_GROUP_AUTO_RATE_CMDID); + WMI_RETURN_STRING(WMI_AUDIO_AGGR_SET_GROUP_PROBE_CMDID); } return "Invalid WMI cmd"; @@ -28316,28 +28320,33 @@ typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_audio_aggr_enable_cmd_fixed_param */ A_UINT32 aggr_enable; /* enable aggregation for audio frame */ A_UINT32 tbd_enable; /* enable time_based discarding for audio frame */ + A_UINT32 vdev_id; } wmi_audio_aggr_enable_cmd_fixed_param; typedef struct wmi_audio_aggr_rate_set_s { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_audio_aggr_rate_set */ A_UINT32 mcs; A_UINT32 bandwidth; /* 0 for 20M, 1 for 40M and 2 for 80M, etc. */ + A_UINT32 vdev_id; } WMI_AUDIO_AGGR_RATE_SET_T; typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_audio_aggr_add_group */ A_UINT32 group_id; /* id of audio group */ wmi_mac_addr multicast_addr; /* multicast address of audio group */ + A_UINT32 vdev_id; } wmi_audio_aggr_add_group_cmd_fixed_param; typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_audio_aggr_del_group */ A_UINT32 group_id; + A_UINT32 vdev_id; } wmi_audio_aggr_del_group_cmd_fixed_param; typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_audio_aggr_set_group_rate */ A_UINT32 group_id; + A_UINT32 vdev_id; /** * TLV (tag length value) parameters follow the * structure. The TLV's are: @@ -28349,9 +28358,37 @@ typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_audio_aggr_set_group_retry */ A_UINT32 group_id; A_UINT32 retry_thresh; + A_UINT32 vdev_id; } wmi_audio_aggr_set_group_retry_cmd_fixed_param; typedef struct { + A_UINT32 tlv_header; + A_UINT32 vdev_id; + A_UINT32 group_id; + /* + * bit0: if set, Enable HT20 + * bit1: if set, Enable HT40 + * bit2, bit3: Reserved + * bit4: if set, Enable VHT20 + * bit5: if set, Enable VHT40 + * bit6: if set, Enable VHT80 + * bit7 ~ bit31: Reserved + */ + A_UINT32 bw; + A_UINT32 mcs_min; + A_UINT32 mcs_max; + A_UINT32 mcs_offset; + A_UINT32 nss; +} wmi_audio_aggr_set_group_auto_rate_cmd_fixed_param; + +typedef struct { + A_UINT32 tlv_header; + A_UINT32 vdev_id; + A_UINT32 group_id; + A_UINT32 interval; +} wmi_audio_aggr_set_group_probe_cmd_fixed_param; + +typedef struct { /** TLV tag and len; tag equals * WMITLV_TAG_STRUC_wmi_set_ocl_cmd_fixed_param */ A_UINT32 tlv_header; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index ce71eae5844f..50011186a750 100755 --- a/fw/wmi_version.h +++ b/fw/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_ 755 +#define __WMI_REVISION_ 756 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work |
