diff options
author | android-build-team Robot | 2018-05-22 02:23:03 -0500 |
---|---|---|
committer | android-build-team Robot | 2018-05-22 02:23:03 -0500 |
commit | b9b5b354b92bc5e1cf69c8c4d7d58d3208eb9ace (patch) | |
tree | a0ca8047e4e5ae67ec9f4b1249cd8c5700339a96 | |
parent | 205c8100fd44a0cd185af04c6d2089a4851eda85 (diff) | |
parent | 3fea05cd400172194adfb5fe8fe5c0e25ca292ab (diff) | |
download | platform-hardware-interfaces-b9b5b354b92bc5e1cf69c8c4d7d58d3208eb9ace.tar.gz platform-hardware-interfaces-b9b5b354b92bc5e1cf69c8c4d7d58d3208eb9ace.tar.xz platform-hardware-interfaces-b9b5b354b92bc5e1cf69c8c4d7d58d3208eb9ace.zip |
Snap for 4796401 from 3fea05cd400172194adfb5fe8fe5c0e25ca292ab to pi-release
Change-Id: I08de94d3b4c271aad8fa7726b6fd64fd9c4e09d1
-rw-r--r-- | automotive/vehicle/2.0/Android.bp | 2 | ||||
-rw-r--r-- | automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 6 | ||||
-rw-r--r-- | automotive/vehicle/2.0/types.hal | 16 | ||||
-rw-r--r-- | current.txt | 2 | ||||
-rw-r--r-- | wifi/1.0/README-NAN.md | 6 | ||||
-rw-r--r-- | wifi/1.2/README-NAN.md | 231 |
6 files changed, 243 insertions, 20 deletions
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp index 91255d0d..6af774e4 100644 --- a/automotive/vehicle/2.0/Android.bp +++ b/automotive/vehicle/2.0/Android.bp | |||
@@ -41,6 +41,7 @@ hidl_interface { | |||
41 | "VehicleAreaDoor", | 41 | "VehicleAreaDoor", |
42 | "VehicleAreaMirror", | 42 | "VehicleAreaMirror", |
43 | "VehicleAreaSeat", | 43 | "VehicleAreaSeat", |
44 | "VehicleAreaWheel", | ||
44 | "VehicleAreaWindow", | 45 | "VehicleAreaWindow", |
45 | "VehicleDisplay", | 46 | "VehicleDisplay", |
46 | "VehicleGear", | 47 | "VehicleGear", |
@@ -68,7 +69,6 @@ hidl_interface { | |||
68 | "VmsOfferingMessageIntegerValuesIndex", | 69 | "VmsOfferingMessageIntegerValuesIndex", |
69 | "VmsPublisherInformationIntegerValuesIndex", | 70 | "VmsPublisherInformationIntegerValuesIndex", |
70 | "VmsSubscriptionsStateIntegerValuesIndex", | 71 | "VmsSubscriptionsStateIntegerValuesIndex", |
71 | "Wheel", | ||
72 | ], | 72 | ], |
73 | gen_java: true, | 73 | gen_java: true, |
74 | } | 74 | } |
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h index c1f80f41..4ae94c00 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | |||
@@ -40,7 +40,8 @@ constexpr int TRACTION_CONTROL_ACTIVE = (int)VehicleProperty::TRACTION_CONTROL_A | |||
40 | constexpr int VEHICLE_MAP_SERVICE = (int)VehicleProperty::VEHICLE_MAP_SERVICE; | 40 | constexpr int VEHICLE_MAP_SERVICE = (int)VehicleProperty::VEHICLE_MAP_SERVICE; |
41 | constexpr int WHEEL_TICK = (int)VehicleProperty::WHEEL_TICK; | 41 | constexpr int WHEEL_TICK = (int)VehicleProperty::WHEEL_TICK; |
42 | constexpr int ALL_WHEELS = | 42 | constexpr int ALL_WHEELS = |
43 | (int)(Wheel::LEFT_FRONT | Wheel::RIGHT_FRONT | Wheel::LEFT_REAR | Wheel::RIGHT_REAR); | 43 | (int)(VehicleAreaWheel::LEFT_FRONT | VehicleAreaWheel::RIGHT_FRONT | |
44 | VehicleAreaWheel::LEFT_REAR | VehicleAreaWheel::RIGHT_REAR); | ||
44 | constexpr int HVAC_LEFT = (int)(VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_2_LEFT | | 45 | constexpr int HVAC_LEFT = (int)(VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_2_LEFT | |
45 | VehicleAreaSeat::ROW_2_CENTER); | 46 | VehicleAreaSeat::ROW_2_CENTER); |
46 | constexpr int HVAC_RIGHT = (int)(VehicleAreaSeat::ROW_1_RIGHT | VehicleAreaSeat::ROW_2_RIGHT); | 47 | constexpr int HVAC_RIGHT = (int)(VehicleAreaSeat::ROW_1_RIGHT | VehicleAreaSeat::ROW_2_RIGHT); |
@@ -484,8 +485,7 @@ const ConfigDeclaration kVehicleProperties[]{ | |||
484 | 485 | ||
485 | {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT), | 486 | {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT), |
486 | .access = VehiclePropertyAccess::WRITE, | 487 | .access = VehiclePropertyAccess::WRITE, |
487 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE, | 488 | .changeMode = VehiclePropertyChangeMode::ON_CHANGE}, |
488 | .configArray = {3}}, | ||
489 | .initialValue = {.int32Values = {toInt(VehicleApPowerStateReport::BOOT_COMPLETE), 0}}}, | 489 | .initialValue = {.int32Values = {toInt(VehicleApPowerStateReport::BOOT_COMPLETE), 0}}}, |
490 | 490 | ||
491 | {.config = {.prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS), | 491 | {.config = {.prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS), |
diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index 23f9b779..a031ee98 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal | |||
@@ -91,7 +91,7 @@ enum VehicleArea : int32_t { | |||
91 | SEAT = 0x05000000, | 91 | SEAT = 0x05000000, |
92 | /** DOOR maps to enum VehicleAreaDoor */ | 92 | /** DOOR maps to enum VehicleAreaDoor */ |
93 | DOOR = 0x06000000, | 93 | DOOR = 0x06000000, |
94 | /** WHEEL maps to enum Wheel */ | 94 | /** WHEEL maps to enum VehicleAreaWheel */ |
95 | WHEEL = 0x07000000, | 95 | WHEEL = 0x07000000, |
96 | 96 | ||
97 | MASK = 0x0f000000, | 97 | MASK = 0x0f000000, |
@@ -1090,8 +1090,8 @@ enum VehicleProperty : int32_t { | |||
1090 | * It is assumed that AP's power state is controller by separate power | 1090 | * It is assumed that AP's power state is controller by separate power |
1091 | * controller. | 1091 | * controller. |
1092 | * | 1092 | * |
1093 | * For configuration information, VehiclePropConfig.configFlags can | 1093 | * For configuration information, VehiclePropConfig.configArray can have bit flag combining |
1094 | * have bit flag combining values in VehicleApPowerStateConfigFlag. | 1094 | * values in VehicleApPowerStateConfigFlag. |
1095 | * | 1095 | * |
1096 | * int32Values[0] : VehicleApPowerStateReq enum value | 1096 | * int32Values[0] : VehicleApPowerStateReq enum value |
1097 | * int32Values[1] : additional parameter relevant for each state, | 1097 | * int32Values[1] : additional parameter relevant for each state, |
@@ -2582,14 +2582,6 @@ struct VehiclePropConfig { | |||
2582 | */ | 2582 | */ |
2583 | vec<VehicleAreaConfig> areaConfigs; | 2583 | vec<VehicleAreaConfig> areaConfigs; |
2584 | 2584 | ||
2585 | /** | ||
2586 | * Configuration flags for this property. | ||
2587 | * | ||
2588 | * For example, it may store the number of presets that are stored by the | ||
2589 | * radio module. | ||
2590 | */ | ||
2591 | int32_t configFlags; | ||
2592 | |||
2593 | /** Contains additional configuration parameters */ | 2585 | /** Contains additional configuration parameters */ |
2594 | vec<int32_t> configArray; | 2586 | vec<int32_t> configArray; |
2595 | 2587 | ||
@@ -2754,7 +2746,7 @@ enum StatusCode : int32_t { | |||
2754 | INTERNAL_ERROR = 5, | 2746 | INTERNAL_ERROR = 5, |
2755 | }; | 2747 | }; |
2756 | 2748 | ||
2757 | enum Wheel : int32_t { | 2749 | enum VehicleAreaWheel : int32_t { |
2758 | UNKNOWN = 0x0, | 2750 | UNKNOWN = 0x0, |
2759 | 2751 | ||
2760 | LEFT_FRONT = 0x1, | 2752 | LEFT_FRONT = 0x1, |
diff --git a/current.txt b/current.txt index fb784d50..75ea5db6 100644 --- a/current.txt +++ b/current.txt | |||
@@ -311,7 +311,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar | |||
311 | 3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types | 311 | 3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types |
312 | b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle | 312 | b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle |
313 | 7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback | 313 | 7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback |
314 | 44c8b452186b65f5140a224721f238b76ed3adc42460f26b801b561593744c7e android.hardware.automotive.vehicle@2.0::types | 314 | 3562503f550f70eec7a688343a600fb92b74efb807a31452b70195dfab328b22 android.hardware.automotive.vehicle@2.0::types |
315 | 32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost | 315 | 32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost |
316 | ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload | 316 | ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload |
317 | 27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types | 317 | 27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types |
diff --git a/wifi/1.0/README-NAN.md b/wifi/1.0/README-NAN.md index f4b3320e..645c9f94 100644 --- a/wifi/1.0/README-NAN.md +++ b/wifi/1.0/README-NAN.md | |||
@@ -14,7 +14,7 @@ limitations under the License. | |||
14 | 14 | ||
15 | # Wi-Fi Aware (NAN) HAL API Usage | 15 | # Wi-Fi Aware (NAN) HAL API Usage |
16 | 16 | ||
17 | The Wi-Fi Aware (NAN) HAL API is defined in (<i>hardware/interfaces/wifi/\<version\>/</i>): | 17 | The Wi-Fi Aware (NAN) HAL API is defined in (<i>hardware/interfaces/wifi/1.0/</i>): |
18 | 18 | ||
19 | * IWifiNanIface.hal | 19 | * IWifiNanIface.hal |
20 | * IWifiNanIfaceEventCallback.hal | 20 | * IWifiNanIfaceEventCallback.hal |
@@ -23,7 +23,7 @@ The Wi-Fi Aware (NAN) HAL API is defined in (<i>hardware/interfaces/wifi/\<versi | |||
23 | The Wi-Fi Aware (NAN) HAL API surface is very large - only a subset is used from the framework. | 23 | The Wi-Fi Aware (NAN) HAL API surface is very large - only a subset is used from the framework. |
24 | 24 | ||
25 | Understanding of the HAL API subset which is actively used by the Android framework can be deduced | 25 | Understanding of the HAL API subset which is actively used by the Android framework can be deduced |
26 | by reviewing framework code, specifically (<i>frameworks/opt/net/wif/</i>): | 26 | by reviewing framework code, specifically (<i>frameworks/opt/net/wifi/</i>): |
27 | 27 | ||
28 | * WifiAwareNativeApi.java | 28 | * WifiAwareNativeApi.java |
29 | * WifiAwareNativeCallback.java | 29 | * WifiAwareNativeCallback.java |
@@ -41,7 +41,7 @@ the new HAL API only. To understand the mapping between new and legacy HALs plea | |||
41 | 41 | ||
42 | Format: | 42 | Format: |
43 | * Hard-coded values are in <b>bold</b>, e.g. <b>true</b> or <b>5</b> | 43 | * Hard-coded values are in <b>bold</b>, e.g. <b>true</b> or <b>5</b> |
44 | * Assigned but not fixed value are specified using the <i>variable</i> keyword, possibly with some | 44 | * Assigned but not fixed values are specified using the <i>variable</i> keyword, possibly with some |
45 | details/constraints | 45 | details/constraints |
46 | * Unassigned values are specified using the <i>N/A</i> keyword. Unassigned usually means initialized | 46 | * Unassigned values are specified using the <i>N/A</i> keyword. Unassigned usually means initialized |
47 | to 0. | 47 | to 0. |
diff --git a/wifi/1.2/README-NAN.md b/wifi/1.2/README-NAN.md new file mode 100644 index 00000000..00b91690 --- /dev/null +++ b/wifi/1.2/README-NAN.md | |||
@@ -0,0 +1,231 @@ | |||
1 | Copyright 2018 The Android Open Source Project | ||
2 | |||
3 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
4 | you may not use this file except in compliance with the License. | ||
5 | You may obtain a copy of the License at | ||
6 | |||
7 | http://www.apache.org/licenses/LICENSE-2.0 | ||
8 | |||
9 | Unless required by applicable law or agreed to in writing, software | ||
10 | distributed under the License is distributed on an "AS IS" BASIS, | ||
11 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
12 | See the License for the specific language governing permissions and | ||
13 | limitations under the License. | ||
14 | |||
15 | # Wi-Fi Aware (NAN) HAL API Usage | ||
16 | |||
17 | The Wi-Fi Aware (NAN) HAL API is defined in (<i>hardware/interfaces/wifi/1.0/</i> and | ||
18 | <i>hardware/interfaces/wifi/1.2/</i>): | ||
19 | |||
20 | * IWifiNanIface.hal | ||
21 | * IWifiNanIfaceEventCallback.hal | ||
22 | * types.hal (structure definitions) | ||
23 | |||
24 | Note that the <i>1.2</i> HAL is supplemental to the <i>1.0</i> HAL - not a replacement. | ||
25 | |||
26 | The Wi-Fi Aware (NAN) HAL API surface is very large - only a subset is used from the framework. | ||
27 | |||
28 | Understanding of the HAL API subset which is actively used by the Android framework can be deduced | ||
29 | by reviewing framework code, specifically (<i>frameworks/opt/net/wifi/</i>): | ||
30 | |||
31 | * WifiAwareNativeApi.java | ||
32 | * WifiAwareNativeCallback.java | ||
33 | |||
34 | The above framework files determine the API usage - and should be consulted as the authoritative | ||
35 | reference. Please consult the primary HAL file for documentation - they will not be replicated | ||
36 | in this document. APIs which are in the HAL but are not listed in this README file are not used by | ||
37 | the framework. | ||
38 | |||
39 | Note: the HAL API is translated to the legacy HAL API (<i>wifi_nan.h</i>). This README file covers | ||
40 | the new HAL API only. To understand the mapping between new and legacy HALs please consult | ||
41 | <i>hardware/interfaces/wifi/\<version\>/default/hidl_struct_util.cpp</i>. | ||
42 | |||
43 | ## IWifiNanIface | ||
44 | |||
45 | Format: | ||
46 | * Hard-coded values are in <b>bold</b>, e.g. <b>true</b> or <b>5</b> | ||
47 | * Assigned but not fixed values are specified using the <i>variable</i> keyword, possibly with some | ||
48 | details/constraints | ||
49 | * Unassigned values are specified using the <i>N/A</i> keyword. Unassigned usually means initialized | ||
50 | to 0. | ||
51 | |||
52 | APIs: | ||
53 | |||
54 | * registerEventCallback_1_2(IWifiNanIfaceEventCallback_1_2 callback) | ||
55 | * getCapabilitiesRequest | ||
56 | * enableRequest_1_2 | ||
57 | * NanEnableRequest | ||
58 | * bool[2] operateInBand | ||
59 | * Index [NanBandIndex.NAN_BAND_24GHZ] = <b>true</b> | ||
60 | * Index [NanBandIndex.NAN_BAND_5GHZ] = <i>variable</i> | ||
61 | * uint8_t hopCountMax = <b>2</b> | ||
62 | * NanConfigRequest configParams | ||
63 | * uint8_t masterPref = <i>variable</i> | ||
64 | * bool disableDiscoveryAddressChangeIndication = <i>variable</i> | ||
65 | * bool disableStartedClusterIndication = <i>variable</i> | ||
66 | * bool disableJoinedClusterIndication = <i>variable</i> | ||
67 | * bool includePublishServiceIdsInBeacon = <b>true</b> | ||
68 | * uint8_t numberOfPublishServiceIdsInBeacon = <b>0</b> | ||
69 | * bool includeSubscribeServiceIdsInBeacon = <b>true</b> | ||
70 | * uint8_t numberOfSubscribeServiceIdsInBeacon = <b>0</b> | ||
71 | * uint16_t rssiWindowSize = <b>8</b> | ||
72 | * uint32_t macAddressRandomizationIntervalSec = <i>variable</i> | ||
73 | * Normal run-time: set to <b>1800</b> (30 minutes) | ||
74 | * Tests: set to <b>120</b> (2 minutes) | ||
75 | * NanBandSpecificConfig[2] bandSpecificConfig | ||
76 | * Index [NanBandIndex.NAN_BAND_24GHZ] | ||
77 | * uint8_t rssiClose = <b>60</b> | ||
78 | * uint8_t rssiMiddle = <b>70</b> | ||
79 | * uint8_t rssiCloseProximity = <b>60</b> | ||
80 | * uint8_t dwellTimeMs = <b>200</b> | ||
81 | * uint16_t scanPeriodSec = <b>20</b> | ||
82 | * bool validDiscoveryWindowIntervalVal = <i>variable</i> | ||
83 | * uint8_t discoveryWindowIntervalVal = <i>variable</i> | ||
84 | * Index [NanBandIndex.NAN_BAND_5GHZ] | ||
85 | * uint8_t rssiClose = <b>60</b> | ||
86 | * uint8_t rssiMiddle = <b>75</b> | ||
87 | * uint8_t rssiCloseProximity = <b>60</b> | ||
88 | * uint8_t dwellTimeMs = <b>200</b> | ||
89 | * uint16_t scanPeriodSec = <b>20</b> | ||
90 | * bool validDiscoveryWindowIntervalVal = <i>variable</i> | ||
91 | * uint8_t discoveryWindowIntervalVal = <i>variable</i> | ||
92 | * NanDebugConfig debugConfigs | ||
93 | * bool validClusterIdVals = <b>true</b> | ||
94 | * uint16_t clusterIdBottomRangeVal = <i>variable</i> | ||
95 | * uint16_t clusterIdTopRangeVal = <i>variable</i> | ||
96 | * bool validIntfAddrVal = <b>false</b> | ||
97 | * MacAddress intfAddrVal = <i>N/A</i> | ||
98 | * bool validOuiVal = <b>false</b> | ||
99 | * uint32_t ouiVal = <i>N/A</i> | ||
100 | * bool validRandomFactorForceVal = <b>false</b> | ||
101 | * uint8_t randomFactorForceVal = <i>N/A</i> | ||
102 | * bool validHopCountForceVal = <b>false</b> | ||
103 | * uint8_t hopCountForceVal = <i>N/A</i> | ||
104 | * bool validDiscoveryChannelVal = <b>false</b> | ||
105 | * WifiChannelInMhz[2] discoveryChannelMhzVal = <i>N/A</i> | ||
106 | * bool validUseBeaconsInBandVal = <b>false</b> | ||
107 | * bool[2] useBeaconsInBandVal = <i>N/A</i> | ||
108 | * bool validUseSdfInBandVal = <b>false</b> | ||
109 | * bool[2] useSdfInBandVal = <i>N/A</i> | ||
110 | * NanConfigRequestSupplemental | ||
111 | * uint32_t discoveryBeaconIntervalMs = <b>0</b> | ||
112 | * uint32_t numberOfSpatialStreamsInDiscovery = <b>0</b> | ||
113 | * bool enableDiscoveryWindowEarlyTermination = <b>false</b> | ||
114 | * bool enableRanging = <b>true</b> | ||
115 | * configRequest_1_2 | ||
116 | * NanConfigRequest: same as for <i>enableRequest_1_2</i> | ||
117 | * disableRequest | ||
118 | * startPublishRequest | ||
119 | * NanPublishRequest | ||
120 | * NanDiscoveryCommonConfig baseConfigs | ||
121 | * uint8_t sessionId = <i>variable</i> | ||
122 | * uint16_t ttlSec = <i>variable</i> | ||
123 | * uint16_t discoveryWindowPeriod = <b>1</b> | ||
124 | * uint8_t discoveryCount = <b>0</b> | ||
125 | * vec<uint8_t> serviceName = <i>variable</i> | ||
126 | * NanMatchAlg discoveryMatchIndicator = <b>NanMatchAlg.MATCH_NEVER</b> | ||
127 | * vec<uint8_t> serviceSpecificInfo = <i>variable</i> | ||
128 | * vec<uint8_t> extendedServiceSpecificInfo = <i>N/A</i> | ||
129 | e vec<uint8_t> rxMatchFilter = <i>variable</i> | ||
130 | * vec<uint8_t> txMatchFilter = <i>variable</i> | ||
131 | * bool useRssiThreshold = <b>false</b> | ||
132 | * bool disableDiscoveryTerminationIndication = <i>variable</i> | ||
133 | * bool disableMatchExpirationIndication = <b>true</b> | ||
134 | * bool disableFollowupReceivedIndication = <b>false</b> | ||
135 | * NanDataPathSecurityConfig securityConfig = <b>NanDataPathSecurityType.OPEN</b> | ||
136 | * bool rangingRequired = <b>false</b> | ||
137 | * uint32_t rangingIntervalMsec = <i>N/A</i> | ||
138 | * bitfield<NanRangingIndication> configRangingIndications = <i>N/A</i> | ||
139 | * uint16_t distanceIngressCm = <i>N/A</i> | ||
140 | * uint16_t distanceEgressCm = <i>N/A</i> | ||
141 | * NanPublishType publishType = <i>variable</i> | ||
142 | * NanTxType txType = <b>NanTxType.BROADCAST</b> | ||
143 | * bool autoAcceptDataPathRequests = <b>false</b> | ||
144 | * stopPublishRequest | ||
145 | * startSubscribeRequest | ||
146 | * NanSubscribeRequest | ||
147 | * NanDiscoveryCommonConfig baseConfigs | ||
148 | * Mostly same as <i>publish</i> above except: | ||
149 | * NanMatchAlg discoveryMatchIndicator = <b>NanMatchAlg.MATCH_ONCE</b> | ||
150 | * NanSubscribeType subscribeType = <i>variable</i> | ||
151 | * NanSrfType srfType = <i>N/A</i> | ||
152 | * bool srfRespondIfInAddressSet = <i>N/A</i> | ||
153 | * bool shouldUseSrf = <i>N/A</i> | ||
154 | * bool isSsiRequiredForMatch = <i>N/A</i> | ||
155 | * vec<MacAddress> intfAddr = <i>N/A</i> | ||
156 | * stopSubscribeRequest | ||
157 | * transmitFollowupRequest | ||
158 | * NanTransmitFollowupRequest | ||
159 | * uint8_t discoverySessionId = <i>variable</i> | ||
160 | * uint32_t peerId = <i>variable</i> | ||
161 | * MacAddress addr = <i>variable</i> | ||
162 | * bool isHighPriority = <b>false</b> | ||
163 | * bool shouldUseDiscoveryWindow = <b>true</b> | ||
164 | * vec<uint8_t> serviceSpecificInfo = <i>variable</i> | ||
165 | * vec<uint8_t> extendedServiceSpecificInfo = <i>N/A</i> | ||
166 | * bool disableFollowupResultIndication = <b>false</b> | ||
167 | * createDataInterfaceRequest | ||
168 | * deleteDataInterfaceRequest | ||
169 | * initiateDataPathRequest | ||
170 | * NanInitiateDataPathRequest | ||
171 | * uint32_t peerId = <i>variable</i> | ||
172 | * MacAddress peerDiscMacAddr = <i>variable</i> | ||
173 | * NanDataPathChannelCfg channelRequestType = | ||
174 | <i>NanDataPathChannelCfg.CHANNEL_NOT_REQUESTED</i> | ||
175 | * WifiChannelInMhz channel = <b>2437</b> (note that should be ignored though - | ||
176 | CHANNEL_NOT_REQUESTED!) | ||
177 | * string ifaceName = <i>variable</i> | ||
178 | * NanDataPathSecurityConfig securityConfig = <i>variable</i> | ||
179 | * vec<uint8_t> appInfo = <i>N/A</i> | ||
180 | * vec<uint8_t> serviceNameOutOfBand = <i>variable</i> | ||
181 | * respondToDataPathIndicationRequest | ||
182 | * NanRespondToDataPathIndicationRequest | ||
183 | * bool acceptRequest = <i>variable</i> | ||
184 | * uint32_t ndpInstanceId = <i>variable</i> | ||
185 | * string ifaceName = <i>variable</i> | ||
186 | * NanDataPathSecurityConfig securityConfig = <i>variable</i> | ||
187 | * vec<uint8_t> appInfo = <i>N/A</i> | ||
188 | * vec<uint8_t> serviceNameOutOfBand = <i>variable</i> | ||
189 | * terminateDataPathRequest | ||
190 | |||
191 | ## IWifiNanIfaceEventCallback_1_2 | ||
192 | |||
193 | Format: | ||
194 | * Parameters whose values are <i>ignored</i> will be flagged, otherwise the parameter value is used | ||
195 | by the framework. | ||
196 | |||
197 | API: | ||
198 | |||
199 | * notifyXxxResponse: all callbacks are used by framework | ||
200 | * eventClusterEvent | ||
201 | * eventDisabled | ||
202 | * eventPublishTerminated | ||
203 | * eventSubscribeTerminated | ||
204 | * eventMatch | ||
205 | * NanMatchInd (all parameters are used except those listed below) | ||
206 | * vec<uint8_t> extendedServiceSpecificInfo: <i>ignored</i> | ||
207 | * bool matchOccuredInBeaconFlag: <i>ignored</i> | ||
208 | * bool outOfResourceFlag: <i>ignored</i> | ||
209 | * uint8_t rssiValue: <i>ignored</i> | ||
210 | * NanCipherSuiteType peerCipherType: <i>ignored</i> | ||
211 | * bool peerRequiresSecurityEnabledInNdp: <i>ignored</i> | ||
212 | * bool peerRequiresRanging: <i>ignored</i> | ||
213 | * uint32_t rangingMeasurementInCm: <i>ignored</i> | ||
214 | * bitfield<NanRangingIndication> rangingIndicationType: <i>ignored</i> | ||
215 | * eventMatchExpired: <i>ignored</i> | ||
216 | * eventFollowupReceived | ||
217 | * NanFollowupReceivedInd (all parameters are used except those listed below) | ||
218 | * bool receivedInFaw: <i>ignored</i> | ||
219 | * vec<uint8_t> extendedServiceSpecificInfo: <i>ignored</i> | ||
220 | * eventTransmitFollowup | ||
221 | * eventDataPathRequest | ||
222 | * NanDataPathRequestInd (all parameters are used except those listed below) | ||
223 | * bool securityRequired: <i>ignored</i> | ||
224 | * vec<uint8_t> appInfo: <i>ignored</i> | ||
225 | * eventDataPathConfirm | ||
226 | * NanDataPathConfirmInd (all parameters are used except those listed below) | ||
227 | * vec<uint8_t> appInfo: <i>ignored</i> | ||
228 | * eventDataPathScheduleUpdate | ||
229 | * NanDataPathScheduleUpdateInd | ||
230 | * eventDataPathTerminated | ||
231 | |||