From: Subhani Shaik Date: Thu, 16 Feb 2017 06:42:23 +0000 (-0800) Subject: [AWARE]: Enable SDEA based SSI X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a39fe6182c62377bfafd49f693634a5fb0ebbc2c;p=android-x86%2Fhardware-libhardware_legacy.git [AWARE]: Enable SDEA based SSI Bug: 35193423 Test: integrated (sl4a) test Change-Id: If29d93391071710bd419eeab6e384ca154da9c85 --- diff --git a/include/hardware_legacy/wifi_nan.h b/include/hardware_legacy/wifi_nan.h index 751b4b5..993647f 100644 --- a/include/hardware_legacy/wifi_nan.h +++ b/include/hardware_legacy/wifi_nan.h @@ -60,6 +60,7 @@ typedef u32 NanDataPathId; #define NAN_ERROR_STR_LEN 255 #define NAN_PMK_INFO_LEN 32 #define NAN_MAX_SCID_BUF_LEN 1024 +#define NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN 1024 /* Definition of various NanResponseType @@ -316,6 +317,7 @@ typedef struct { u32 max_queued_transmit_followup_msgs; u32 cipher_suites_supported; u32 max_subscribe_address; + u32 max_sdea_service_specific_info_len; } NanCapabilities; /* @@ -1043,6 +1045,12 @@ typedef struct { ACCEPT/REJECT/CANCEL to the requestor. */ NanRangeResponseCfg range_response_cfg; + + /* + Sequence of values indicating the service specific info in SDEA + */ + u16 sdea_service_specific_info_len; + u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN]; } NanPublishRequest; /* @@ -1204,6 +1212,12 @@ typedef struct { ACCEPT/REJECT/CANCEL to the requestor. */ NanRangeResponseCfg range_response_cfg; + + /* + Sequence of values indicating the service specific info in SDEA + */ + u16 sdea_service_specific_info_len; + u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN]; } NanSubscribeRequest; /* @@ -1243,6 +1257,12 @@ typedef struct { BIT0 - Disable followUp response from FW. */ u8 recv_indication_cfg; + + /* + Sequence of values indicating the service specific info in SDEA + */ + u16 sdea_service_specific_info_len; + u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN]; } NanTransmitFollowupRequest; /* @@ -1744,6 +1764,12 @@ typedef struct { 2) Ranging event matching the configuration of continuous/ingress/egress. */ NanRangeInfo range_info; + + /* + Sequence of values indicating the service specific info in SDEA + */ + u16 sdea_service_specific_info_len; + u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN]; } NanMatchInd; /* @@ -1803,6 +1829,12 @@ typedef struct { */ u16 service_specific_info_len; u8 service_specific_info[NAN_MAX_SERVICE_SPECIFIC_INFO_LEN]; + + /* + Sequence of values indicating the service specific info in SDEA + */ + u16 sdea_service_specific_info_len; + u8 sdea_service_specific_info[NAN_MAX_SDEA_SERVICE_SPECIFIC_INFO_LEN]; } NanFollowupInd; /*