fw-api: CL 18987039 - update fw common interface files

Change-Id: I10e6ed238c9010e6dd8711dfd92d71dd55f9eb54
WMI: add var arg to WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES macro calls
CRs-Fixed: 2262693

fw/wmi_unified.h

@@ -4814,255 +4814,255 @@ typedef enum {
 
 /* HW features supported info */
 /* enum WMI_WIFI_STANDARD are possible values for WiFi standard bitfield */
-#define WMI_GET_WIFI_STANDARD(feature_bitmap)                   \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 0, 4)
+#define WMI_GET_WIFI_STANDARD(var, feature_bitmap)              \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 0, 4)
 #define WMI_SET_WIFI_STANDARD(feature_bitmap, val)              \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 0, 4, val)
 /* enum WMI_BAND_CONCURRENCY are possible values for band concurrency support bitfield */
-#define WMI_GET_BAND_CONCURRENCY_SUPPORT(feature_bitmap)        \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 4, 3)
+#define WMI_GET_BAND_CONCURRENCY_SUPPORT(var, feature_bitmap)   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 4, 3)
 #define WMI_SET_BAND_CONCURRENCY_SUPPORT(feature_bitmap, val)   \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 4, 3, val)
 
 /* PNO feature supported info */
-#define WMI_GET_PNO_SCAN_IN_UNASSOC_STATE(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 7, 1)
+#define WMI_GET_PNO_SCAN_IN_UNASSOC_STATE(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 7, 1)
 #define WMI_SET_PNO_SCAN_IN_UNASSOC_STATE(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 7, 1, val)
-#define WMI_GET_PNO_SCAN_IN_ASSOC_STATE(feature_bitmap)                 \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 8, 1)
+#define WMI_GET_PNO_SCAN_IN_ASSOC_STATE(var, feature_bitmap)            \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 8, 1)
 #define WMI_SET_PNO_SCAN_IN_ASSOC_STATE(feature_bitmap, val)            \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 8, 1, val)
 
 /* TWT feature supported info */
-#define WMI_GET_TWT_FEATURE_SUPPORT(feature_bitmap)                \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 9, 1)
+#define WMI_GET_TWT_FEATURE_SUPPORT(var, feature_bitmap)           \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 9, 1)
 #define WMI_SET_TWT_FEATURE_SUPPORT(feature_bitmap, val)           \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 9, 1, val)
-#define WMI_GET_TWT_REQUESTOR(feature_bitmap)                      \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 10, 1)
+#define WMI_GET_TWT_REQUESTOR(var, feature_bitmap)                 \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 10, 1)
 #define WMI_SET_TWT_REQUESTER(feature_bitmap, val)                 \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 10, 1, val)
-#define WMI_GET_TWT_BROADCAST(feature_bitmap)                      \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 11, 1)
+#define WMI_GET_TWT_BROADCAST(var, feature_bitmap)                 \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 11, 1)
 #define WMI_SET_TWT_BROADCAST(feature_bitmap, val)                 \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 11, 1, val)
-#define WMI_GET_TWT_FLEXIBLE(feature_bitmap)                       \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 12, 1)
+#define WMI_GET_TWT_FLEXIBLE(var, feature_bitmap)                  \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 12, 1)
 #define WMI_SET_TWT_FLEXIBLE(feature_bitmap, val)                  \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 12, 1, val)
 
 /* WIFI optimizer feature supported info */
-#define WMI_GET_WIFI_OPT_FEATURE_SUPPORT(feature_bitmap)                   \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 13, 1)
-#define WMI_SET_WIFI_OPT_FEATURE_SUPPORT(feature_bitmap, val)              \
+#define WMI_GET_WIFI_OPT_FEATURE_SUPPORT(var, feature_bitmap)                   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 13, 1)
+#define WMI_SET_WIFI_OPT_FEATURE_SUPPORT(feature_bitmap, val)         \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 13, 1, val)
 
 /* RFC8325 feature supported info */
-#define WMI_GET_RFC8325_FEATURE_SUPPORT(feature_bitmap)                     \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 14, 1)
+#define WMI_GET_RFC8325_FEATURE_SUPPORT(var, feature_bitmap)                \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 14, 1)
 #define WMI_SET_RFC8325_FEATURE_SUPPORT(feature_bitmap, val)                \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 14, 1, val)
 
 /* MHS feature supported info */
-#define WMI_GET_MHS_5G_SUPPORT(feature_bitmap)                          \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 15, 1)
+#define WMI_GET_MHS_5G_SUPPORT(var, feature_bitmap)                     \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 15, 1)
 #define WMI_SET_MHS_5G_SUPPORT(feature_bitmap, val)                     \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 15, 1, val)
-#define WMI_GET_MHS_6G_SUPPORT(feature_bitmap)                          \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 16, 1)
+#define WMI_GET_MHS_6G_SUPPORT(var, feature_bitmap)                     \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 16, 1)
 #define WMI_SET_MHS_6G_SUPPORT(feature_bitmap, val)                     \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 16, 1, val)
-#define WMI_GET_MHS_MAX_CLIENTS_SUPPORT(feature_bitmap)                 \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 17, 8)
+#define WMI_GET_MHS_MAX_CLIENTS_SUPPORT(var, feature_bitmap)            \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 17, 8)
 #define WMI_SET_MHS_MAX_CLIENTS_SUPPORT(feature_bitmap, val)            \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 17, 8, val)
-#define WMI_GET_MHS_SET_COUNTRY_CODE_HAL_SUPPORT(feature_bitmap)        \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 25, 1)
+#define WMI_GET_MHS_SET_COUNTRY_CODE_HAL_SUPPORT(var, feature_bitmap)   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 25, 1)
 #define WMI_SET_MHS_SET_COUNTRY_CODE_HAL_SUPPORT(feature_bitmap, val)   \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 25, 1, val)
-#define WMI_GET_MHS_GETVALID_CHANNELS_SUPPORT(feature_bitmap)           \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 26, 1)
+#define WMI_GET_MHS_GETVALID_CHANNELS_SUPPORT(var, feature_bitmap)      \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 26, 1)
 #define WMI_SET_MHS_GETVALID_CHANNELS_SUPPORT(feature_bitmap, val)      \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 26, 1, val)
 /* enum WMI_WIFI_STANDARD are possible values for MHS DOT11 mode support bitfield */
-#define WMI_GET_MHS_DOT11_MODE_SUPPORT(feature_bitmap)                  \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 27, 4)
+#define WMI_GET_MHS_DOT11_MODE_SUPPORT(var, feature_bitmap)             \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 27, 4)
 #define WMI_SET_MHS_DOT11_MODE_SUPPORT(feature_bitmap, val)             \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 27, 4, val)
-#define WMI_GET_MHS_WPA3_SUPPORT(feature_bitmap)                        \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 31, 1)
+#define WMI_GET_MHS_WPA3_SUPPORT(var, feature_bitmap)                   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 31, 1)
 #define WMI_SET_MHS_WPA3_SUPPORT(feature_bitmap, val)                   \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 31, 1, val)
 
 /* Vendor requirement1 supported verison info */
 /* enum's WMI_VENDORxx_REQxx_VERSION are the possible vaues for below bitfield*/
-#define WMI_GET_VENDOR_REQ_1_VERSION(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 32, 8)
+#define WMI_GET_VENDOR_REQ_1_VERSION(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 32, 8)
 #define WMI_SET_VENDOR_REQ_1_VERSION(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 32, 8, val)
 
 /* Roaming feature supported info */
-#define WMI_GET_ROAMING_HIGH_CU_ROAM_TRIGGER(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 40, 1)
+#define WMI_GET_ROAMING_HIGH_CU_ROAM_TRIGGER(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 40, 1)
 #define WMI_SET_ROAMING_HIGH_CU_ROAM_TRIGGER(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 40, 1, val)
-#define WMI_GET_ROAMING_EMERGENCY_TRIGGER(feature_bitmap)                  \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 41, 1)
+#define WMI_GET_ROAMING_EMERGENCY_TRIGGER(var, feature_bitmap)             \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 41, 1)
 #define WMI_SET_ROAMING_EMERGENCY_TRIGGER(feature_bitmap, val)             \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 41, 1, val)
-#define WMI_GET_ROAMING_BTM_TRIGGER(feature_bitmap)                        \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 42, 1)
+#define WMI_GET_ROAMING_BTM_TRIGGER(var, feature_bitmap)                   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 42, 1)
 #define WMI_SET_ROAMING_BTM_TRIGGER(feature_bitmap, val)                   \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 42, 1, val)
-#define WMI_GET_ROAMING_IDLE_TRIGGER(feature_bitmap)                       \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 43, 1)
+#define WMI_GET_ROAMING_IDLE_TRIGGER(var, feature_bitmap)                  \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 43, 1)
 #define WMI_SET_ROAMING_IDLE_TRIGGER(feature_bitmap, val)                  \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 43, 1, val)
-#define WMI_GET_ROAMING_WTC_TRIGGER(feature_bitmap)                        \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 44, 1)
+#define WMI_GET_ROAMING_WTC_TRIGGER(var, feature_bitmap)                   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 44, 1)
 #define WMI_SET_ROAMING_WTC_TRIGGER(feature_bitmap, val)                   \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 44, 1, val)
-#define WMI_GET_ROAMING_BTCOEX_TRIGGER(feature_bitmap)                     \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 45, 1)
+#define WMI_GET_ROAMING_BTCOEX_TRIGGER(var, feature_bitmap)                \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 45, 1)
 #define WMI_SET_ROAMING_BTCOEX_TRIGGER(feature_bitmap, val)                \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 45, 1, val)
-#define WMI_GET_ROAMING_BTW_WPA_WPA2(feature_bitmap)                       \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 46, 1)
+#define WMI_GET_ROAMING_BTW_WPA_WPA2(var, feature_bitmap)                  \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 46, 1)
 #define WMI_SET_ROAMING_BTW_WPA_WPA2(feature_bitmap, val)                  \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 46, 1, val)
-#define WMI_GET_ROAMING_MANAGE_CHAN_LIST_API(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 47, 1)
+#define WMI_GET_ROAMING_MANAGE_CHAN_LIST_API(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 47, 1)
 #define WMI_SET_ROAMING_MANAGE_CHAN_LIST_API(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 47, 1, val)
-#define WMI_GET_ROAMING_ADAPTIVE_11R(feature_bitmap)                       \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 48, 1)
+#define WMI_GET_ROAMING_ADAPTIVE_11R(var, feature_bitmap)                  \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 48, 1)
 #define WMI_SET_ROAMING_ADAPTIVE_11R(feature_bitmap, val)                  \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 48, 1, val)
-#define WMI_GET_ROAMING_CTRL_API_GET_SET(feature_bitmap)                   \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 49, 1)
+#define WMI_GET_ROAMING_CTRL_API_GET_SET(var, feature_bitmap)              \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 49, 1)
 #define WMI_SET_ROAMING_CTRL_API_GET_SET(feature_bitmap, val)              \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 49, 1, val)
-#define WMI_GET_ROAMING_CTRL_API_REASSOC(feature_bitmap)                   \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 50, 1)
+#define WMI_GET_ROAMING_CTRL_API_REASSOC(var, feature_bitmap)              \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 50, 1)
 #define WMI_SET_ROAMING_CTRL_API_REASSOC(feature_bitmap, val)              \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 50, 1, val)
-#define WMI_GET_ROAMING_CTRL_GET_CU(feature_bitmap)                        \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 51, 1)
+#define WMI_GET_ROAMING_CTRL_GET_CU(var, feature_bitmap)                   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 51, 1)
 #define WMI_SET_ROAMING_CTRL_GET_CU(feature_bitmap, val)                   \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 51, 1, val)
 
 /* Vendor requirement2 supported verison info */
 /* enum's WMI_VENDORxx_REQxx_VERSION are the possible vaues for below bitfield*/
-#define WMI_GET_VENDOR_REQ_2_VERSION(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 52, 8)
+#define WMI_GET_VENDOR_REQ_2_VERSION(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 52, 8)
 #define WMI_SET_VENDOR_REQ_2_VERSION(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 52, 8, val)
 
-#define WMI_GET_ASSURANCE_DISCONNECT_REASON_API(feature_bitmap)            \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 60, 1)
+#define WMI_GET_ASSURANCE_DISCONNECT_REASON_API(var, feature_bitmap)       \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 60, 1)
 #define WMI_SET_ASSURANCE_DISCONNECT_REASON_API(feature_bitmap, val)       \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 60, 1, val)
 
 /* Frame pcap logging */
-#define WMI_GET_FRAME_PCAP_LOG_MGMT(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 61, 1)
+#define WMI_GET_FRAME_PCAP_LOG_MGMT(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 61, 1)
 #define WMI_SET_FRAME_PCAP_LOG_MGMT(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 61, 1, val)
-#define WMI_GET_FRAME_PCAP_LOG_CTRL(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 62, 1)
+#define WMI_GET_FRAME_PCAP_LOG_CTRL(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 62, 1)
 #define WMI_SET_FRAME_PCAP_LOG_CTRL(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 62, 1, val)
-#define WMI_GET_FRAME_PCAP_LOG_DATA(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 63, 1)
+#define WMI_GET_FRAME_PCAP_LOG_DATA(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 63, 1)
 #define WMI_SET_FRAME_PCAP_LOG_DATA(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 63, 1, val)
 
 /* Security features supported info */
-#define WMI_GET_SECURITY_WPA3_SAE_H2E(feature_bitmap)                     \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 64, 1)
+#define WMI_GET_SECURITY_WPA3_SAE_H2E(var, feature_bitmap)                \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 64, 1)
 #define WMI_SET_SECURITY_WPA3_SAE_H2E(feature_bitmap, val)                \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 64, 1, val)
-#define WMI_GET_SECURITY_WPA3_SAE_FT(feature_bitmap)                      \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 65, 1)
+#define WMI_GET_SECURITY_WPA3_SAE_FT(var, feature_bitmap)                 \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 65, 1)
 #define WMI_SET_SECURITY_WPA3_SAE_FT(feature_bitmap, val)                 \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 65, 1, val)
-#define WMI_GET_SECURITY_WPA3_ENTERP_SUITEB(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 66, 1)
+#define WMI_GET_SECURITY_WPA3_ENTERP_SUITEB(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 66, 1)
 #define WMI_SET_SECURITY_WPA3_ENTERP_SUITEB(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 66, 1, val)
-#define WMI_GET_SECURITY_WPA3_ENTERP_SUITEB_192bit(feature_bitmap)        \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 67, 1)
+#define WMI_GET_SECURITY_WPA3_ENTERP_SUITEB_192bit(var, feature_bitmap)   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 67, 1)
 #define WMI_SET_SECURITY_WPA3_ENTERP_SUITEB_192bit(feature_bitmap, val)   \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 67, 1, val)
-#define WMI_GET_SECURITY_FILS_SHA256(feature_bitmap)                      \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 68, 1)
+#define WMI_GET_SECURITY_FILS_SHA256(var, feature_bitmap)                 \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 68, 1)
 #define WMI_SET_SECURITY_FILS_SHA256(feature_bitmap, val)                 \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 68, 1, val)
-#define WMI_GET_SECURITY_FILS_SHA384(feature_bitmap)                      \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 69, 1)
+#define WMI_GET_SECURITY_FILS_SHA384(var, feature_bitmap)                 \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 69, 1)
 #define WMI_SET_SECURITY_FILS_SHA384(feature_bitmap, val)                 \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 69, 1, val)
-#define WMI_GET_SECURITY_FILS_SHA256_FT(feature_bitmap)                   \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 70, 1)
+#define WMI_GET_SECURITY_FILS_SHA256_FT(var, feature_bitmap)              \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 70, 1)
 #define WMI_SET_SECURITY_FILS_SHA256_FT(feature_bitmap, val)              \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 70, 1, val)
-#define WMI_GET_SECURITY_FILS_SHA384_FT(feature_bitmap)                   \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 71, 1)
+#define WMI_GET_SECURITY_FILS_SHA384_FT(var, feature_bitmap)              \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 71, 1)
 #define WMI_SET_SECURITY_FILS_SHA384_FT(feature_bitmap, val)              \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 71, 1, val)
-#define WMI_GET_SECURITY_ENCHANCED_OPEN(feature_bitmap)                   \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 72, 1)
+#define WMI_GET_SECURITY_ENCHANCED_OPEN(var, feature_bitmap)              \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 72, 1)
 #define WMI_SET_SECURITY_ENCHANCED_OPEN(feature_bitmap, val)              \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 72, 1, val)
 
 /* Peer protocol features supported info */
-#define WMI_GET_NAN_SUPPORT(feature_bitmap)                 \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 73, 1)
+#define WMI_GET_NAN_SUPPORT(var, feature_bitmap)            \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 73, 1)
 #define WMI_SET_NAN_SUPPORT(feature_bitmap, val)            \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 73, 1, val)
-#define WMI_GET_TDLS_SUPPORT(feature_bitmap)                \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 74, 1)
+#define WMI_GET_TDLS_SUPPORT(var, feature_bitmap)           \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 74, 1)
 #define WMI_SET_TDLS_SUPPORT(feature_bitmap, val)           \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 74, 1, val)
-#define WMI_GET_P2P6E_SUPPORT(feature_bitmap)               \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 75, 1)
+#define WMI_GET_P2P6E_SUPPORT(var, feature_bitmap)          \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 75, 1)
 #define WMI_SET_P2P6E_SUPPORT(feature_bitmap, val)          \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 75, 1, val)
-#define WMI_GET_TDLS_OFFCHAN_SUPPORT(feature_bitmap)        \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 76, 1)
+#define WMI_GET_TDLS_OFFCHAN_SUPPORT(var, feature_bitmap)   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 76, 1)
 #define WMI_SET_TDLS_OFFCHAN_SUPPORT(feature_bitmap, val)   \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 76, 1, val)
-#define WMI_GET_TDLS_CAP_ENHANCE(feature_bitmap)            \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 77, 1)
+#define WMI_GET_TDLS_CAP_ENHANCE(var, feature_bitmap)       \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 77, 1)
 #define WMI_SET_TDLS_CAP_ENHANCE(feature_bitmap, val)       \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 77, 1, val)
-#define WMI_GET_MAX_TDLS_PEERS_SUPPORT(feature_bitmap)      \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 78, 4)
+#define WMI_GET_MAX_TDLS_PEERS_SUPPORT(var, feature_bitmap) \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 78, 4)
 #define WMI_SET_MAX_TDLS_PEERS_SUPPORT(feature_bitmap, val) \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 78, 4, val)
-#define WMI_GET_STA_DUAL_P2P_SUPPORT(feature_bitmap)        \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 82, 1)
+#define WMI_GET_STA_DUAL_P2P_SUPPORT(var, feature_bitmap)   \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 82, 1)
 #define WMI_SET_STA_DUAL_P2P_SUPPORT(feature_bitmap, val)   \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 82, 1, val)
 
 /* Big data feature supported info */
-#define WMI_GET_PEER_BIGDATA_GETBSSINFO_API_SUPPORT(feature_bitmap)                 \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 83, 1)
+#define WMI_GET_PEER_BIGDATA_GETBSSINFO_API_SUPPORT(var, feature_bitmap)            \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 83, 1)
 #define WMI_SET_PEER_BIGDATA_GETBSSINFO_API_SUPPORT(feature_bitmap, val)            \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 83, 1, val)
-#define WMI_GET_PEER_BIGDATA_GETASSOCREJECTINFO_API_SUPPORT(feature_bitmap)         \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 84, 1)
+#define WMI_GET_PEER_BIGDATA_GETASSOCREJECTINFO_API_SUPPORT(var, feature_bitmap)    \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 84, 1)
 #define WMI_SET_PEER_BIGDATA_GETASSOCREJECTINFO_API_SUPPORT(feature_bitmap, val)    \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 84, 1, val)
-#define WMI_GET_PEER_BIGDATA_GETSTAINFO_API_SUPPORT(feature_bitmap)                 \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 85, 1)
+#define WMI_GET_PEER_BIGDATA_GETSTAINFO_API_SUPPORT(var, feature_bitmap)            \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 85, 1)
 #define WMI_SET_PEER_BIGDATA_GETSTAINFO_API_SUPPORT(feature_bitmap, val)            \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 85, 1, val)
 
 /* Feature set requirement supported version info */
-#define WMI_GET_FEATURE_SET_VERSION(feature_bitmap)                 \
-        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 86, 16)
+#define WMI_GET_FEATURE_SET_VERSION(var, feature_bitmap)                 \
+        WMI_GET_BITS_FROM_ARRAY_LEN32_BYTES(var, feature_bitmap, 86, 16)
 #define WMI_SET_FEATURE_SET_VERSION(feature_bitmap, val)                 \
         WMI_SET_BITS_FROM_ARRAY_LEN32_BYTES(feature_bitmap, 86, 16, val)
 

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_ 1181
+#define __WMI_REVISION_ 1182
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work