From 23ba1eccf41bdac75c388d0bfca3780a6c650012 Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Tue, 21 Mar 2017 11:01:16 -0700 Subject: [PATCH] fw-api: CL 2941841 - update fw common interface files WMI NAN Support for Ext SSI, PASSPHRASE and Service Name Change-Id: I5c87758d6ca491af9aa7fcbc2fc190ea8fd79cd4 CRs-Fixed: 1107600 --- fw/wmi_tlv_defs.h | 14 ++++++++++++-- fw/wmi_unified.h | 20 ++++++++++++++++---- fw/wmi_version.h | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index c5b050eea78c..de73b88d838b 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -2660,13 +2660,18 @@ WMITLV_CREATE_PARAM_STRUC(WMI_NDI_GET_CAP_REQ_CMDID); * wmi_channel channel; * A_UINT8 ndp_cfg[]; * A_UINT8 ndp_app_info[]; + * A_UINT8 ndp_pmk[]; + * A_INT8 ndp_passphrase[]; + * A_INT8 nan_servicename[]; */ #define WMITLV_TABLE_WMI_NDP_INITIATOR_REQ_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ndp_initiator_req_fixed_param, wmi_ndp_initiator_req_fixed_param_PROTOTYPE, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_channel, wmi_channel, channel, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_pmk, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_pmk, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_INT8, ndp_passphrase, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_INT8, nan_servicename, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_NDP_INITIATOR_REQ_CMDID); /** NAN Data Responder Request Cmd @@ -2674,12 +2679,17 @@ WMITLV_CREATE_PARAM_STRUC(WMI_NDP_INITIATOR_REQ_CMDID); * structure. The TLV's are: * A_UINT8 ndp_cfg[]; * A_UINT8 ndp_app_info[]; + * A_UINT8 ndp_pmk[]; + * A_INT8 ndp_passphrase[]; + * A_INT8 nan_servicename[]; */ #define WMITLV_TABLE_WMI_NDP_RESPONDER_REQ_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ndp_responder_req_fixed_param, wmi_ndp_responder_req_fixed_param_PROTOTYPE, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_pmk, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_pmk, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_INT8, ndp_passphrase, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_INT8, nan_servicename, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_NDP_RESPONDER_REQ_CMDID); /** NAN Data End Request Cmd diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index eb939fea8c97..21722ed86a15 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -13227,15 +13227,21 @@ typedef struct { A_UINT32 ndp_channel_cfg; /** NAN Cipher Suite Shared Key */ A_UINT32 nan_csid; - /** Actual number of bytes in TLV nan_pmk */ + /** Actual number of bytes in TLV ndp_pmk */ A_UINT32 nan_pmk_len; + /** Actual number of bytes in TLV ndp_passphrase */ + A_UINT32 nan_passphrase_len; + /** Actual number of bytes in TLV nan_servicename */ + A_UINT32 nan_servicename_len; /** * TLV (tag length value) parameters follow the ndp_initiator_req * structure. The TLV's are: * wmi_channel channel; * A_UINT8 ndp_cfg[]; * A_UINT8 ndp_app_info[]; - * A_UINT8 nan_pmk[]; + * A_UINT8 ndp_pmk[]; + * A_INT8 ndp_passphrase[]; + * A_INT8 nan_servicename[]; */ } wmi_ndp_initiator_req_fixed_param_PROTOTYPE; @@ -13265,14 +13271,20 @@ typedef struct { A_UINT32 ndp_app_info_len; /** NAN Cipher Suite Shared Key */ A_UINT32 nan_csid; - /** Actual number of bytes in TLV nan_pmk */ + /** Actual number of bytes in TLV ndp_pmk */ A_UINT32 nan_pmk_len; + /** Actual number of bytes in TLV ndp_passphrase */ + A_UINT32 nan_passphrase_len; + /** Actual number of bytes in TLV nan_servicename */ + A_UINT32 nan_servicename_len; /** * TLV (tag length value) parameters follow the ndp_responder_req * structure. The TLV's are: * A_UINT8 ndp_cfg[]; * A_UINT8 ndp_app_info[]; - * A_UINT8 nan_pmk[]; + * A_UINT8 ndp_pmk[]; + * A_INT8 ndp_passphrase[]; + * A_INT8 nan_servicename[]; */ } wmi_ndp_responder_req_fixed_param_PROTOTYPE; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 1f81abcc9857..a74350dfbe5e 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_ 369 +#define __WMI_REVISION_ 370 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work