qcacld-2.0: CL 3865355 - update fw commmon interface files
WMI: change 5g/2g Nss to per-chan list of Nss in NDP msgs
Change-Id: Iadc64fb24e7dbe907c3debec61c58b10bc9fa9a8
CRs-Fixed: 865207
diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
index a8e8c8c..62e8912 100644
--- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h
+++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
@@ -4184,7 +4184,8 @@
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);
/** NDL schedule update event
@@ -4196,7 +4197,8 @@
#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);
/** NDP end indication event
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index 475bc33..af8b949 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -15553,15 +15553,14 @@
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;
@@ -15602,9 +15601,6 @@
* 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 */
@@ -15614,6 +15610,8 @@
* 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/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index a17bb03..ca7a6b5 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_ 477
+#define __WMI_REVISION_ 478
/** The Version Namespace should not be normally changed. Only
* host and firmware of the same WMI namespace will work