From aaf559b0e9cfd05cc6070f4bdbb095b378234374 Mon Sep 17 00:00:00 2001 From: spuligil Date: Wed, 2 Dec 2020 05:20:44 -0800 Subject: [PATCH] fw-api: CL 12246862 - update fw common interface files Change-Id: Ic584fd8c79e3d779ba01013f63397c96a3dba5b4 WMI: change names of TWT responder/requester flag macros CRs-Fixed: 2262693 --- fw/wmi_unified.h | 31 +++++++++++++++++-------------- fw/wmi_version.h | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 5419da70e2d5..146f38999ada 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -28150,11 +28150,11 @@ typedef struct { * Which means when we receive WMI_TWT_ENABLE_CMDID command from host, * without BIT3 set we will enable both REQUESTER/RESPONDER. * - * Same interepretation is used in WMI_TWT_DISABLE_CMDID, if BIT3 is not set + * Same interpretation is used in WMI_TWT_DISABLE_CMDID, if BIT3 is not set * we will disable both REQUESTER and RESPONDER. */ -#define TWT_EN_DIS_FLAGS_GET_REQ_RES_BCAST_CONFIG(flag) WMI_GET_BITS(flag, 3, 1) -#define TWT_EN_DIS_FLAGS_SET_REQ_RES_BCAST_CONFIG(flag, val) WMI_SET_BITS(flag, 3, 1, val) +#define TWT_EN_DIS_FLAGS_GET_SPLIT_CONFIG(flag) WMI_GET_BITS(flag, 3, 1) +#define TWT_EN_DIS_FLAGS_SET_SPLIT_CONFIG(flag, val) WMI_SET_BITS(flag, 3, 1, val) /* * The flags are used both in WMI_TWT_ENABLE_CMDID and WMI_TWT_DISABLE_CMDID. @@ -28167,18 +28167,21 @@ typedef struct { * If host is enabling or disabling both REQUESTER and RESPONDER host will * send two WMI commands, one for REQUESTER and one for RESPONDER. * - * |-----------------------------------------------------| - * |BIT4=0, BIT5=0 | Enable/Disable TWT requester | - * |-----------------------------------------------------| - * |BIT4=0, BIT5=1 | Enable/Disable BCAST TWT requester | - * |-----------------------------------------------------| - * |BIT4=1, BIT5=0 | Enable/Disable TWT responder | - * |-----------------------------------------------------| - * |BIT4=1, BIT5=1 | Enable/Disable BCAST TWT responder | - * |-----------------------------------------------------| + * |----------------------------------------------------------| + * |BIT4=0, BIT5=0 | Enable/Disable Individual TWT requester | + * |----------------------------------------------------------| + * |BIT4=0, BIT5=1 | Enable/Disable BCAST TWT requester | + * |----------------------------------------------------------| + * |BIT4=1, BIT5=0 | Enable/Disable Individual TWT responder | + * |----------------------------------------------------------| + * |BIT4=1, BIT5=1 | Enable/Disable BCAST TWT responder | + * |----------------------------------------------------------| */ -#define TWT_FLAGS_GET_MODE(flag) WMI_GET_BITS(flag, 4, 2) -#define TWT_FLAGS_SET_MODE(flag, val) WMI_SET_BITS(flag, 4, 2, val) +#define TWT_EN_DIS_FLAGS_GET_REQ_RESP(flag) WMI_GET_BITS(flag, 4, 1) +#define TWT_EN_DIS_FLAGS_SET_REQ_RESP(flag, val) WMI_SET_BITS(flag, 4, 1, val) + +#define TWT_EN_DIS_FLAGS_GET_I_B_TWT(flag) WMI_GET_BITS(flag, 5, 1) +#define TWT_EN_DIS_FLAGS_SET_I_B_TWT(flag, val) WMI_SET_BITS(flag, 5, 1, val) typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_twt_enable_cmd_fixed_param */ diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 33e7d9704155..abe128dfce66 100644 --- 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_ 923 +#define __WMI_REVISION_ 924 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work