tequilaOS/platform_hardware_libhardware_legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[AWARE]: Enable Service Descriptor Extension Attribute am: 0001cdb414 am: 45559af039

Browse source 
am: 3a748b3221

Change-Id: I72f53f347acfe9dd6225f78b586a66b00b4e0ca8
This commit is contained in:
Subhani Shaik 2016-12-13 15:20:48 +00:00 committed by android-build-merger
commit 2e77e1e170
1 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
include/hardware_legacy/wifi_nan.h
View file

@ -115,6 +115,18 @@ typedef enum {
NAN_EVENT_ID_JOINED_CLUSTER NAN_EVENT_ID_JOINED_CLUSTER
} NanDiscEngEventType; } NanDiscEngEventType;
/* NAN Data Path type */
typedef enum {
NAN_DATA_PATH_UNICAST_MSG = 0,
NAN_DATA_PATH_MULTICAST_MSG
} NdpType;
/* NAN Ranging Configuration */
typedef enum {
NAN_RANGING_DISABLE = 0,
NAN_RANGING_ENABLE
} NanRangingState;
/* TCA Type */ /* TCA Type */
typedef enum { typedef enum {
NAN_TCA_ID_CLUSTER_SIZE = 0 NAN_TCA_ID_CLUSTER_SIZE = 0
@ -226,6 +238,31 @@ typedef enum {
#define NAN_CIPHER_SUITE_SHARED_KEY_128_MASK 0x01 #define NAN_CIPHER_SUITE_SHARED_KEY_128_MASK 0x01
#define NAN_CIPHER_SUITE_SHARED_KEY_256_MASK 0x02 #define NAN_CIPHER_SUITE_SHARED_KEY_256_MASK 0x02
/*
Structure to set the Service Descriptor Extension
Attribute (SDEA) passed as part of NanPublishRequest/
NanSubscribeRequest/NanMatchInd.
*/
typedef struct {
/*
Optional configuration of Data Path Enable request.
configure flag determines whether configuration needs
to be passed or not.
*/
u8 config_nan_data_path;
NdpType ndp_type;
/*
NAN secuirty required flag to indicate
if the security is enabled or disabled
*/
NanDataPathSecurityCfgStatus security_cfg;
/*
NAN ranging required flag to indicate
if ranging is enabled on disabled
*/
NanRangingState ranging_state;
} NanSdeaCtrlParams;
/* Nan/NDP Capabilites info */ /* Nan/NDP Capabilites info */
typedef struct { typedef struct {
u32 max_concurrent_nan_clusters; u32 max_concurrent_nan_clusters;
@ -905,8 +942,8 @@ typedef struct {
*/ */
u8 scid[NAN_MAX_SCID_BUF_LEN]; u8 scid[NAN_MAX_SCID_BUF_LEN];
/* NAN secuirty required flag */ /* NAN configure service discovery extended attributes */
NanDataPathSecurityCfgStatus security_cfg; NanSdeaCtrlParams sdea_params;
} NanPublishRequest; } NanPublishRequest;
/* /*
@ -1050,8 +1087,8 @@ typedef struct {
*/ */
u8 scid[NAN_MAX_SCID_BUF_LEN]; u8 scid[NAN_MAX_SCID_BUF_LEN];
/* NAN security required flag */ /* NAN configure service discovery extended attributes */
NanDataPathSecurityCfgStatus security_cfg; NanSdeaCtrlParams sdea_params;
} NanSubscribeRequest; } NanSubscribeRequest;
/* /*
@ -1560,8 +1597,8 @@ typedef struct {
*/ */
u8 scid[NAN_MAX_SCID_BUF_LEN]; u8 scid[NAN_MAX_SCID_BUF_LEN];
/* NAN security required flag */ /* Peer service discovery extended attributes */
NanDataPathSecurityCfgStatus security_cfg; NanSdeaCtrlParams peer_sdea_params;
} NanMatchInd; } NanMatchInd;
/* /*