From da16b46e151e2ee201f262c7c60394c8c739301b Mon Sep 17 00:00:00 2001 From: spuligil Date: Tue, 16 Oct 2018 03:21:24 -0700 Subject: [PATCH] fw-api: CL 5554801 - update fw common interface files more unconditional defs of wlan_defs.h structs with AR900B conditions Change-Id: I6ce77f917dc62dbdfc9f2096181dd496c4478688 CRs-Fixed: 2262693 --- fw/wlan_defs.h | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/fw/wlan_defs.h b/fw/wlan_defs.h index ba8cbfa381..f1841e6416 100755 --- a/fw/wlan_defs.h +++ b/fw/wlan_defs.h @@ -1043,25 +1043,56 @@ typedef struct wlan_dbg_stats_wifi2 { wlan_dgb_sifs_resp_stats_t sifs_resp_info; } wlan_dbg_wifi2_stats_t; +/* + * wlan_dbg_rx_rate_info_v1a, _v1b: + * differing versions of the wlan_dbg_rx_rate_info struct used by different + * targets + */ typedef struct { - wlan_dbg_rx_rate_info_t rx_phy_info; + wlan_dbg_rx_rate_info_v1a_t rx_phy_info; wlan_dbg_tx_rate_info_t tx_rate_info; -} wlan_dbg_rate_info_t; +} wlan_dbg_rate_info_v1a_t; + +typedef struct { + wlan_dbg_rx_rate_info_v1b_t rx_phy_info; + wlan_dbg_tx_rate_info_t tx_rate_info; +} wlan_dbg_rate_info_v1b_t; + +#if defined(AR900B) +#define wlan_dbg_rate_info_t wlan_dbg_rate_info_v1b_t +#else +#define wlan_dbg_rate_info_t wlan_dbg_rate_info_v1a_t +#endif typedef struct { wlan_dbg_rx_rate_info_v2_t rx_phy_info; wlan_dbg_tx_rate_info_v2_t tx_rate_info; } wlan_dbg_rate_info_v2_t; -struct wlan_dbg_stats { - struct wlan_dbg_tx_stats tx; - struct wlan_dbg_rx_stats rx; -#if defined(AR900B) - struct wlan_dbg_mem_stats mem; -#endif +/* + * wlan_dbg_stats_v1, _v2: + * differing versions of the wlan_dbg_stats struct used by different + * targets + */ +struct wlan_dbg_stats_v1 { + struct wlan_dbg_tx_stats_v1 tx; + struct wlan_dbg_rx_stats_v1 rx; struct wlan_dbg_peer_stats peer; }; +struct wlan_dbg_stats_v2 { + struct wlan_dbg_tx_stats_v2 tx; + struct wlan_dbg_rx_stats_v2 rx; + struct wlan_dbg_mem_stats mem; + struct wlan_dbg_peer_stats peer; +}; + +#if defined(AR900B) +#define wlan_dbg_stats wlan_dbg_stats_v2 +#else +#define wlan_dbg_stats wlan_dbg_stats_v1 +#endif + #define DBG_STATS_MAX_HWQ_NUM 10 #define DBG_STATS_MAX_TID_NUM 20 #define DBG_STATS_MAX_CONG_NUM 16