From f7e901e3b181a5a9f617e3662a9d8a187e055fed Mon Sep 17 00:00:00 2001 From: snandini Date: Tue, 11 Jul 2017 14:55:05 -0700 Subject: [PATCH] fw-api: CL 3242350 - update fw common interface files add list of MAC addresses to WMI READY event msg Change-Id: Ib114e2b09080e1d2d61b65d7f7122bc65032f6ab CRs-Fixed: 1107600 --- fw/wmi_tlv_defs.h | 3 ++- fw/wmi_unified.h | 16 ++++++++++++++++ fw/wmi_version.h | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 631c9b77fa79..b416a70b3ac2 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -3406,7 +3406,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT_EVENTID); /* Ready event */ #define WMITLV_TABLE_WMI_READY_EVENTID(id,op,buf,len) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ready_event_fixed_param, wmi_ready_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ready_event_fixed_param, wmi_ready_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_mac_addr, mac_addr_list, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_READY_EVENTID); /* Scan Event */ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 45346fd4f9fa..809bbccdee84 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -2188,9 +2188,25 @@ typedef A_UINT32 WLAN_INIT_STATUS; typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_ready_event_fixed_param */ wmi_abi_version fw_abi_vers; + /* + * mac_addr is always filled; in addition, there can be a mac_addr_list + * TLV following this fixed_param TLV to specify additional MAC addresses, + * for cases where the target specifies one MAC address per pdev + * (so the host can treat the pdevs within the target as separately + * as possible) rather than one MAC address for the whole SOC. + */ wmi_mac_addr mac_addr; A_UINT32 status; A_UINT32 num_dscp_table; + /* num_extra_mac_addr - + * how many additional MAC addresses besides the above mac_addr + * are provided in the subsequent mac_addr_list TLV + */ + A_UINT32 num_extra_mac_addr; +/* + * This fixed_param TLV is followed by these additional TLVs: + * mac_addr_list[num_extra_mac_addr]; + */ } wmi_ready_event_fixed_param; typedef struct { diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 38d8971301ff..782431832cd5 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_ 412 +#define __WMI_REVISION_ 413 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work