summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspuligil <spuligil@codeaurora.org>2018-04-14 09:00:38 -0700
committerspuligil <spuligil@codeaurora.org>2018-04-14 09:00:38 -0700
commita718752c4cf7c1f24e0106cade04b3d1fd2fea53 (patch)
tree8056648eff5f4e101327260a78496cc472814f89
parent05fa0d1a7a81a50fe97b64c93fb08a5199f97153 (diff)
fw-api: CL 4453969 - update fw common interface files
Rename WMI_HEOPS_TWT_GET/SET macros to WMI_HEOPS_TWT_REQUIRED_GET/SET Change-Id: I1cf4c2da262459676daf0615467bf18e4c3bd44e CRs-Fixed: 1107600
-rwxr-xr-xfw/wmi_unified.h15
-rwxr-xr-xfw/wmi_version.h2
2 files changed, 12 insertions, 5 deletions
diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h
index 3e7f6a0d4fd8..eca4c980aa8e 100755
--- a/fw/wmi_unified.h
+++ b/fw/wmi_unified.h
@@ -7064,8 +7064,14 @@ typedef struct {
#define WMI_HEOPS_DEFPE_SET(he_ops, value) WMI_SET_BITS(he_ops, 6, 3, value)
/* TWT required */
-#define WMI_HEOPS_TWT_GET(he_ops) WMI_GET_BITS(he_ops, 9, 1)
-#define WMI_HEOPS_TWT_SET(he_ops, value) WMI_SET_BITS(he_ops, 9, 1, value)
+#define WMI_HEOPS_TWT_REQUIRED_GET(he_ops) WMI_GET_BITS(he_ops, 9, 1)
+#define WMI_HEOPS_TWT_REQUIRED_SET(he_ops, value) WMI_SET_BITS(he_ops, 9, 1, value)
+/* DEPRECATED, use WMI_HEOPS_TWT_REQUIRED_GET instead */
+#define WMI_HEOPS_TWT_GET(he_ops) \
+ WMI_HEOPS_TWT_REQUIRED_GET(he_ops)
+/* DEPRECATED, use WMI_HEOPS_TWT_REQUIRED_SET instead */
+#define WMI_HEOPS_TWT_SET(he_ops, value) \
+ WMI_HEOPS_TWT_REQUIRED_SET(he_ops, value)
/* RTS threshold in units of 32 us,0 - always use RTS 1023 - this is disabled */
#define WMI_HEOPS_RTSTHLD_GET(he_ops) WMI_GET_BITS(he_ops, 10, 10)
@@ -22289,8 +22295,8 @@ typedef struct {
/* 1. wake_intvl_mantis must be <= 0xFFFF
* 2. wake_intvl_us must be divided evenly by wake_intvl_mantis,
* i.e., wake_intvl_us % wake_intvl_mantis == 0
- * 2. the quotient of wake_intvl_us/wake_intvl_mantis must be 2 to N-th(0<=N<=31) power,
- i.e., wake_intvl_us/wake_intvl_mantis == 2^N, 0<=N<=31
+ * 3. the quotient of wake_intvl_us/wake_intvl_mantis must be 2 to N-th(0<=N<=31) power,
+ * i.e., wake_intvl_us/wake_intvl_mantis == 2^N, 0<=N<=31
*/
A_UINT32 wake_intvl_us; /* TWT Wake Interval in units of us */
A_UINT32 wake_intvl_mantis; /* TWT Wake Interval Mantissa */
@@ -22376,6 +22382,7 @@ typedef struct {
A_UINT32 vdev_id; /* VDEV identifier */
A_UINT32 dialog_id; /* TWT dialog ID */
A_UINT32 sp_offset_us; /* this long time after TWT resumed the 1st SP will start */
+ A_UINT32 next_twt_size; /* Next TWT subfield Size, refer to IEEE 802.11ax sectin "9.4.1.60 TWT Information field" */
} wmi_twt_resume_dialog_cmd_fixed_param;
/* status code of resuming TWT dialog */
diff --git a/fw/wmi_version.h b/fw/wmi_version.h
index 5ec0f821855a..408502b526b0 100755
--- a/fw/wmi_version.h
+++ b/fw/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_ 528
+#define __WMI_REVISION_ 529
/** The Version Namespace should not be normally changed. Only
* host and firmware of the same WMI namespace will work