Merge "qcacld-3.0: Change legacy macro msg types to enum msg types" into wlan-cld3.driver.lnx.2.0

core/mac/src/pe/include/lim_trace.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016, 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016, 2019-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -33,7 +33,7 @@
 #include "mac_trace.h"
 #include "qdf_trace.h"
 
-enum {
+enum pecodetype {
 	TRACE_CODE_MLM_STATE,
 	TRACE_CODE_SME_STATE,
 	TRACE_CODE_TX_MGMT,

core/mac/src/pe/lim/lim_timer_utils.h

@@ -32,7 +32,7 @@
 #include "lim_types.h"
 
 /* Timer related functions */
-enum {
+enum limtimertype {
 	eLIM_MIN_CHANNEL_TIMER,
 	eLIM_MAX_CHANNEL_TIMER,
 	eLIM_JOIN_FAIL_TIMER,

core/mac/src/pe/lim/lim_types.h

@@ -51,36 +51,38 @@
 #define TRACE_EVENT_AUTH_RSP_TIMER_ACT     0x6603
 
 /* MLM message types */
-#define LIM_MLM_MSG_START           1000
-#define LIM_MLM_SCAN_REQ            LIM_MLM_MSG_START
-#define LIM_MLM_SCAN_CNF            (LIM_MLM_MSG_START + 1)
-#define LIM_MLM_START_CNF           (LIM_MLM_MSG_START + 3)
-#define LIM_MLM_JOIN_REQ            (LIM_MLM_MSG_START + 4)
-#define LIM_MLM_JOIN_CNF            (LIM_MLM_MSG_START + 5)
-#define LIM_MLM_AUTH_REQ            (LIM_MLM_MSG_START + 6)
-#define LIM_MLM_AUTH_CNF            (LIM_MLM_MSG_START + 7)
-#define LIM_MLM_AUTH_IND            (LIM_MLM_MSG_START + 8)
-#define LIM_MLM_ASSOC_REQ           (LIM_MLM_MSG_START + 9)
-#define LIM_MLM_ASSOC_CNF           (LIM_MLM_MSG_START + 10)
-#define LIM_MLM_ASSOC_IND           (LIM_MLM_MSG_START + 11)
-#define LIM_MLM_DISASSOC_REQ        (LIM_MLM_MSG_START + 12)
-#define LIM_MLM_DISASSOC_CNF        (LIM_MLM_MSG_START + 13)
-#define LIM_MLM_DISASSOC_IND        (LIM_MLM_MSG_START + 14)
-#define LIM_MLM_REASSOC_CNF         (LIM_MLM_MSG_START + 15)
-#define LIM_MLM_REASSOC_IND         (LIM_MLM_MSG_START + 16)
-#define LIM_MLM_DEAUTH_REQ          (LIM_MLM_MSG_START + 17)
-#define LIM_MLM_DEAUTH_CNF          (LIM_MLM_MSG_START + 18)
-#define LIM_MLM_DEAUTH_IND          (LIM_MLM_MSG_START + 19)
-#define LIM_MLM_TSPEC_REQ           (LIM_MLM_MSG_START + 20)
-#define LIM_MLM_TSPEC_CNF           (LIM_MLM_MSG_START + 21)
-#define LIM_MLM_TSPEC_IND           (LIM_MLM_MSG_START + 22)
-#define LIM_MLM_SETKEYS_CNF         (LIM_MLM_MSG_START + 24)
-#define LIM_MLM_LINK_TEST_STOP_REQ  (LIM_MLM_MSG_START + 30)
-#define LIM_MLM_PURGE_STA_IND       (LIM_MLM_MSG_START + 31)
-/*
- * Values (LIM_MLM_MSG_START + 32) through
- * (LIM_MLM_MSG_START + 40) are unused.
- */
+enum mlmmsgtype {
+	LIM_MLM_MSG_START = 1000,
+	LIM_MLM_SCAN_REQ = LIM_MLM_MSG_START,
+	LIM_MLM_SCAN_CNF = (LIM_MLM_MSG_START + 1),
+	LIM_MLM_START_CNF  = (LIM_MLM_MSG_START + 3),
+	LIM_MLM_JOIN_REQ = (LIM_MLM_MSG_START + 4),
+	LIM_MLM_JOIN_CNF = (LIM_MLM_MSG_START + 5),
+	LIM_MLM_AUTH_REQ = (LIM_MLM_MSG_START + 6),
+	LIM_MLM_AUTH_CNF = (LIM_MLM_MSG_START + 7),
+	LIM_MLM_AUTH_IND = (LIM_MLM_MSG_START + 8),
+	LIM_MLM_ASSOC_REQ = (LIM_MLM_MSG_START + 9),
+	LIM_MLM_ASSOC_CNF = (LIM_MLM_MSG_START + 10),
+	LIM_MLM_ASSOC_IND = (LIM_MLM_MSG_START + 11),
+	LIM_MLM_DISASSOC_REQ = (LIM_MLM_MSG_START + 12),
+	LIM_MLM_DISASSOC_CNF = (LIM_MLM_MSG_START + 13),
+	LIM_MLM_DISASSOC_IND = (LIM_MLM_MSG_START + 14),
+	LIM_MLM_REASSOC_CNF = (LIM_MLM_MSG_START + 15),
+	LIM_MLM_REASSOC_IND = (LIM_MLM_MSG_START + 16),
+	LIM_MLM_DEAUTH_REQ = (LIM_MLM_MSG_START + 17),
+	LIM_MLM_DEAUTH_CNF = (LIM_MLM_MSG_START + 18),
+	LIM_MLM_DEAUTH_IND = (LIM_MLM_MSG_START + 19),
+	LIM_MLM_TSPEC_REQ = (LIM_MLM_MSG_START + 20),
+	LIM_MLM_TSPEC_CNF = (LIM_MLM_MSG_START + 21),
+	LIM_MLM_TSPEC_IND = (LIM_MLM_MSG_START + 22),
+	LIM_MLM_SETKEYS_CNF  =  LIM_MLM_MSG_START + 24,
+	LIM_MLM_LINK_TEST_STOP_REQ  =  LIM_MLM_MSG_START + 30,
+	LIM_MLM_PURGE_STA_IND = (LIM_MLM_MSG_START + 31),
+	/*
+	 * Values (LIM_MLM_MSG_START + 32) through
+	 * (LIM_MLM_MSG_START + 40) are unused.
+	 */
+};
 
 #define LIM_WEP_IN_FC           1
 #define LIM_NO_WEP_IN_FC        0

core/sme/inc/sme_trace.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -28,7 +28,7 @@
 #include "mac_trace.h"
 
 #define NO_SESSION 0xFF
-enum {
+enum smecodetype {
 	TRACE_CODE_SME_RX_HDD_MSG_SCAN_REQ,
 	TRACE_CODE_SME_RX_HDD_MSG_SCAN_GET_RESULTS,
 	TRACE_CODE_SME_RX_HDD_MSG_CONNECT,

core/wma/inc/wma_types.h

@@ -108,337 +108,350 @@
 
 
 /* WMA Messages */
-#define WMA_MSG_TYPES_BEGIN            SIR_HAL_MSG_TYPES_BEGIN
-#define WMA_ITC_MSG_TYPES_BEGIN        SIR_HAL_ITC_MSG_TYPES_BEGIN
-#define WMA_RADAR_DETECTED_IND         SIR_HAL_RADAR_DETECTED_IND
-
-#define WMA_ADD_STA_REQ                SIR_HAL_ADD_STA_REQ
-#define WMA_ADD_STA_RSP                SIR_HAL_ADD_STA_RSP
-#define WMA_DELETE_STA_REQ             SIR_HAL_DELETE_STA_REQ
-#define WMA_DELETE_STA_RSP             SIR_HAL_DELETE_STA_RSP
-#define WMA_ADD_BSS_REQ                SIR_HAL_ADD_BSS_REQ
-#define WMA_DELETE_BSS_REQ             SIR_HAL_DELETE_BSS_REQ
-#define WMA_DELETE_BSS_HO_FAIL_REQ     SIR_HAL_DELETE_BSS_HO_FAIL_REQ
-#define WMA_DELETE_BSS_RSP             SIR_HAL_DELETE_BSS_RSP
-#define WMA_DELETE_BSS_HO_FAIL_RSP     SIR_HAL_DELETE_BSS_HO_FAIL_RSP
-#define WMA_SEND_BEACON_REQ            SIR_HAL_SEND_BEACON_REQ
-#define WMA_SEND_BCN_RSP               SIR_HAL_SEND_BCN_RSP
-#define WMA_SEND_PROBE_RSP_TMPL        SIR_HAL_SEND_PROBE_RSP_TMPL
-#define WMA_ROAM_BLACLIST_MSG          SIR_HAL_ROAM_BLACKLIST_MSG
-#define WMA_SEND_PEER_UNMAP_CONF       SIR_HAL_SEND_PEER_UNMAP_CONF
-
-#define WMA_SET_BSSKEY_RSP             SIR_HAL_SET_BSSKEY_RSP
-#define WMA_SET_STAKEY_RSP             SIR_HAL_SET_STAKEY_RSP
-#define WMA_UPDATE_EDCA_PROFILE_IND    SIR_HAL_UPDATE_EDCA_PROFILE_IND
-
-#define WMA_UPDATE_BEACON_IND          SIR_HAL_UPDATE_BEACON_IND
-#define WMA_CHNL_SWITCH_REQ            SIR_HAL_CHNL_SWITCH_REQ
-#define WMA_ADD_TS_REQ                 SIR_HAL_ADD_TS_REQ
-#define WMA_DEL_TS_REQ                 SIR_HAL_DEL_TS_REQ
-
-#define WMA_MISSED_BEACON_IND          SIR_HAL_MISSED_BEACON_IND
-
-#define WMA_HIDDEN_SSID_RESTART_RSP    SIR_HAL_HIDDEN_SSID_RESTART_RSP
-#define WMA_SWITCH_CHANNEL_RSP         SIR_HAL_SWITCH_CHANNEL_RSP
-#define WMA_P2P_NOA_ATTR_IND           SIR_HAL_P2P_NOA_ATTR_IND
-#define WMA_PWR_SAVE_CFG               SIR_HAL_PWR_SAVE_CFG
-
-#define WMA_IBSS_STA_ADD               SIR_HAL_IBSS_STA_ADD
-#define WMA_TIMER_ADJUST_ADAPTIVE_THRESHOLD_IND SIR_HAL_TIMER_ADJUST_ADAPTIVE_THRESHOLD_IND
-#define WMA_SET_LINK_STATE             SIR_HAL_SET_LINK_STATE
-#define WMA_SET_STA_BCASTKEY_RSP       SIR_HAL_SET_STA_BCASTKEY_RSP
-#define WMA_ADD_TS_RSP                 SIR_HAL_ADD_TS_RSP
-#define WMA_DPU_MIC_ERROR              SIR_HAL_DPU_MIC_ERROR
-#define WMA_TIMER_CHIP_MONITOR_TIMEOUT SIR_HAL_TIMER_CHIP_MONITOR_TIMEOUT
-#define WMA_TIMER_TRAFFIC_ACTIVITY_REQ SIR_HAL_TIMER_TRAFFIC_ACTIVITY_REQ
-#define WMA_TIMER_ADC_RSSI_STATS       SIR_HAL_TIMER_ADC_RSSI_STATS
-#define WMA_TIMER_TRAFFIC_STATS_IND    SIR_HAL_TRAFFIC_STATS_IND
+
+enum wmamsgtype {
+	WMA_MSG_TYPES_BEGIN = SIR_HAL_MSG_TYPES_BEGIN,
+	WMA_ITC_MSG_TYPES_BEGIN = SIR_HAL_ITC_MSG_TYPES_BEGIN,
+	WMA_RADAR_DETECTED_IND = SIR_HAL_RADAR_DETECTED_IND,
+
+	WMA_ADD_STA_REQ = SIR_HAL_ADD_STA_REQ,
+	WMA_ADD_STA_RSP = SIR_HAL_ADD_STA_RSP,
+	WMA_DELETE_STA_REQ = SIR_HAL_DELETE_STA_REQ,
+	WMA_DELETE_STA_RSP =  SIR_HAL_DELETE_STA_RSP,
+	WMA_ADD_BSS_REQ = SIR_HAL_ADD_BSS_REQ,
+	WMA_DELETE_BSS_REQ = SIR_HAL_DELETE_BSS_REQ,
+	WMA_DELETE_BSS_HO_FAIL_REQ = SIR_HAL_DELETE_BSS_HO_FAIL_REQ,
+	WMA_DELETE_BSS_RSP = SIR_HAL_DELETE_BSS_RSP,
+	WMA_DELETE_BSS_HO_FAIL_RSP = SIR_HAL_DELETE_BSS_HO_FAIL_RSP,
+	WMA_SEND_BEACON_REQ = SIR_HAL_SEND_BEACON_REQ,
+	WMA_SEND_BCN_RSP = SIR_HAL_SEND_BCN_RSP,
+	WMA_SEND_PROBE_RSP_TMPL = SIR_HAL_SEND_PROBE_RSP_TMPL,
+	WMA_ROAM_BLACLIST_MSG = SIR_HAL_ROAM_BLACKLIST_MSG,
+	WMA_SEND_PEER_UNMAP_CONF = SIR_HAL_SEND_PEER_UNMAP_CONF,
+
+	WMA_SET_BSSKEY_RSP = SIR_HAL_SET_BSSKEY_RSP,
+	WMA_SET_STAKEY_RSP = SIR_HAL_SET_STAKEY_RSP,
+	WMA_UPDATE_EDCA_PROFILE_IND = SIR_HAL_UPDATE_EDCA_PROFILE_IND,
+
+	WMA_UPDATE_BEACON_IND = SIR_HAL_UPDATE_BEACON_IND,
+	WMA_CHNL_SWITCH_REQ = SIR_HAL_CHNL_SWITCH_REQ,
+	WMA_ADD_TS_REQ = SIR_HAL_ADD_TS_REQ,
+	WMA_DEL_TS_REQ = SIR_HAL_DEL_TS_REQ,
+
+	WMA_MISSED_BEACON_IND = SIR_HAL_MISSED_BEACON_IND,
+
+	WMA_HIDDEN_SSID_RESTART_RSP = SIR_HAL_HIDDEN_SSID_RESTART_RSP,
+	WMA_SWITCH_CHANNEL_RSP = SIR_HAL_SWITCH_CHANNEL_RSP,
+	WMA_P2P_NOA_ATTR_IND = SIR_HAL_P2P_NOA_ATTR_IND,
+	WMA_PWR_SAVE_CFG = SIR_HAL_PWR_SAVE_CFG,
+
+	WMA_IBSS_STA_ADD = SIR_HAL_IBSS_STA_ADD,
+	WMA_TIMER_ADJUST_ADAPTIVE_THRESHOLD_IND =
+				SIR_HAL_TIMER_ADJUST_ADAPTIVE_THRESHOLD_IND,
+	WMA_SET_LINK_STATE = SIR_HAL_SET_LINK_STATE,
+	WMA_SET_STA_BCASTKEY_RSP = SIR_HAL_SET_STA_BCASTKEY_RSP,
+	WMA_ADD_TS_RSP = SIR_HAL_ADD_TS_RSP,
+	WMA_DPU_MIC_ERROR = SIR_HAL_DPU_MIC_ERROR,
+	WMA_TIMER_CHIP_MONITOR_TIMEOUT = SIR_HAL_TIMER_CHIP_MONITOR_TIMEOUT,
+	WMA_TIMER_TRAFFIC_ACTIVITY_REQ = SIR_HAL_TIMER_TRAFFIC_ACTIVITY_REQ,
+	WMA_TIMER_ADC_RSSI_STATS = SIR_HAL_TIMER_ADC_RSSI_STATS,
+	WMA_TIMER_TRAFFIC_STATS_IND = SIR_HAL_TRAFFIC_STATS_IND,
 
 #ifdef WLAN_FEATURE_11W
-#define WMA_EXCLUDE_UNENCRYPTED_IND    SIR_HAL_EXCLUDE_UNENCRYPTED_IND
+	WMA_EXCLUDE_UNENCRYPTED_IND = SIR_HAL_EXCLUDE_UNENCRYPTED_IND,
 #endif
 
 #ifdef FEATURE_WLAN_ESE
-#define WMA_TSM_STATS_REQ              SIR_HAL_TSM_STATS_REQ
-#define WMA_TSM_STATS_RSP              SIR_HAL_TSM_STATS_RSP
+	WMA_TSM_STATS_REQ = SIR_HAL_TSM_STATS_REQ,
+	WMA_TSM_STATS_RSP = SIR_HAL_TSM_STATS_RSP,
 #endif
 
-#define WMA_ROAM_SCAN_CH_REQ              SIR_HAL_ROAM_SCAN_CH_REQ
+	WMA_ROAM_SCAN_CH_REQ = SIR_HAL_ROAM_SCAN_CH_REQ,
+
+	WMA_HT40_OBSS_SCAN_IND = SIR_HAL_HT40_OBSS_SCAN_IND,
 
-#define WMA_HT40_OBSS_SCAN_IND                  SIR_HAL_HT40_OBSS_SCAN_IND
+	WMA_SET_MIMOPS_REQ = SIR_HAL_SET_MIMOPS_REQ,
+	WMA_SET_MIMOPS_RSP = SIR_HAL_SET_MIMOPS_RSP,
+	WMA_SYS_READY_IND =  SIR_HAL_SYS_READY_IND,
+	WMA_SET_TX_POWER_REQ = SIR_HAL_SET_TX_POWER_REQ,
+	WMA_SET_TX_POWER_RSP = SIR_HAL_SET_TX_POWER_RSP,
+	WMA_GET_TX_POWER_REQ = SIR_HAL_GET_TX_POWER_REQ,
+	WMA_SEND_MAX_TX_POWER = SIR_HAL_SEND_MAX_TX_POWER,
 
-#define WMA_SET_MIMOPS_REQ                      SIR_HAL_SET_MIMOPS_REQ
-#define WMA_SET_MIMOPS_RSP                      SIR_HAL_SET_MIMOPS_RSP
-#define WMA_SYS_READY_IND                       SIR_HAL_SYS_READY_IND
-#define WMA_SET_TX_POWER_REQ                    SIR_HAL_SET_TX_POWER_REQ
-#define WMA_SET_TX_POWER_RSP                    SIR_HAL_SET_TX_POWER_RSP
-#define WMA_GET_TX_POWER_REQ                    SIR_HAL_GET_TX_POWER_REQ
-#define WMA_SEND_MAX_TX_POWER                   SIR_HAL_SEND_MAX_TX_POWER
+	WMA_ENABLE_UAPSD_REQ = SIR_HAL_ENABLE_UAPSD_REQ,
+	WMA_DISABLE_UAPSD_REQ = SIR_HAL_DISABLE_UAPSD_REQ,
 
-#define WMA_ENABLE_UAPSD_REQ            SIR_HAL_ENABLE_UAPSD_REQ
-#define WMA_DISABLE_UAPSD_REQ           SIR_HAL_DISABLE_UAPSD_REQ
+	WMA_SET_KEY_DONE = SIR_HAL_SET_KEY_DONE,
 
-#define WMA_SET_KEY_DONE               SIR_HAL_SET_KEY_DONE
 
-/* / PE <-> HAL BTC messages */
-#define WMA_BTC_SET_CFG                SIR_HAL_BTC_SET_CFG
-#define WMA_HANDLE_FW_MBOX_RSP         SIR_HAL_HANDLE_FW_MBOX_RSP
+	/* PE <-> HAL BTC messages */
+	WMA_BTC_SET_CFG = SIR_HAL_BTC_SET_CFG,
+	WMA_HANDLE_FW_MBOX_RSP = SIR_HAL_HANDLE_FW_MBOX_RSP,
 
-#define WMA_SET_MAX_TX_POWER_REQ       SIR_HAL_SET_MAX_TX_POWER_REQ
-#define WMA_SET_MAX_TX_POWER_RSP       SIR_HAL_SET_MAX_TX_POWER_RSP
-#define WMA_SET_DTIM_PERIOD            SIR_HAL_SET_DTIM_PERIOD
+	WMA_SET_MAX_TX_POWER_REQ = SIR_HAL_SET_MAX_TX_POWER_REQ,
+	WMA_SET_MAX_TX_POWER_RSP = SIR_HAL_SET_MAX_TX_POWER_RSP,
+	WMA_SET_DTIM_PERIOD = SIR_HAL_SET_DTIM_PERIOD,
 
-#define WMA_SET_MAX_TX_POWER_PER_BAND_REQ \
-	SIR_HAL_SET_MAX_TX_POWER_PER_BAND_REQ
+	WMA_SET_MAX_TX_POWER_PER_BAND_REQ =
+	SIR_HAL_SET_MAX_TX_POWER_PER_BAND_REQ,
 
-/* / PE <-> HAL Host Offload message */
-#define WMA_SET_HOST_OFFLOAD           SIR_HAL_SET_HOST_OFFLOAD
+	/* PE <-> HAL Host Offload message */
+	WMA_SET_HOST_OFFLOAD = SIR_HAL_SET_HOST_OFFLOAD,
 
-/* / PE <-> HAL Keep Alive message */
-#define WMA_SET_KEEP_ALIVE             SIR_HAL_SET_KEEP_ALIVE
+	/* PE <-> HAL Keep Alive message */
+	WMA_SET_KEEP_ALIVE = SIR_HAL_SET_KEEP_ALIVE,
 
 #ifdef WLAN_NS_OFFLOAD
-#define WMA_SET_NS_OFFLOAD             SIR_HAL_SET_NS_OFFLOAD
+	WMA_SET_NS_OFFLOAD = SIR_HAL_SET_NS_OFFLOAD,
 #endif /* WLAN_NS_OFFLOAD */
 
 #ifdef FEATURE_WLAN_TDLS
-#define WMA_SET_TDLS_LINK_ESTABLISH_REQ SIR_HAL_TDLS_LINK_ESTABLISH_REQ
-#define WMA_SET_TDLS_LINK_ESTABLISH_REQ_RSP SIR_HAL_TDLS_LINK_ESTABLISH_REQ_RSP
+	WMA_SET_TDLS_LINK_ESTABLISH_REQ = SIR_HAL_TDLS_LINK_ESTABLISH_REQ,
+	WMA_SET_TDLS_LINK_ESTABLISH_REQ_RSP =
+				SIR_HAL_TDLS_LINK_ESTABLISH_REQ_RSP,
 #endif
 
-#define WMA_WLAN_SUSPEND_IND           SIR_HAL_WLAN_SUSPEND_IND
-#define WMA_WLAN_RESUME_REQ           SIR_HAL_WLAN_RESUME_REQ
-#define WMA_MSG_TYPES_END    SIR_HAL_MSG_TYPES_END
+	WMA_WLAN_SUSPEND_IND = SIR_HAL_WLAN_SUSPEND_IND,
+	WMA_WLAN_RESUME_REQ = SIR_HAL_WLAN_RESUME_REQ,
+	WMA_MSG_TYPES_END = SIR_HAL_MSG_TYPES_END,
 
-#define WMA_AGGR_QOS_REQ               SIR_HAL_AGGR_QOS_REQ
-#define WMA_AGGR_QOS_RSP               SIR_HAL_AGGR_QOS_RSP
+	WMA_AGGR_QOS_REQ = SIR_HAL_AGGR_QOS_REQ,
+	WMA_AGGR_QOS_RSP = SIR_HAL_AGGR_QOS_RSP,
 
-#define WMA_CSA_OFFLOAD_EVENT  SIR_CSA_OFFLOAD_EVENT
+	WMA_CSA_OFFLOAD_EVENT = SIR_CSA_OFFLOAD_EVENT,
 
 #ifdef FEATURE_WLAN_ESE
-#define WMA_SET_PLM_REQ             SIR_HAL_SET_PLM_REQ
+	WMA_SET_PLM_REQ = SIR_HAL_SET_PLM_REQ,
 #endif
 
 #ifndef ROAM_OFFLOAD_V1
-#define WMA_ROAM_SCAN_OFFLOAD_REQ   SIR_HAL_ROAM_SCAN_OFFLOAD_REQ
+	WMA_ROAM_SCAN_OFFLOAD_REQ = SIR_HAL_ROAM_SCAN_OFFLOAD_REQ,
 #endif
-#define WMA_ROAM_PRE_AUTH_STATUS    SIR_HAL_ROAM_PRE_AUTH_STATUS_IND
+	WMA_ROAM_PRE_AUTH_STATUS = SIR_HAL_ROAM_PRE_AUTH_STATUS_IND,
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-#define WMA_ROAM_OFFLOAD_SYNCH_IND  SIR_HAL_ROAM_OFFLOAD_SYNCH_IND
-#define WMA_ROAM_OFFLOAD_SYNCH_FAIL SIR_HAL_ROAM_OFFLOAD_SYNCH_FAIL
+	WMA_ROAM_OFFLOAD_SYNCH_IND = SIR_HAL_ROAM_OFFLOAD_SYNCH_IND,
+	WMA_ROAM_OFFLOAD_SYNCH_FAIL = SIR_HAL_ROAM_OFFLOAD_SYNCH_FAIL,
 #endif
 
-#define WMA_8023_MULTICAST_LIST_REQ                     SIR_HAL_8023_MULTICAST_LIST_REQ
+	WMA_8023_MULTICAST_LIST_REQ = SIR_HAL_8023_MULTICAST_LIST_REQ,
 
 #ifdef WLAN_FEATURE_PACKET_FILTERING
-#define WMA_RECEIVE_FILTER_SET_FILTER_REQ               SIR_HAL_RECEIVE_FILTER_SET_FILTER_REQ
-#define WMA_PACKET_COALESCING_FILTER_MATCH_COUNT_REQ    SIR_HAL_PACKET_COALESCING_FILTER_MATCH_COUNT_REQ
-#define WMA_PACKET_COALESCING_FILTER_MATCH_COUNT_RSP    SIR_HAL_PACKET_COALESCING_FILTER_MATCH_COUNT_RSP
-#define WMA_RECEIVE_FILTER_CLEAR_FILTER_REQ             SIR_HAL_RECEIVE_FILTER_CLEAR_FILTER_REQ
+	WMA_RECEIVE_FILTER_SET_FILTER_REQ =
+				SIR_HAL_RECEIVE_FILTER_SET_FILTER_REQ,
+	WMA_PACKET_COALESCING_FILTER_MATCH_COUNT_REQ =
+			SIR_HAL_PACKET_COALESCING_FILTER_MATCH_COUNT_REQ,
+	WMA_PACKET_COALESCING_FILTER_MATCH_COUNT_RSP =
+			SIR_HAL_PACKET_COALESCING_FILTER_MATCH_COUNT_RSP,
+	WMA_RECEIVE_FILTER_CLEAR_FILTER_REQ =
+				SIR_HAL_RECEIVE_FILTER_CLEAR_FILTER_REQ,
 #endif /* WLAN_FEATURE_PACKET_FILTERING */
 
-#define WMA_DHCP_START_IND              SIR_HAL_DHCP_START_IND
-#define WMA_DHCP_STOP_IND               SIR_HAL_DHCP_STOP_IND
+	WMA_DHCP_START_IND = SIR_HAL_DHCP_START_IND,
+	WMA_DHCP_STOP_IND = SIR_HAL_DHCP_STOP_IND,
 
 #ifdef WLAN_FEATURE_GTK_OFFLOAD
-#define WMA_GTK_OFFLOAD_REQ             SIR_HAL_GTK_OFFLOAD_REQ
-#define WMA_GTK_OFFLOAD_GETINFO_REQ     SIR_HAL_GTK_OFFLOAD_GETINFO_REQ
-#define WMA_GTK_OFFLOAD_GETINFO_RSP     SIR_HAL_GTK_OFFLOAD_GETINFO_RSP
+	WMA_GTK_OFFLOAD_REQ = SIR_HAL_GTK_OFFLOAD_REQ,
+	WMA_GTK_OFFLOAD_GETINFO_REQ = SIR_HAL_GTK_OFFLOAD_GETINFO_REQ,
+	WMA_GTK_OFFLOAD_GETINFO_RSP = SIR_HAL_GTK_OFFLOAD_GETINFO_RSP,
 #endif /* WLAN_FEATURE_GTK_OFFLOAD */
 
-#define WMA_SET_TM_LEVEL_REQ       SIR_HAL_SET_TM_LEVEL_REQ
+	WMA_SET_TM_LEVEL_REQ = SIR_HAL_SET_TM_LEVEL_REQ,
 
-#define WMA_UPDATE_OP_MODE         SIR_HAL_UPDATE_OP_MODE
-#define WMA_UPDATE_RX_NSS          SIR_HAL_UPDATE_RX_NSS
-#define WMA_UPDATE_MEMBERSHIP      SIR_HAL_UPDATE_MEMBERSHIP
-#define WMA_UPDATE_USERPOS         SIR_HAL_UPDATE_USERPOS
+	WMA_UPDATE_OP_MODE = SIR_HAL_UPDATE_OP_MODE,
+	WMA_UPDATE_RX_NSS = SIR_HAL_UPDATE_RX_NSS,
+	WMA_UPDATE_MEMBERSHIP = SIR_HAL_UPDATE_MEMBERSHIP,
+	WMA_UPDATE_USERPOS = SIR_HAL_UPDATE_USERPOS,
 
 #ifdef WLAN_FEATURE_NAN
-#define WMA_NAN_REQUEST            SIR_HAL_NAN_REQUEST
+	WMA_NAN_REQUEST = SIR_HAL_NAN_REQUEST,
 #endif
 
-#define WMA_START_SCAN_OFFLOAD_REQ  SIR_HAL_START_SCAN_OFFLOAD_REQ
-#define WMA_STOP_SCAN_OFFLOAD_REQ  SIR_HAL_STOP_SCAN_OFFLOAD_REQ
-#define WMA_UPDATE_CHAN_LIST_REQ    SIR_HAL_UPDATE_CHAN_LIST_REQ
-#define WMA_RX_SCAN_EVENT           SIR_HAL_RX_SCAN_EVENT
-#define WMA_RX_CHN_STATUS_EVENT     SIR_HAL_RX_CHN_STATUS_EVENT
+	WMA_START_SCAN_OFFLOAD_REQ = SIR_HAL_START_SCAN_OFFLOAD_REQ,
+	WMA_STOP_SCAN_OFFLOAD_REQ = SIR_HAL_STOP_SCAN_OFFLOAD_REQ,
+	WMA_UPDATE_CHAN_LIST_REQ = SIR_HAL_UPDATE_CHAN_LIST_REQ,
+	WMA_RX_SCAN_EVENT = SIR_HAL_RX_SCAN_EVENT,
+	WMA_RX_CHN_STATUS_EVENT = SIR_HAL_RX_CHN_STATUS_EVENT,
 
-#define WMA_CLI_SET_CMD             SIR_HAL_CLI_SET_CMD
+	WMA_CLI_SET_CMD = SIR_HAL_CLI_SET_CMD,
 
 #ifndef REMOVE_PKT_LOG
-#define WMA_PKTLOG_ENABLE_REQ       SIR_HAL_PKTLOG_ENABLE_REQ
+	WMA_PKTLOG_ENABLE_REQ = SIR_HAL_PKTLOG_ENABLE_REQ,
 #endif
 
 #ifdef FEATURE_WLAN_LPHB
-#define WMA_LPHB_CONF_REQ          SIR_HAL_LPHB_CONF_IND
+	WMA_LPHB_CONF_REQ =  SIR_HAL_LPHB_CONF_IND,
 #endif /* FEATURE_WLAN_LPHB */
 
 #ifdef FEATURE_WLAN_CH_AVOID
-#define WMA_CH_AVOID_UPDATE_REQ    SIR_HAL_CH_AVOID_UPDATE_REQ
+	WMA_CH_AVOID_UPDATE_REQ = SIR_HAL_CH_AVOID_UPDATE_REQ,
 #endif /* FEATURE_WLAN_CH_AVOID */
 
 #ifdef FEATURE_WLAN_AUTO_SHUTDOWN
-#define WMA_SET_AUTO_SHUTDOWN_TIMER_REQ SIR_HAL_SET_AUTO_SHUTDOWN_TIMER_REQ
+	WMA_SET_AUTO_SHUTDOWN_TIMER_REQ = SIR_HAL_SET_AUTO_SHUTDOWN_TIMER_REQ,
 #endif
 
-#define WMA_ADD_PERIODIC_TX_PTRN_IND    SIR_HAL_ADD_PERIODIC_TX_PTRN_IND
-#define WMA_DEL_PERIODIC_TX_PTRN_IND    SIR_HAL_DEL_PERIODIC_TX_PTRN_IND
+	WMA_ADD_PERIODIC_TX_PTRN_IND = SIR_HAL_ADD_PERIODIC_TX_PTRN_IND,
+	WMA_DEL_PERIODIC_TX_PTRN_IND = SIR_HAL_DEL_PERIODIC_TX_PTRN_IND,
 
-#define WMA_TX_POWER_LIMIT          SIR_HAL_SET_TX_POWER_LIMIT
+	WMA_TX_POWER_LIMIT = SIR_HAL_SET_TX_POWER_LIMIT,
 
-#define WMA_RATE_UPDATE_IND         SIR_HAL_RATE_UPDATE_IND
+	WMA_RATE_UPDATE_IND = SIR_HAL_RATE_UPDATE_IND,
 
-#define WMA_SEND_ADDBA_REQ          SIR_HAL_SEND_ADDBA_REQ
-#define WMA_INIT_THERMAL_INFO_CMD   SIR_HAL_INIT_THERMAL_INFO_CMD
-#define WMA_SET_THERMAL_LEVEL       SIR_HAL_SET_THERMAL_LEVEL
+	WMA_SEND_ADDBA_REQ = SIR_HAL_SEND_ADDBA_REQ,
+	WMA_INIT_THERMAL_INFO_CMD = SIR_HAL_INIT_THERMAL_INFO_CMD,
+	WMA_SET_THERMAL_LEVEL = SIR_HAL_SET_THERMAL_LEVEL,
 
-#define WMA_INIT_BAD_PEER_TX_CTL_INFO_CMD   SIR_HAL_BAD_PEER_TX_CTL_INI_CMD
+	WMA_INIT_BAD_PEER_TX_CTL_INFO_CMD = SIR_HAL_BAD_PEER_TX_CTL_INI_CMD,
 
 #ifdef FEATURE_WLAN_TDLS
-#define WMA_UPDATE_TDLS_PEER_STATE        SIR_HAL_UPDATE_TDLS_PEER_STATE
-#define WMA_TDLS_SHOULD_DISCOVER_CMD      SIR_HAL_TDLS_SHOULD_DISCOVER
-#define WMA_TDLS_SHOULD_TEARDOWN_CMD      SIR_HAL_TDLS_SHOULD_TEARDOWN
-#define WMA_TDLS_PEER_DISCONNECTED_CMD    SIR_HAL_TDLS_PEER_DISCONNECTED
+	WMA_UPDATE_TDLS_PEER_STATE = SIR_HAL_UPDATE_TDLS_PEER_STATE,
+	WMA_TDLS_SHOULD_DISCOVER_CMD = SIR_HAL_TDLS_SHOULD_DISCOVER,
+	WMA_TDLS_SHOULD_TEARDOWN_CMD = SIR_HAL_TDLS_SHOULD_TEARDOWN,
+	WMA_TDLS_PEER_DISCONNECTED_CMD = SIR_HAL_TDLS_PEER_DISCONNECTED,
 #endif
-#define WMA_SET_SAP_INTRABSS_DIS          SIR_HAL_SET_SAP_INTRABSS_DIS
+	WMA_SET_SAP_INTRABSS_DIS = SIR_HAL_SET_SAP_INTRABSS_DIS,
 
 /* Message to indicate beacon tx completion after beacon template update
  * beacon offload case
  */
-#define WMA_DFS_BEACON_TX_SUCCESS_IND   SIR_HAL_BEACON_TX_SUCCESS_IND
-#define WMA_DISASSOC_TX_COMP       SIR_HAL_DISASSOC_TX_COMP
-#define WMA_DEAUTH_TX_COMP         SIR_HAL_DEAUTH_TX_COMP
+	WMA_DFS_BEACON_TX_SUCCESS_IND = SIR_HAL_BEACON_TX_SUCCESS_IND,
+	WMA_DISASSOC_TX_COMP = SIR_HAL_DISASSOC_TX_COMP,
+	WMA_DEAUTH_TX_COMP = SIR_HAL_DEAUTH_TX_COMP,
 
-#define WMA_GET_ISOLATION          SIR_HAL_GET_ISOLATION
+	WMA_GET_ISOLATION = SIR_HAL_GET_ISOLATION,
 
-#define WMA_MODEM_POWER_STATE_IND SIR_HAL_MODEM_POWER_STATE_IND
+	WMA_MODEM_POWER_STATE_IND = SIR_HAL_MODEM_POWER_STATE_IND,
 
 #ifdef WLAN_FEATURE_STATS_EXT
-#define WMA_STATS_EXT_REQUEST              SIR_HAL_STATS_EXT_REQUEST
+	WMA_STATS_EXT_REQUEST = SIR_HAL_STATS_EXT_REQUEST,
 #endif
 
-#define WMA_GET_TEMPERATURE_REQ     SIR_HAL_GET_TEMPERATURE_REQ
-#define WMA_SET_WISA_PARAMS         SIR_HAL_SET_WISA_PARAMS
+	WMA_GET_TEMPERATURE_REQ = SIR_HAL_GET_TEMPERATURE_REQ,
+	WMA_SET_WISA_PARAMS = SIR_HAL_SET_WISA_PARAMS,
 
 #ifdef FEATURE_WLAN_EXTSCAN
-#define WMA_EXTSCAN_GET_CAPABILITIES_REQ    SIR_HAL_EXTSCAN_GET_CAPABILITIES_REQ
-#define WMA_EXTSCAN_START_REQ               SIR_HAL_EXTSCAN_START_REQ
-#define WMA_EXTSCAN_STOP_REQ                SIR_HAL_EXTSCAN_STOP_REQ
-#define WMA_EXTSCAN_SET_BSSID_HOTLIST_REQ   SIR_HAL_EXTSCAN_SET_BSS_HOTLIST_REQ
-#define WMA_EXTSCAN_RESET_BSSID_HOTLIST_REQ SIR_HAL_EXTSCAN_RESET_BSS_HOTLIST_REQ
-#define WMA_EXTSCAN_SET_SIGNF_CHANGE_REQ    SIR_HAL_EXTSCAN_SET_SIGNF_CHANGE_REQ
-#define WMA_EXTSCAN_RESET_SIGNF_CHANGE_REQ  SIR_HAL_EXTSCAN_RESET_SIGNF_CHANGE_REQ
-#define WMA_EXTSCAN_GET_CACHED_RESULTS_REQ  SIR_HAL_EXTSCAN_GET_CACHED_RESULTS_REQ
-#define WMA_SET_EPNO_LIST_REQ               SIR_HAL_SET_EPNO_LIST_REQ
-#define WMA_SET_PASSPOINT_LIST_REQ          SIR_HAL_SET_PASSPOINT_LIST_REQ
-#define WMA_RESET_PASSPOINT_LIST_REQ        SIR_HAL_RESET_PASSPOINT_LIST_REQ
-
-#endif /* FEATURE_WLAN_EXTSCAN */
+	WMA_EXTSCAN_GET_CAPABILITIES_REQ = SIR_HAL_EXTSCAN_GET_CAPABILITIES_REQ,
+	WMA_EXTSCAN_START_REQ = SIR_HAL_EXTSCAN_START_REQ,
+	WMA_EXTSCAN_STOP_REQ = SIR_HAL_EXTSCAN_STOP_REQ,
+	WMA_EXTSCAN_SET_BSSID_HOTLIST_REQ =
+				SIR_HAL_EXTSCAN_SET_BSS_HOTLIST_REQ,
+	WMA_EXTSCAN_RESET_BSSID_HOTLIST_REQ =
+				SIR_HAL_EXTSCAN_RESET_BSS_HOTLIST_REQ,
+	WMA_EXTSCAN_SET_SIGNF_CHANGE_REQ = SIR_HAL_EXTSCAN_SET_SIGNF_CHANGE_REQ,
+	WMA_EXTSCAN_RESET_SIGNF_CHANGE_REQ =
+				SIR_HAL_EXTSCAN_RESET_SIGNF_CHANGE_REQ,
+	WMA_EXTSCAN_GET_CACHED_RESULTS_REQ =
+				SIR_HAL_EXTSCAN_GET_CACHED_RESULTS_REQ,
+	WMA_SET_EPNO_LIST_REQ = SIR_HAL_SET_EPNO_LIST_REQ,
+	WMA_SET_PASSPOINT_LIST_REQ = SIR_HAL_SET_PASSPOINT_LIST_REQ,
+	WMA_RESET_PASSPOINT_LIST_REQ = SIR_HAL_RESET_PASSPOINT_LIST_REQ,
+#endif  /* FEATURE_WLAN_EXTSCAN */
 
 #ifdef WLAN_FEATURE_LINK_LAYER_STATS
-#define WMA_LINK_LAYER_STATS_CLEAR_REQ        SIR_HAL_LL_STATS_CLEAR_REQ
-#define WMA_LINK_LAYER_STATS_SET_REQ          SIR_HAL_LL_STATS_SET_REQ
-#define WMA_LINK_LAYER_STATS_GET_REQ          SIR_HAL_LL_STATS_GET_REQ
-#define WMA_LINK_LAYER_STATS_RESULTS_RSP      SIR_HAL_LL_STATS_RESULTS_RSP
-#define WDA_LINK_LAYER_STATS_SET_THRESHOLD    SIR_HAL_LL_STATS_EXT_SET_THRESHOLD
-#endif /* WLAN_FEATURE_LINK_LAYER_STATS */
+	WMA_LINK_LAYER_STATS_CLEAR_REQ = SIR_HAL_LL_STATS_CLEAR_REQ,
+	WMA_LINK_LAYER_STATS_SET_REQ = SIR_HAL_LL_STATS_SET_REQ,
+	WMA_LINK_LAYER_STATS_GET_REQ = SIR_HAL_LL_STATS_GET_REQ,
+	WMA_LINK_LAYER_STATS_RESULTS_RSP = SIR_HAL_LL_STATS_RESULTS_RSP,
+	WDA_LINK_LAYER_STATS_SET_THRESHOLD = SIR_HAL_LL_STATS_EXT_SET_THRESHOLD,
+#endif  /* WLAN_FEATURE_LINK_LAYER_STATS */
 
-#define WMA_LINK_STATUS_GET_REQ SIR_HAL_LINK_STATUS_GET_REQ
+	WMA_LINK_STATUS_GET_REQ = SIR_HAL_LINK_STATUS_GET_REQ,
 
 #ifdef WLAN_FEATURE_EXTWOW_SUPPORT
-#define WMA_WLAN_EXT_WOW                      SIR_HAL_CONFIG_EXT_WOW
-#define WMA_WLAN_SET_APP_TYPE1_PARAMS         SIR_HAL_CONFIG_APP_TYPE1_PARAMS
-#define WMA_WLAN_SET_APP_TYPE2_PARAMS         SIR_HAL_CONFIG_APP_TYPE2_PARAMS
+	WMA_WLAN_EXT_WOW = SIR_HAL_CONFIG_EXT_WOW,
+	WMA_WLAN_SET_APP_TYPE1_PARAMS = SIR_HAL_CONFIG_APP_TYPE1_PARAMS,
+	WMA_WLAN_SET_APP_TYPE2_PARAMS = SIR_HAL_CONFIG_APP_TYPE2_PARAMS,
 #endif
 
-#define WMA_SET_SCAN_MAC_OUI_REQ              SIR_HAL_SET_SCAN_MAC_OUI_REQ
-#define WMA_TSF_GPIO_PIN                      SIR_HAL_TSF_GPIO_PIN_REQ
+	WMA_SET_SCAN_MAC_OUI_REQ = SIR_HAL_SET_SCAN_MAC_OUI_REQ,
+	WMA_TSF_GPIO_PIN = SIR_HAL_TSF_GPIO_PIN_REQ,
 
 #ifdef DHCP_SERVER_OFFLOAD
-#define WMA_SET_DHCP_SERVER_OFFLOAD_CMD       SIR_HAL_SET_DHCP_SERVER_OFFLOAD
-#endif /* DHCP_SERVER_OFFLOAD */
+	WMA_SET_DHCP_SERVER_OFFLOAD_CMD = SIR_HAL_SET_DHCP_SERVER_OFFLOAD,
+#endif  /* DHCP_SERVER_OFFLOAD */
 
 #ifdef WLAN_FEATURE_GPIO_LED_FLASHING
-#define WMA_LED_FLASHING_REQ   SIR_HAL_LED_FLASHING_REQ
+	WMA_LED_FLASHING_REQ = SIR_HAL_LED_FLASHING_REQ,
 #endif
 
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
-#define WMA_UPDATE_Q2Q_IE_IND                 SIR_HAL_UPDATE_Q2Q_IE_IND
-#endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
-#define WMA_SET_RSSI_MONITOR_REQ              SIR_HAL_SET_RSSI_MONITOR_REQ
-
-#define WMA_OCB_SET_CONFIG_CMD               SIR_HAL_OCB_SET_CONFIG_CMD
-#define WMA_OCB_SET_UTC_TIME_CMD             SIR_HAL_OCB_SET_UTC_TIME_CMD
-#define WMA_OCB_START_TIMING_ADVERT_CMD      SIR_HAL_OCB_START_TIMING_ADVERT_CMD
-#define WMA_OCB_STOP_TIMING_ADVERT_CMD       SIR_HAL_OCB_STOP_TIMING_ADVERT_CMD
-#define WMA_OCB_GET_TSF_TIMER_CMD            SIR_HAL_OCB_GET_TSF_TIMER_CMD
-#define WMA_DCC_GET_STATS_CMD                SIR_HAL_DCC_GET_STATS_CMD
-#define WMA_DCC_CLEAR_STATS_CMD              SIR_HAL_DCC_CLEAR_STATS_CMD
-#define WMA_DCC_UPDATE_NDL_CMD               SIR_HAL_DCC_UPDATE_NDL_CMD
-#define WMA_SET_IE_INFO                      SIR_HAL_SET_IE_INFO
-
-#define WMA_LRO_CONFIG_CMD                   SIR_HAL_LRO_CONFIG_CMD
-#define WMA_GW_PARAM_UPDATE_REQ              SIR_HAL_GATEWAY_PARAM_UPDATE_REQ
-#define WMA_ADD_BCN_FILTER_CMDID             SIR_HAL_ADD_BCN_FILTER_CMDID
-#define WMA_REMOVE_BCN_FILTER_CMDID          SIR_HAL_REMOVE_BCN_FILTER_CMDID
-#define WMA_SET_ADAPT_DWELLTIME_CONF_PARAMS  SIR_HAL_SET_ADAPT_DWELLTIME_PARAMS
-
-#define WDA_APF_GET_CAPABILITIES_REQ         SIR_HAL_APF_GET_CAPABILITIES_REQ
-#define WMA_ROAM_SYNC_TIMEOUT                SIR_HAL_WMA_ROAM_SYNC_TIMEOUT
-
-#define WMA_SET_PDEV_IE_REQ                  SIR_HAL_SET_PDEV_IE_REQ
-#define WMA_SEND_FREQ_RANGE_CONTROL_IND      SIR_HAL_SEND_FREQ_RANGE_CONTROL_IND
-#define WMA_POWER_DEBUG_STATS_REQ            SIR_HAL_POWER_DEBUG_STATS_REQ
-#define WMA_BEACON_DEBUG_STATS_REQ           SIR_HAL_BEACON_DEBUG_STATS_REQ
-#define WMA_GET_RCPI_REQ                     SIR_HAL_GET_RCPI_REQ
-#define WMA_ROAM_BLACKLIST_MSG               SIR_HAL_ROAM_BLACKLIST_MSG
-
-#define WMA_SET_DBS_SCAN_SEL_CONF_PARAMS     SIR_HAL_SET_DBS_SCAN_SEL_PARAMS
-
-#define WMA_SET_WOW_PULSE_CMD                SIR_HAL_SET_WOW_PULSE_CMD
+	WMA_UPDATE_Q2Q_IE_IND = SIR_HAL_UPDATE_Q2Q_IE_IND,
+#endif  /* FEATURE_AP_MCC_CH_AVOIDANCE */
+	WMA_SET_RSSI_MONITOR_REQ = SIR_HAL_SET_RSSI_MONITOR_REQ,
+
+	WMA_OCB_SET_CONFIG_CMD = SIR_HAL_OCB_SET_CONFIG_CMD,
+	WMA_OCB_SET_UTC_TIME_CMD = SIR_HAL_OCB_SET_UTC_TIME_CMD,
+	WMA_OCB_START_TIMING_ADVERT_CMD = SIR_HAL_OCB_START_TIMING_ADVERT_CMD,
+	WMA_OCB_STOP_TIMING_ADVERT_CMD = SIR_HAL_OCB_STOP_TIMING_ADVERT_CMD,
+	WMA_OCB_GET_TSF_TIMER_CMD = SIR_HAL_OCB_GET_TSF_TIMER_CMD,
+	WMA_DCC_GET_STATS_CMD = SIR_HAL_DCC_GET_STATS_CMD,
+	WMA_DCC_CLEAR_STATS_CMD = SIR_HAL_DCC_CLEAR_STATS_CMD,
+	WMA_DCC_UPDATE_NDL_CMD = SIR_HAL_DCC_UPDATE_NDL_CMD,
+	WMA_SET_IE_INFO = SIR_HAL_SET_IE_INFO,
+
+	WMA_LRO_CONFIG_CMD = SIR_HAL_LRO_CONFIG_CMD,
+	WMA_GW_PARAM_UPDATE_REQ = SIR_HAL_GATEWAY_PARAM_UPDATE_REQ,
+	WMA_ADD_BCN_FILTER_CMDID = SIR_HAL_ADD_BCN_FILTER_CMDID,
+	WMA_REMOVE_BCN_FILTER_CMDID = SIR_HAL_REMOVE_BCN_FILTER_CMDID,
+	WMA_SET_ADAPT_DWELLTIME_CONF_PARAMS =
+					SIR_HAL_SET_ADAPT_DWELLTIME_PARAMS,
+
+	WDA_APF_GET_CAPABILITIES_REQ = SIR_HAL_APF_GET_CAPABILITIES_REQ,
+	WMA_ROAM_SYNC_TIMEOUT = SIR_HAL_WMA_ROAM_SYNC_TIMEOUT,
+
+	WMA_SET_PDEV_IE_REQ = SIR_HAL_SET_PDEV_IE_REQ,
+	WMA_SEND_FREQ_RANGE_CONTROL_IND = SIR_HAL_SEND_FREQ_RANGE_CONTROL_IND,
+	WMA_POWER_DEBUG_STATS_REQ = SIR_HAL_POWER_DEBUG_STATS_REQ,
+	WMA_BEACON_DEBUG_STATS_REQ = SIR_HAL_BEACON_DEBUG_STATS_REQ,
+	WMA_GET_RCPI_REQ = SIR_HAL_GET_RCPI_REQ,
+	WMA_ROAM_BLACKLIST_MSG = SIR_HAL_ROAM_BLACKLIST_MSG,
+	WMA_SET_DBS_SCAN_SEL_CONF_PARAMS = SIR_HAL_SET_DBS_SCAN_SEL_PARAMS,
+
+	WMA_SET_WOW_PULSE_CMD = SIR_HAL_SET_WOW_PULSE_CMD,
 
 #ifndef ROAM_OFFLOAD_V1
-#define WMA_SET_PER_ROAM_CONFIG_CMD          SIR_HAL_SET_PER_ROAM_CONFIG_CMD
+	WMA_SET_PER_ROAM_CONFIG_CMD = SIR_HAL_SET_PER_ROAM_CONFIG_CMD,
 #endif
 
-#define WMA_SEND_AP_VDEV_UP                  SIR_HAL_SEND_AP_VDEV_UP
+	WMA_SEND_AP_VDEV_UP = SIR_HAL_SEND_AP_VDEV_UP,
 
-#define WMA_SET_ARP_STATS_REQ                SIR_HAL_SET_ARP_STATS_REQ
-#define WMA_GET_ARP_STATS_REQ                SIR_HAL_GET_ARP_STATS_REQ
-#define WMA_SET_LIMIT_OFF_CHAN               SIR_HAL_SET_LIMIT_OFF_CHAN
-#define WMA_OBSS_DETECTION_REQ               SIR_HAL_OBSS_DETECTION_REQ
-#define WMA_OBSS_DETECTION_INFO              SIR_HAL_OBSS_DETECTION_INFO
-#define WMA_INVOKE_NEIGHBOR_REPORT           SIR_HAL_INVOKE_NEIGHBOR_REPORT
-#define WMA_OBSS_COLOR_COLLISION_REQ         SIR_HAL_OBSS_COLOR_COLLISION_REQ
-#define WMA_OBSS_COLOR_COLLISION_INFO        SIR_HAL_OBSS_COLOR_COLLISION_INFO
-
-#define WMA_CFG_VENDOR_ACTION_TB_PPDU        SIR_HAL_CFG_VENDOR_ACTION_TB_PPDU
-#define WMA_GET_ROAM_SCAN_STATS              SIR_HAL_GET_ROAM_SCAN_STATS
+	WMA_SET_ARP_STATS_REQ = SIR_HAL_SET_ARP_STATS_REQ,
+	WMA_GET_ARP_STATS_REQ = SIR_HAL_GET_ARP_STATS_REQ,
+	WMA_SET_LIMIT_OFF_CHAN = SIR_HAL_SET_LIMIT_OFF_CHAN,
+	WMA_OBSS_DETECTION_REQ = SIR_HAL_OBSS_DETECTION_REQ,
+	WMA_OBSS_DETECTION_INFO = SIR_HAL_OBSS_DETECTION_INFO,
+	WMA_INVOKE_NEIGHBOR_REPORT = SIR_HAL_INVOKE_NEIGHBOR_REPORT,
+	WMA_OBSS_COLOR_COLLISION_REQ = SIR_HAL_OBSS_COLOR_COLLISION_REQ,
+	WMA_OBSS_COLOR_COLLISION_INFO = SIR_HAL_OBSS_COLOR_COLLISION_INFO,
+	WMA_CFG_VENDOR_ACTION_TB_PPDU = SIR_HAL_CFG_VENDOR_ACTION_TB_PPDU,
+	WMA_GET_ROAM_SCAN_STATS = SIR_HAL_GET_ROAM_SCAN_STATS,
 
 #ifdef WLAN_FEATURE_MOTION_DETECTION
-#define WMA_SET_MOTION_DET_CONFIG            SIR_HAL_SET_MOTION_DET_CONFIG
-#define WMA_SET_MOTION_DET_ENABLE            SIR_HAL_SET_MOTION_DET_ENABLE
-#define WMA_SET_MOTION_DET_BASE_LINE_CONFIG \
-					SIR_HAL_SET_MOTION_DET_BASE_LINE_CONFIG
-#define WMA_SET_MOTION_DET_BASE_LINE_ENABLE \
-					SIR_HAL_SET_MOTION_DET_BASE_LINE_ENABLE
-#endif /* WLAN_FEATURE_MOTION_DETECTION */
+	WMA_SET_MOTION_DET_CONFIG = SIR_HAL_SET_MOTION_DET_CONFIG,
+	WMA_SET_MOTION_DET_ENABLE = SIR_HAL_SET_MOTION_DET_ENABLE,
+	WMA_SET_MOTION_DET_BASE_LINE_CONFIG =
+				SIR_HAL_SET_MOTION_DET_BASE_LINE_CONFIG,
+	WMA_SET_MOTION_DET_BASE_LINE_ENABLE =
+				SIR_HAL_SET_MOTION_DET_BASE_LINE_ENABLE,
+#endif  /* WLAN_FEATURE_MOTION_DETECTION */
 
 #ifdef FW_THERMAL_THROTTLE_SUPPORT
-#define WMA_SET_THERMAL_THROTTLE_CFG         SIR_HAL_SET_THERMAL_THROTTLE_CFG
-#define WMA_SET_THERMAL_MGMT                 SIR_HAL_SET_THERMAL_MGMT
-#endif /* FW_THERMAL_THROTTLE_SUPPORT */
+	WMA_SET_THERMAL_THROTTLE_CFG = SIR_HAL_SET_THERMAL_THROTTLE_CFG,
+	WMA_SET_THERMAL_MGMT = SIR_HAL_SET_THERMAL_MGMT,
+#endif  /*FW_THERMAL_THROTTLE_SUPPORT */
 
 #ifdef WLAN_MWS_INFO_DEBUGFS
-#define WMA_GET_MWS_COEX_INFO_REQ	     SIR_HAL_GET_MWS_COEX_INFO_REQ
+	WMA_GET_MWS_COEX_INFO_REQ = SIR_HAL_GET_MWS_COEX_INFO_REQ,
 #endif
 
 #ifndef ROAM_OFFLOAD_V1
-#define WMA_SET_ROAM_TRIGGERS                SIR_HAL_SET_ROAM_TRIGGERS
-#define WMA_ROAM_INIT_PARAM                  SIR_HAL_INIT_ROAM_OFFLOAD_PARAM
-#define WMA_ROAM_DISABLE_CFG                 SIR_HAL_INIT_ROAM_DISABLE_CFG
+	WMA_SET_ROAM_TRIGGERS = SIR_HAL_SET_ROAM_TRIGGERS,
+	WMA_ROAM_INIT_PARAM = SIR_HAL_INIT_ROAM_OFFLOAD_PARAM,
+	WMA_ROAM_DISABLE_CFG = SIR_HAL_INIT_ROAM_DISABLE_CFG,
+
 #endif
+};
 
 #define WMA_DATA_STALL_TRIGGER 6