From 7b590369dc1ad7e3e7c228155341772637f40c56 Mon Sep 17 00:00:00 2001
From: spuligil <quic_spuligil@quicinc.com>
Date: Wed, 11 May 2022 06:01:15 -0700
Subject: [PATCH] fw-api: CL 18137973 - update fw common interface files

Change-Id: If5ddb915174a7d3545bbeb488999228153acc4fc
WMI: add BTCONNECT flag and ASSOC_ID field in roam TLVs
CRs-Fixed: 2262693
---
 fw/wmi_unified.h | 19 +++++++++++++++++++
 fw/wmi_version.h |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h
index 6a33e4f0fd..6c43434a97 100644
--- a/fw/wmi_unified.h
+++ b/fw/wmi_unified.h
@@ -33977,6 +33977,9 @@ typedef struct {
     A_UINT32 btm_req_dialog_token;
 } wmi_roam_trigger_reason;
 
+#define WMI_GET_BTCONNECT_STATUS(flags)      WMI_GET_BITS(flags, 0, 1)
+#define WMI_SET_BTCONNECT_STATUS(flags, val) WMI_SET_BITS(flags, 0, 1, val)
+
 typedef struct {
     A_UINT32 tlv_header;     /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_roam_scan_info_tlv_param */
     /* roam_scan_type:
@@ -33997,6 +34000,12 @@ typedef struct {
      * This timestamp indicates the time when roam scan finished.
      */
     A_UINT32 scan_complete_timestamp;   /* milli second units */
+    /*
+     * Flags capturing factors involved during roam scan:
+     * Bit 0    : Bluetooth connect status, 0(not connected) or 1(connected).
+     * Bit 1-31 : reserved for future use.
+     */
+    A_UINT32 flags;
 } wmi_roam_scan_info;
 
 typedef struct {
@@ -34169,6 +34178,9 @@ typedef struct {
     A_UINT32 channel;    /* Channel frequency in MHz */
 } wmi_roam_neighbor_report_channel_info;
 
+#define WMI_GET_ASSOC_ID(frame_info_ext)      WMI_GET_BITS(frame_info_ext, 0, 16)
+#define WMI_SET_ASSOC_ID(frame_info_ext, val) WMI_SET_BITS(frame_info_ext, 0, 16, val)
+
 typedef struct {
     A_UINT32 tlv_header;     /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_roam_frame_info_tlv_param */
     /* timestamp is the absolute time w.r.t host timer which is synchronized between the host and target */
@@ -34212,6 +34224,13 @@ typedef struct {
      */
     A_UINT32 retry_count;
     wmi_mac_addr bssid;      /* AP MAC address */
+    /*
+     * frame_info_ext captures below fields:
+     * Bit 0-15  : (re)assoc id of (re)association response frame,
+     *             section 9.4.1.8 AID field.
+     * Bit 16~31 : reserved for future use.
+     */
+    A_UINT32 frame_info_ext;
 } wmi_roam_frame_info;
 
 typedef enum {
diff --git a/fw/wmi_version.h b/fw/wmi_version.h
index c2eb2e248d..9e667a4465 100644
--- a/fw/wmi_version.h
+++ b/fw/wmi_version.h
@@ -37,7 +37,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_ 1154
+#define __WMI_REVISION_ 1155
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work