From ee6cfa7061ee4e23ae44ed2ff01eccd931d29491 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Fri, 25 Mar 2016 14:05:03 -0700 Subject: [PATCH] qcacld-3.0: CL 1475852 - update fw common interface files qcacld-2.0 to qcacld-3.0 propagation New module ID for NAN 2.0 and fwcommon change to add the support for TX Time per TPC. Change-Id: Iabf3286d771d605632cb9a3711baf5eb3e84889a CRs-Fixed: 865207 --- target/inc/wlan_module_ids.h | 9 +++++---- target/inc/wmi_unified.h | 8 ++++++++ target/inc/wmi_version.h | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/target/inc/wlan_module_ids.h b/target/inc/wlan_module_ids.h index c650ef5a524c..4439d6613f7f 100644 --- a/target/inc/wlan_module_ids.h +++ b/target/inc/wlan_module_ids.h @@ -89,12 +89,13 @@ typedef enum { WLAN_MODULE_OCB, WLAN_MODULE_RSSI_MONITOR, WLAN_MODULE_WPM, - WLAN_MODULE_CSS, /* 0x3a */ - WLAN_MODULE_PPS, /* 0x3b */ - WLAN_MODULE_SCAN_CH_PREDICT, /* 0x3c */ + WLAN_MODULE_CSS, + WLAN_MODULE_PPS, + WLAN_MODULE_SCAN_CH_PREDICT, WLAN_MODULE_MAWC, - WLAN_MODULE_CMC_QMIC, /* 0x3e */ + WLAN_MODULE_CMC_QMIC, WLAN_MODULE_EGAP, /* 0x3f */ + WLAN_MODULE_NAN20, WLAN_MODULE_ID_MAX, WLAN_MODULE_ID_INVALID = WLAN_MODULE_ID_MAX, diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index b6006cddc7f0..39582baeca78 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -4312,6 +4312,12 @@ typedef struct { A_UINT32 cca_busy_time; } wmi_channel_stats; +/* + * Each step represents 0.5 dB. The starting value is 0 dBm. + * Thus the TPC levels cover 0 dBm to 31.5 dBm inclusive in 0.5 dB steps. + */ +#define MAX_TPC_LEVELS 64 + /* radio statistics */ typedef struct { A_UINT32 tlv_header; @@ -4338,6 +4344,8 @@ typedef struct { A_UINT32 on_time_hs20; /** number of channels */ A_UINT32 num_channels; + /** tx time (in milliseconds) per TPC level (0.5 dBm) */ + A_UINT32 tx_time_per_tpc[MAX_TPC_LEVELS]; } wmi_radio_link_stats; /** Radio statistics (once started) do not stop or get reset unless wifi_clear_link_stats is invoked */ diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 78699d9a623a..6c9d7e0c536b 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/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_ 221 +#define __WMI_REVISION_ 222 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work