From b264f4fad42495f6fa8c071f9df75417e3fba201 Mon Sep 17 00:00:00 2001 From: spuligil Date: Tue, 12 Dec 2017 14:00:18 -0800 Subject: [PATCH] fw-api: CL 3865355 - update fw common interface files WMI: change 5g/2g Nss to per-chan list of Nss in NDP msgs Change-Id: I14d32603ccaccfbd6788c1981e6a974e7abd5ccc CRs-Fixed: 1107600 --- fw/wmi_tlv_defs.h | 6 ++++-- fw/wmi_unified.h | 10 ++++------ fw/wmi_version.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 3f5c9101d7f2..c215166c97fd 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -4215,7 +4215,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_NDP_INDICATION_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ndp_confirm_event_fixed_param, wmi_ndp_confirm_event_fixed_param_PROTOTYPE, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_channel, ndp_channel_list, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_channel, ndp_channel_list, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, nss_list, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_NDP_CONFIRM_EVENTID); /** NDP end indication event @@ -4237,7 +4238,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_NDP_END_INDICATION_EVENTID); #define WMITLV_TABLE_WMI_NDL_SCHEDULE_UPDATE_EVENTID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ndl_schedule_update_fixed_param, wmi_ndl_schedule_update_fixed_param_PROTOTYPE, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, ndp_instance_list, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_channel, ndl_channel_list, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_channel, ndl_channel_list, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, nss_list, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_NDL_SCHEDULE_UPDATE_EVENTID); /* Update RCPI Info Event */ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 4dd71fdceceb..23af74b07579 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -15452,15 +15452,14 @@ typedef struct { A_UINT32 num_active_ndps_on_peer; /** Number of channels on this peer */ A_UINT32 num_ndp_channels; - /** Number of spatial streams associated */ - A_UINT32 nss_2g; - A_UINT32 nss_5g; /** * TLV (tag length value) parameters follow the ndp_confirm * structure. The TLV's are: * A_UINT8 ndp_cfg[]; * A_UINT8 ndp_app_info[]; * wmi_channel ndp_channel_list[]; + * A_UINT32 nss_list[]; // Nss indexing should match with channel indexing, + * // since Nss is associated with the channel */ } wmi_ndp_confirm_event_fixed_param_PROTOTYPE; @@ -15501,9 +15500,6 @@ typedef struct * Bits 2-31 -> Reserved */ A_UINT32 flags; - /** num spatial streams associated */ - A_UINT32 nss_2g; - A_UINT32 nss_5g; /** num of channels */ A_UINT32 num_channels; /** num of ndp instances */ @@ -15513,6 +15509,8 @@ typedef struct * structure. The TLV's are: * A_UINT32 ndp_instance_list[]; * wmi_channel ndl_channel_list[]; + * A_UINT32 nss_list[]; // Nss indexing should match with channel indexing, + * // since Nss is associate with a channel */ } wmi_ndl_schedule_update_fixed_param_PROTOTYPE; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index b1e528b97ea0..223b745d20f5 100644 --- 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_ 477 +#define __WMI_REVISION_ 478 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work