diff --git a/wifi/1.0/vts/Wifi.vts b/wifi/1.0/vts/Wifi.vts
index 608e012..85c901a7 100644
--- a/wifi/1.0/vts/Wifi.vts
+++ b/wifi/1.0/vts/Wifi.vts
@@ -4,11 +4,3041 @@
 
 package: "android.hardware.wifi"
 
+import: "android.hardware.wifi@1.0::IWifiApIface"
 import: "android.hardware.wifi@1.0::IWifiChip"
+import: "android.hardware.wifi@1.0::IWifiChipEventCallback"
 import: "android.hardware.wifi@1.0::IWifiEventCallback"
+import: "android.hardware.wifi@1.0::IWifiIface"
+import: "android.hardware.wifi@1.0::IWifiNanIface"
+import: "android.hardware.wifi@1.0::IWifiNanIfaceEventCallback"
+import: "android.hardware.wifi@1.0::IWifiP2pIface"
+import: "android.hardware.wifi@1.0::IWifiRttController"
+import: "android.hardware.wifi@1.0::IWifiRttControllerEventCallback"
+import: "android.hardware.wifi@1.0::IWifiStaIface"
+import: "android.hardware.wifi@1.0::IWifiStaIfaceEventCallback"
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IWifiStaIface::StaIfaceCapabilityMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "APF"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BACKGROUND_SCAN"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "LINK_LAYER_STATS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "RSSI_MONITOR"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "CONTROL_ROAMING"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "PROBE_IE_WHITELIST"
+            scalar_value: {
+                uint32_t: 32
+            }
+            enumerator: "SCAN_RAND"
+            scalar_value: {
+                uint32_t: 64
+            }
+            enumerator: "STA_5G"
+            scalar_value: {
+                uint32_t: 128
+            }
+            enumerator: "HOTSPOT"
+            scalar_value: {
+                uint32_t: 256
+            }
+            enumerator: "PNO"
+            scalar_value: {
+                uint32_t: 512
+            }
+            enumerator: "TDLS"
+            scalar_value: {
+                uint32_t: 1024
+            }
+            enumerator: "TDLS_OFFCHANNEL"
+            scalar_value: {
+                uint32_t: 2048
+            }
+            enumerator: "ND_OFFLOAD"
+            scalar_value: {
+                uint32_t: 4096
+            }
+            enumerator: "KEEP_ALIVE"
+            scalar_value: {
+                uint32_t: 8192
+            }
+            enumerator: "DEBUG_PACKET_FATE"
+            scalar_value: {
+                uint32_t: 16384
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombinationLimit"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "types"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ENUM
+                predefined_type: "::android::hardware::wifi::V1_0::IfaceType"
+            }
+        }
+        struct_value: {
+            name: "maxIfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombination"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "limits"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombinationLimit"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipMode"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "availableCombinations"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombination"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipDebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "driverDescription"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "firmwareDescription"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipCapabilityMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DEBUG_MEMORY_FIRMWARE_DUMP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "DEBUG_MEMORY_DRIVER_DUMP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "DEBUG_RING_BUFFER_CONNECT_EVENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "DEBUG_RING_BUFFER_POWER_EVENT"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DEBUG_RING_BUFFER_WAKELOCK_EVENT"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "DEBUG_RING_BUFFER_VENDOR_DATA"
+            scalar_value: {
+                uint32_t: 32
+            }
+            enumerator: "DEBUG_HOST_WAKE_REASON_STATS"
+            scalar_value: {
+                uint32_t: 64
+            }
+            enumerator: "DEBUG_ERROR_ALERTS"
+            scalar_value: {
+                uint32_t: 128
+            }
+        }
+    }
+
     api: {
         name: "registerEventCallback"
         return_type_hidl: {
@@ -17,8 +3047,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "IWifiEventCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiEventCallback"
         }
         callflow: {
             entry: true
@@ -95,8 +3124,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiChip"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiChip"
         }
         arg: {
             type: TYPE_SCALAR
diff --git a/wifi/1.0/vts/WifiApIface.vts b/wifi/1.0/vts/WifiApIface.vts
index c4f3640..f231e4f 100644
--- a/wifi/1.0/vts/WifiApIface.vts
+++ b/wifi/1.0/vts/WifiApIface.vts
@@ -5,8 +5,2857 @@
 package: "android.hardware.wifi"
 
 import: "android.hardware.wifi@1.0::IWifiIface"
+import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "getType"
         return_type_hidl: {
@@ -30,4 +2879,20 @@
         }
     }
 
+    api: {
+        name: "setCountryCode"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatus"
+        }
+        arg: {
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+    }
+
 }
diff --git a/wifi/1.0/vts/WifiChip.vts b/wifi/1.0/vts/WifiChip.vts
index 4b278c1..53b1bc5 100644
--- a/wifi/1.0/vts/WifiChip.vts
+++ b/wifi/1.0/vts/WifiChip.vts
@@ -8,13 +8,2933 @@
 import: "android.hardware.wifi@1.0::IWifiChipEventCallback"
 import: "android.hardware.wifi@1.0::IWifiIface"
 import: "android.hardware.wifi@1.0::IWifiNanIface"
+import: "android.hardware.wifi@1.0::IWifiNanIfaceEventCallback"
 import: "android.hardware.wifi@1.0::IWifiP2pIface"
 import: "android.hardware.wifi@1.0::IWifiRttController"
+import: "android.hardware.wifi@1.0::IWifiRttControllerEventCallback"
 import: "android.hardware.wifi@1.0::IWifiStaIface"
+import: "android.hardware.wifi@1.0::IWifiStaIfaceEventCallback"
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IWifiStaIface::StaIfaceCapabilityMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "APF"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BACKGROUND_SCAN"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "LINK_LAYER_STATS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "RSSI_MONITOR"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "CONTROL_ROAMING"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "PROBE_IE_WHITELIST"
+            scalar_value: {
+                uint32_t: 32
+            }
+            enumerator: "SCAN_RAND"
+            scalar_value: {
+                uint32_t: 64
+            }
+            enumerator: "STA_5G"
+            scalar_value: {
+                uint32_t: 128
+            }
+            enumerator: "HOTSPOT"
+            scalar_value: {
+                uint32_t: 256
+            }
+            enumerator: "PNO"
+            scalar_value: {
+                uint32_t: 512
+            }
+            enumerator: "TDLS"
+            scalar_value: {
+                uint32_t: 1024
+            }
+            enumerator: "TDLS_OFFCHANNEL"
+            scalar_value: {
+                uint32_t: 2048
+            }
+            enumerator: "ND_OFFLOAD"
+            scalar_value: {
+                uint32_t: 4096
+            }
+            enumerator: "KEEP_ALIVE"
+            scalar_value: {
+                uint32_t: 8192
+            }
+            enumerator: "DEBUG_PACKET_FATE"
+            scalar_value: {
+                uint32_t: 16384
+            }
+        }
+    }
+
+    attribute: {
         name: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombinationLimit"
         type: TYPE_STRUCT
         struct_value: {
@@ -137,8 +3057,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "IWifiChipEventCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiChipEventCallback"
         }
     }
 
@@ -150,6 +3069,7 @@
         }
         return_type_hidl: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::V1_0::IWifiChip::ChipCapabilityMask"
         }
     }
@@ -243,8 +3163,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiApIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiApIface"
         }
     }
 
@@ -270,8 +3189,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiApIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiApIface"
         }
         arg: {
             type: TYPE_STRING
@@ -297,8 +3215,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiNanIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiNanIface"
         }
     }
 
@@ -324,8 +3241,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiNanIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiNanIface"
         }
         arg: {
             type: TYPE_STRING
@@ -351,8 +3267,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiP2pIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiP2pIface"
         }
     }
 
@@ -378,8 +3293,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiP2pIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiP2pIface"
         }
         arg: {
             type: TYPE_STRING
@@ -405,8 +3319,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiStaIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiStaIface"
         }
     }
 
@@ -432,8 +3345,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiStaIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiStaIface"
         }
         arg: {
             type: TYPE_STRING
@@ -459,13 +3371,11 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiRttController"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiRttController"
         }
         arg: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiIface"
         }
     }
 
diff --git a/wifi/1.0/vts/WifiChipEventCallback.vts b/wifi/1.0/vts/WifiChipEventCallback.vts
index c755162..7467d05 100644
--- a/wifi/1.0/vts/WifiChipEventCallback.vts
+++ b/wifi/1.0/vts/WifiChipEventCallback.vts
@@ -5,8 +5,2856 @@
 package: "android.hardware.wifi"
 
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "onChipReconfigured"
         arg: {
diff --git a/wifi/1.0/vts/WifiEventCallback.vts b/wifi/1.0/vts/WifiEventCallback.vts
index a0cf667..458672b 100644
--- a/wifi/1.0/vts/WifiEventCallback.vts
+++ b/wifi/1.0/vts/WifiEventCallback.vts
@@ -5,8 +5,2856 @@
 package: "android.hardware.wifi"
 
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "onStart"
     }
diff --git a/wifi/1.0/vts/WifiIface.vts b/wifi/1.0/vts/WifiIface.vts
index 1434a3e..0327509 100644
--- a/wifi/1.0/vts/WifiIface.vts
+++ b/wifi/1.0/vts/WifiIface.vts
@@ -5,8 +5,2856 @@
 package: "android.hardware.wifi"
 
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "getType"
         return_type_hidl: {
diff --git a/wifi/1.0/vts/WifiNanIface.vts b/wifi/1.0/vts/WifiNanIface.vts
index c06f985..924f564 100644
--- a/wifi/1.0/vts/WifiNanIface.vts
+++ b/wifi/1.0/vts/WifiNanIface.vts
@@ -7,8 +7,2856 @@
 import: "android.hardware.wifi@1.0::IWifiIface"
 import: "android.hardware.wifi@1.0::IWifiNanIfaceEventCallback"
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "getType"
         return_type_hidl: {
@@ -40,8 +2888,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "IWifiNanIfaceEventCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiNanIfaceEventCallback"
         }
     }
 
@@ -129,7 +2976,7 @@
         }
         arg: {
             type: TYPE_SCALAR
-            scalar_type: "uint16_t"
+            scalar_type: "uint8_t"
         }
     }
 
@@ -161,7 +3008,7 @@
         }
         arg: {
             type: TYPE_SCALAR
-            scalar_type: "uint16_t"
+            scalar_type: "uint8_t"
         }
     }
 
diff --git a/wifi/1.0/vts/WifiNanIfaceEventCallback.vts b/wifi/1.0/vts/WifiNanIfaceEventCallback.vts
index 02d04ac..f2bb608 100644
--- a/wifi/1.0/vts/WifiNanIfaceEventCallback.vts
+++ b/wifi/1.0/vts/WifiNanIfaceEventCallback.vts
@@ -5,8 +5,2856 @@
 package: "android.hardware.wifi"
 
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "notifyCapabilitiesResponse"
         arg: {
@@ -71,7 +2919,7 @@
         }
         arg: {
             type: TYPE_SCALAR
-            scalar_type: "uint16_t"
+            scalar_type: "uint8_t"
         }
     }
 
@@ -99,7 +2947,7 @@
         }
         arg: {
             type: TYPE_SCALAR
-            scalar_type: "uint16_t"
+            scalar_type: "uint8_t"
         }
     }
 
@@ -161,6 +3009,10 @@
             type: TYPE_STRUCT
             predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
         }
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
     }
 
     api: {
@@ -173,10 +3025,6 @@
             type: TYPE_STRUCT
             predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
         }
-        arg: {
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
     }
 
     api: {
@@ -211,7 +3059,7 @@
         name: "eventPublishTerminated"
         arg: {
             type: TYPE_SCALAR
-            scalar_type: "uint16_t"
+            scalar_type: "uint8_t"
         }
         arg: {
             type: TYPE_STRUCT
@@ -223,7 +3071,7 @@
         name: "eventSubscribeTerminated"
         arg: {
             type: TYPE_SCALAR
-            scalar_type: "uint16_t"
+            scalar_type: "uint8_t"
         }
         arg: {
             type: TYPE_STRUCT
@@ -243,7 +3091,7 @@
         name: "eventMatchExpired"
         arg: {
             type: TYPE_SCALAR
-            scalar_type: "uint16_t"
+            scalar_type: "uint8_t"
         }
         arg: {
             type: TYPE_SCALAR
diff --git a/wifi/1.0/vts/WifiP2pIface.vts b/wifi/1.0/vts/WifiP2pIface.vts
index b40c81e..94f3de6 100644
--- a/wifi/1.0/vts/WifiP2pIface.vts
+++ b/wifi/1.0/vts/WifiP2pIface.vts
@@ -5,8 +5,2857 @@
 package: "android.hardware.wifi"
 
 import: "android.hardware.wifi@1.0::IWifiIface"
+import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "getType"
         return_type_hidl: {
diff --git a/wifi/1.0/vts/WifiRttController.vts b/wifi/1.0/vts/WifiRttController.vts
index 0fd3626..3ed2885 100644
--- a/wifi/1.0/vts/WifiRttController.vts
+++ b/wifi/1.0/vts/WifiRttController.vts
@@ -7,8 +7,2856 @@
 import: "android.hardware.wifi@1.0::IWifiIface"
 import: "android.hardware.wifi@1.0::IWifiRttControllerEventCallback"
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "getBoundIface"
         return_type_hidl: {
@@ -17,8 +2865,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IWifiIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiIface"
         }
     }
 
@@ -30,8 +2877,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "IWifiRttControllerEventCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiRttControllerEventCallback"
         }
     }
 
@@ -68,8 +2914,8 @@
             type: TYPE_VECTOR
             vector_value: {
                 type: TYPE_ARRAY
+                vector_size: 6
                 vector_value: {
-                    vector_size: 6
                     type: TYPE_SCALAR
                     scalar_type: "uint8_t"
                 }
diff --git a/wifi/1.0/vts/WifiRttControllerEventCallback.vts b/wifi/1.0/vts/WifiRttControllerEventCallback.vts
index 028fd03..ab69dea 100644
--- a/wifi/1.0/vts/WifiRttControllerEventCallback.vts
+++ b/wifi/1.0/vts/WifiRttControllerEventCallback.vts
@@ -5,8 +5,2856 @@
 package: "android.hardware.wifi"
 
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "onResults"
         arg: {
diff --git a/wifi/1.0/vts/WifiStaIface.vts b/wifi/1.0/vts/WifiStaIface.vts
index 0cff792..ecd0ae2 100644
--- a/wifi/1.0/vts/WifiStaIface.vts
+++ b/wifi/1.0/vts/WifiStaIface.vts
@@ -7,9 +7,2857 @@
 import: "android.hardware.wifi@1.0::IWifiIface"
 import: "android.hardware.wifi@1.0::IWifiStaIfaceEventCallback"
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
         name: "::android::hardware::wifi::V1_0::IWifiStaIface::StaIfaceCapabilityMask"
         type: TYPE_ENUM
         enum_value: {
@@ -109,8 +2957,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "IWifiStaIfaceEventCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::V1_0::IWifiStaIfaceEventCallback"
         }
     }
 
@@ -122,6 +2969,7 @@
         }
         return_type_hidl: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::V1_0::IWifiStaIface::StaIfaceCapabilityMask"
         }
     }
@@ -351,16 +3199,16 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -384,15 +3232,23 @@
     }
 
     api: {
-        name: "startDebugPacketFateMonitoring"
+        name: "setScanningMacOui"
         return_type_hidl: {
             type: TYPE_STRUCT
             predefined_type: "::android::hardware::wifi::V1_0::WifiStatus"
         }
+        arg: {
+            type: TYPE_ARRAY
+            vector_size: 3
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
     }
 
     api: {
-        name: "stopDebugPacketFateMonitoring"
+        name: "startDebugPacketFateMonitoring"
         return_type_hidl: {
             type: TYPE_STRUCT
             predefined_type: "::android::hardware::wifi::V1_0::WifiStatus"
diff --git a/wifi/1.0/vts/WifiStaIfaceEventCallback.vts b/wifi/1.0/vts/WifiStaIfaceEventCallback.vts
index b04ad26..b8156d0 100644
--- a/wifi/1.0/vts/WifiStaIfaceEventCallback.vts
+++ b/wifi/1.0/vts/WifiStaIfaceEventCallback.vts
@@ -5,8 +5,2856 @@
 package: "android.hardware.wifi"
 
 import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ERROR_WIFI_CHIP_INVALID"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "ERROR_WIFI_IFACE_INVALID"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "ERROR_NOT_SUPPORTED"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "ERROR_NOT_AVAILABLE"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "ERROR_NOT_STARTED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "ERROR_INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ERROR_BUSY"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "ERROR_UNKNOWN"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "code"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::IfaceType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "P2P"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "WIDTH_20"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "WIDTH_40"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "WIDTH_80"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "WIDTH_160"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "WIDTH_80P80"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "WIDTH_5"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "WIDTH_10"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "WIDTH_INVALID"
+            scalar_value: {
+                uint32_t: 4294967295
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "width"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "centerFreq"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq0"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "centerFreq1"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "id"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "data"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "OFDM"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "CCK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "RESERVED"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateNss"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NSS_1x1"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NSS_2x2"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "NSS_3x3"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NSS_4x4"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
+        }
+        struct_value: {
+            name: "nss"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
+        }
+        struct_value: {
+            name: "rateMcsIdx"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "bitRateInKbps"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "version"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxLength"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxCacheSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxBuckets"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApCachePerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxReportingThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BAND_UNSPECIFIED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BAND_5GHZ_DFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BAND_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "BAND_24GHZ_5GHZ"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
+            scalar_value: {
+                uint32_t: 7
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "EACH_SCAN"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FULL_RESULTS"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "NO_BATCH"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "band"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
+        }
+        struct_value: {
+            name: "frequencies"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "periodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "eventReportScheme"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
+        }
+        struct_value: {
+            name: "exponentialMaxPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialBase"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "exponentialStepCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "basePeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxApPerScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdPercent"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "reportThresholdNumScans"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "buckets"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "txMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "lostMpdu"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "retries"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "beaconRx"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "avgRssiMgmt"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "wmeBePktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeBkPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeViPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+        struct_value: {
+            name: "wmeVoPktStats"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "onTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "txTimeInMsPerLevel"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "rxTimeInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "onTimeInMsForScan"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "iface"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
+        }
+        struct_value: {
+            name: "radio"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
+        }
+        struct_value: {
+            name: "timeStampInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "ssid"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "bssid"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "frequency"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "beaconPeriodInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "capability"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "informationElements"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "int32_t"
+
+            enumerator: "INTERRUPTED"
+            scalar_value: {
+                int32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaScanData"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "flags"
+            type: TYPE_MASK
+            scalar_type: "int32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
+        }
+        struct_value: {
+            name: "bucketsScanned"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "results"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxBlacklistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxWhitelistSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "bssidBlacklist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+        struct_value: {
+            name: "ssidWhitelist"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 32
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::StaRoamingState"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint8_t"
+
+            enumerator: "DISABLED"
+            scalar_value: {
+                uint8_t: 0
+            }
+            enumerator: "ENABLED"
+            scalar_value: {
+                uint8_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanStatusType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "INTERNAL_FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "PROTOCOL_FAILURE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "INVALID_SESSION_ID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "NO_RESOURCES_AVAILABLE"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "INVALID_ARGS"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "INVALID_PEER_ID"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "INVALID_NDP_ID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "NAN_NOT_ALLOWED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "NO_OTA_ACK"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "ALREADY_ENABLED"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
+            scalar_value: {
+                uint32_t: 12
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandIndex"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NAN_BAND_24GHZ"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "NAN_BAND_5GHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
+        }
+        struct_value: {
+            name: "description"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "MATCH_ONCE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "MATCH_CONTINUOUS"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MATCH_NEVER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNSOLICITED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SOLICITED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNSOLICITED_SOLICITED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTxType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BROADCAST"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "UNICAST"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "PASSIVE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ACTIVE"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSrfType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BLOOM_FILTER"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "PARTIAL_MAC_ADDR"
+            scalar_value: {
+                uint32_t: 1
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CHANNEL_NOT_REQUESTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "REQUEST_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FORCE_CHANNEL_SETUP"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rssiClose"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiMiddle"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiCloseProximity"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "dwellTimeMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "scanPeriodSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validDiscoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryWindowIntervalVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "validClusterIdVals"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "clusterIdBottomRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "clusterIdTopRangeVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "validIntfAddrVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddrVal"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "validOuiVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ouiVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "validRandomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "randomFactorForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validHopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "hopCountForceVal"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "validDiscoveryChannelVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "discoveryChannelMhzVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "validUseBeaconsInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useBeaconsInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "validUseSdfInBandVal"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "useSdfInBandVal"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "masterPref"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryAddressChangeIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableStartedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableJoinedClusterIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "includePublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfPublishServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "includeSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "numberOfSubscribeServiceIdsInBeacon"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "rssiWindowSize"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "macAddressRandomizationIntervalSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "acceptRangingRequests"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "bandSpecificConfig"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+                type: TYPE_STRUCT
+                struct_value: {
+                    name: "rssiClose"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiMiddle"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "rssiCloseProximity"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "dwellTimeMs"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+                struct_value: {
+                    name: "scanPeriodSec"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint16_t"
+                }
+                struct_value: {
+                    name: "validDiscoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "bool_t"
+                }
+                struct_value: {
+                    name: "discoveryWindowIntervalVal"
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "operateInBand"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+        }
+        struct_value: {
+            name: "hopCountMax"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "configParams"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
+        }
+        struct_value: {
+            name: "debugConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SHARED_KEY_128_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "SHARED_KEY_256_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "CONTINUOUS_INDICATION_MASK"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "INGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EGRESS_MET_MASK"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "sessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "ttlSec"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryWindowPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "discoveryCount"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "serviceName"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "discoveryMatchIndicator"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "rxMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "txMatchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "useRssiThreshold"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableDiscoveryTerminationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableMatchExpirationIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "disableFollowupReceivedIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "securityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingIntervalMsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "configRangingIndications"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+        struct_value: {
+            name: "distanceIngressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+        struct_value: {
+            name: "distanceEgressCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint16_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "publishType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
+        }
+        struct_value: {
+            name: "txType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "baseConfigs"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
+        }
+        struct_value: {
+            name: "subscribeType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
+        }
+        struct_value: {
+            name: "srfType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
+        }
+        struct_value: {
+            name: "srfRespondIfInAddressSet"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseSrf"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "isSsiRequiredForMatch"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "intfAddr"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_ARRAY
+                vector_size: 6
+                vector_value: {
+                    type: TYPE_SCALAR
+                    scalar_type: "uint8_t"
+                }
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "isHighPriority"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "shouldUseDiscoveryWindow"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "disableFollowupResultIndication"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "channelRequestType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "acceptRequest"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ifaceName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "supportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "pmk"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "maxConcurrentClusters"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxPublishes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceNameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxTotalMatchFilterLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxExtendedServiceSpecificInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxVsaDataLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdiInterfaces"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxNdpSessions"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxAppInfoLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxQueuedTransmitFollowupMsgs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "maxSubscribeInterfaceAddresses"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "supportedCipherSuites"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanMatchInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchFilter"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "matchOccuredInBeaconFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "outOfResourceFlag"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rssiValue"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerSupportedCipherTypes"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
+        }
+        struct_value: {
+            name: "peerRequiresSecurityEnabledInNdp"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerRequiresRanging"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rangingMeasurementInCm"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rangingIndicationType"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "receivedInFaw"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "serviceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "extendedServiceSpecificInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "STARTED_CLUSTER"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "JOINED_CLUSTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "eventType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
+        }
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "discoverySessionId"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "peerDiscMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "securityRequired"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ndpInstanceId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "dataPathSetupSuccess"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "peerNdiMacAddr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "appInfo"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttStatus"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FAILURE"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FAIL_NO_RSP"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FAIL_REJECTED"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FAIL_NOT_SCHEDULED_YET"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FAIL_TM_TIMEOUT"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "FAIL_NO_CAPABILITY"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "ABORTED"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "FAIL_INVALID_TS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "FAIL_PROTOCOL"
+            scalar_value: {
+                uint32_t: 10
+            }
+            enumerator: "FAIL_SCHEDULE"
+            scalar_value: {
+                uint32_t: 11
+            }
+            enumerator: "FAIL_BUSY_TRY_LATER"
+            scalar_value: {
+                uint32_t: 12
+            }
+            enumerator: "INVALID_REQ"
+            scalar_value: {
+                uint32_t: 13
+            }
+            enumerator: "NO_WIFI"
+            scalar_value: {
+                uint32_t: 14
+            }
+            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
+            scalar_value: {
+                uint32_t: 15
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPeerType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "AP"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "STA"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "P2P_GO"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "P2P_CLIENT"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "NAN"
+            scalar_value: {
+                uint32_t: 5
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttBw"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "BW_5MHZ"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "BW_10MHZ"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "BW_20MHZ"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "BW_40MHZ"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "BW_80MHZ"
+            scalar_value: {
+                uint32_t: 16
+            }
+            enumerator: "BW_160MHZ"
+            scalar_value: {
+                uint32_t: 32
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttPreamble"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "LEGACY"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HT"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "VHT"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ONE_SIDED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "TWO_SIDED"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttConfig"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "peer"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
+        }
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "burstPeriod"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numFramesPerBurst"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerRttFrame"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numRetriesPerFtmr"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "mustRequestLci"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "mustRequestLcr"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "burstDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bw"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResult"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "addr"
+            type: TYPE_ARRAY
+            vector_size: 6
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+        struct_value: {
+            name: "burstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "measurementNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "successNumber"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "numberPerBurstPeer"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "status"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
+        }
+        struct_value: {
+            name: "retryAfterDuration"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "type"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttType"
+        }
+        struct_value: {
+            name: "rssi"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "rssiSpread"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "txRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rxRate"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
+        }
+        struct_value: {
+            name: "rtt"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSd"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "rttSpread"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "distanceInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSdInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "distanceSpreadInMm"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "timeStampInUs"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "burstDurationInMs"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "negotiatedBurstNum"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "lci"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+        struct_value: {
+            name: "lcr"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttCapabilities"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rttOneSidedSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "rttFtmSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lciSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "lcrSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "responderSupported"
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+        struct_value: {
+            name: "preambleSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+        struct_value: {
+            name: "bwSupport"
+            type: TYPE_MASK
+            scalar_type: "uint32_t"
+            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
+        }
+        struct_value: {
+            name: "mcVersion"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NOT_EXPECTED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "EXPECTED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLciInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "latitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "longitude"
+            type: TYPE_SCALAR
+            scalar_type: "int64_t"
+        }
+        struct_value: {
+            name: "altitude"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "latitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "longitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "altitudeUnc"
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+        struct_value: {
+            name: "motionPattern"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
+        }
+        struct_value: {
+            name: "floor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightAboveFloor"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "heightUnc"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "countryCode"
+            type: TYPE_ARRAY
+            vector_size: 2
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "int8_t"
+            }
+        }
+        struct_value: {
+            name: "civicInfo"
+            type: TYPE_STRING
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::RttResponder"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "channel"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
+        }
+        struct_value: {
+            name: "preamble"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "HAS_BINARY_ENTRIES"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "HAS_ASCII_ENTRIES"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "HAS_PER_PACKET_ENTRIES"
+            scalar_value: {
+                uint32_t: 4
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ringName"
+            type: TYPE_STRING
+        }
+        struct_value: {
+            name: "flags"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ringId"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "sizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "freeSizeInBytes"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "verboseLevel"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "NONE"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "DEFAULT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "VERBOSE"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "EXCESSIVE"
+            scalar_value: {
+                uint32_t: 3
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "ACKED"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "SENT"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 9
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "SUCCESS"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "FW_QUEUED"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "FW_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 2
+            }
+            enumerator: "FW_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 3
+            }
+            enumerator: "FW_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 4
+            }
+            enumerator: "FW_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 5
+            }
+            enumerator: "DRV_QUEUED"
+            scalar_value: {
+                uint32_t: 6
+            }
+            enumerator: "DRV_DROP_FILTER"
+            scalar_value: {
+                uint32_t: 7
+            }
+            enumerator: "DRV_DROP_INVALID"
+            scalar_value: {
+                uint32_t: 8
+            }
+            enumerator: "DRV_DROP_NOBUFS"
+            scalar_value: {
+                uint32_t: 9
+            }
+            enumerator: "DRV_DROP_OTHER"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "UNKNOWN"
+            scalar_value: {
+                uint32_t: 0
+            }
+            enumerator: "ETHERNET_II"
+            scalar_value: {
+                uint32_t: 1
+            }
+            enumerator: "MGMT_80211"
+            scalar_value: {
+                uint32_t: 2
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "frameType"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
+        }
+        struct_value: {
+            name: "frameLen"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "driverTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "firmwareTimestampUsec"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+        struct_value: {
+            name: "frameContent"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "fate"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
+        }
+        struct_value: {
+            name: "frameInfo"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "rxUnicastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxMulticastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxBroadcastCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "ipv4RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "ipv6RxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "otherRxMulticastAddrCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "icmpPkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Pkt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ra"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Na"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "icmp6Ns"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    attribute: {
+        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "totalCmdEventWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "cmdEventWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalDriverFwLocalWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "driverFwLocalWakeCntPerType"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
+        }
+        struct_value: {
+            name: "totalRxPacketWakeCnt"
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        struct_value: {
+            name: "rxPktWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
+        }
+        struct_value: {
+            name: "rxMulticastPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
+        }
+        struct_value: {
+            name: "rxIcmpPkWakeDetails"
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
+        }
+    }
+
+    attribute: {
+        name: "::android::hidl::base::V1_0::DebugInfo"
+        type: TYPE_STRUCT
+        struct_value: {
+            name: "pid"
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        struct_value: {
+            name: "ptr"
+            type: TYPE_SCALAR
+            scalar_type: "uint64_t"
+        }
+    }
+
     api: {
         name: "onBackgroundScanFailure"
         arg: {
@@ -50,8 +2898,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
diff --git a/wifi/1.0/vts/types.vts b/wifi/1.0/vts/types.vts
index fc52b69..12a5060 100644
--- a/wifi/1.0/vts/types.vts
+++ b/wifi/1.0/vts/types.vts
@@ -383,6 +383,7 @@
     struct_value: {
         name: "eventReportScheme"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
     }
     struct_value: {
@@ -567,8 +568,8 @@
     struct_value: {
         name: "bssid"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -622,6 +623,7 @@
     struct_value: {
         name: "flags"
         type: TYPE_MASK
+        scalar_type: "int32_t"
         predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
     }
     struct_value: {
@@ -662,8 +664,8 @@
         type: TYPE_VECTOR
         vector_value: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -674,8 +676,8 @@
         type: TYPE_VECTOR
         vector_value: {
             type: TYPE_ARRAY
+            vector_size: 32
             vector_value: {
-                vector_size: 32
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -689,11 +691,11 @@
     enum_value: {
         scalar_type: "uint8_t"
 
-        enumerator: "ENABLED"
+        enumerator: "DISABLED"
         scalar_value: {
             uint8_t: 0
         }
-        enumerator: "DISABLED"
+        enumerator: "ENABLED"
         scalar_value: {
             uint8_t: 1
         }
@@ -920,7 +922,7 @@
         scalar_type: "uint8_t"
     }
     struct_value: {
-        name: "rssiProximity"
+        name: "rssiCloseProximity"
         type: TYPE_SCALAR
         scalar_type: "uint8_t"
     }
@@ -955,12 +957,12 @@
         scalar_type: "bool_t"
     }
     struct_value: {
-        name: "clusterIdLowVal"
+        name: "clusterIdBottomRangeVal"
         type: TYPE_SCALAR
         scalar_type: "uint16_t"
     }
     struct_value: {
-        name: "clusterIdHighVal"
+        name: "clusterIdTopRangeVal"
         type: TYPE_SCALAR
         scalar_type: "uint16_t"
     }
@@ -972,8 +974,8 @@
     struct_value: {
         name: "intfAddrVal"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -1015,7 +1017,8 @@
     }
     struct_value: {
         name: "discoveryChannelMhzVal"
-        type: TYPE_VECTOR
+        type: TYPE_ARRAY
+        vector_size: 2
         vector_value: {
             type: TYPE_SCALAR
             scalar_type: "uint32_t"
@@ -1028,7 +1031,8 @@
     }
     struct_value: {
         name: "useBeaconsInBandVal"
-        type: TYPE_VECTOR
+        type: TYPE_ARRAY
+        vector_size: 2
         vector_value: {
             type: TYPE_SCALAR
             scalar_type: "bool_t"
@@ -1041,7 +1045,8 @@
     }
     struct_value: {
         name: "useSdfInBandVal"
-        type: TYPE_VECTOR
+        type: TYPE_ARRAY
+        vector_size: 2
         vector_value: {
             type: TYPE_SCALAR
             scalar_type: "bool_t"
@@ -1073,12 +1078,22 @@
         scalar_type: "bool_t"
     }
     struct_value: {
-        name: "includeServiceIdsInBeacon"
+        name: "includePublishServiceIdsInBeacon"
         type: TYPE_SCALAR
         scalar_type: "bool_t"
     }
     struct_value: {
-        name: "numberOfServiceIdsInBeacon"
+        name: "numberOfPublishServiceIdsInBeacon"
+        type: TYPE_SCALAR
+        scalar_type: "uint8_t"
+    }
+    struct_value: {
+        name: "includeSubscribeServiceIdsInBeacon"
+        type: TYPE_SCALAR
+        scalar_type: "bool_t"
+    }
+    struct_value: {
+        name: "numberOfSubscribeServiceIdsInBeacon"
         type: TYPE_SCALAR
         scalar_type: "uint8_t"
     }
@@ -1099,10 +1114,46 @@
     }
     struct_value: {
         name: "bandSpecificConfig"
-        type: TYPE_VECTOR
+        type: TYPE_ARRAY
+        vector_size: 2
         vector_value: {
+            name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
             type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+            struct_value: {
+                name: "rssiClose"
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+            struct_value: {
+                name: "rssiMiddle"
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+            struct_value: {
+                name: "rssiCloseProximity"
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+            struct_value: {
+                name: "dwellTimeMs"
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+            struct_value: {
+                name: "scanPeriodSec"
+                type: TYPE_SCALAR
+                scalar_type: "uint16_t"
+            }
+            struct_value: {
+                name: "validDiscoveryWindowIntervalVal"
+                type: TYPE_SCALAR
+                scalar_type: "bool_t"
+            }
+            struct_value: {
+                name: "discoveryWindowIntervalVal"
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
         }
     }
 }
@@ -1112,7 +1163,8 @@
     type: TYPE_STRUCT
     struct_value: {
         name: "operateInBand"
-        type: TYPE_VECTOR
+        type: TYPE_ARRAY
+        vector_size: 2
         vector_value: {
             type: TYPE_SCALAR
             scalar_type: "bool_t"
@@ -1179,7 +1231,7 @@
     struct_value: {
         name: "sessionId"
         type: TYPE_SCALAR
-        scalar_type: "uint16_t"
+        scalar_type: "uint8_t"
     }
     struct_value: {
         name: "ttlSec"
@@ -1198,7 +1250,11 @@
     }
     struct_value: {
         name: "serviceName"
-        type: TYPE_STRING
+        type: TYPE_VECTOR
+        vector_value: {
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
     }
     struct_value: {
         name: "discoveryMatchIndicator"
@@ -1214,6 +1270,14 @@
         }
     }
     struct_value: {
+        name: "extendedServiceSpecificInfo"
+        type: TYPE_VECTOR
+        vector_value: {
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+    struct_value: {
         name: "rxMatchFilter"
         type: TYPE_VECTOR
         vector_value: {
@@ -1252,6 +1316,7 @@
     struct_value: {
         name: "supportedCipherTypes"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
     }
     struct_value: {
@@ -1280,17 +1345,18 @@
     struct_value: {
         name: "configRangingIndications"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
     }
     struct_value: {
         name: "distanceIngressCm"
         type: TYPE_SCALAR
-        scalar_type: "uint32_t"
+        scalar_type: "uint16_t"
     }
     struct_value: {
         name: "distanceEgressCm"
         type: TYPE_SCALAR
-        scalar_type: "uint32_t"
+        scalar_type: "uint16_t"
     }
 }
 
@@ -1352,8 +1418,8 @@
         type: TYPE_VECTOR
         vector_value: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -1367,7 +1433,7 @@
     struct_value: {
         name: "discoverySessionId"
         type: TYPE_SCALAR
-        scalar_type: "uint16_t"
+        scalar_type: "uint8_t"
     }
     struct_value: {
         name: "peerId"
@@ -1377,8 +1443,8 @@
     struct_value: {
         name: "addr"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -1394,7 +1460,15 @@
         scalar_type: "bool_t"
     }
     struct_value: {
-        name: "message"
+        name: "serviceSpecificInfo"
+        type: TYPE_VECTOR
+        vector_value: {
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+    struct_value: {
+        name: "extendedServiceSpecificInfo"
         type: TYPE_VECTOR
         vector_value: {
             type: TYPE_SCALAR
@@ -1419,8 +1493,8 @@
     struct_value: {
         name: "peerDiscMacAddr"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -1455,6 +1529,7 @@
     struct_value: {
         name: "supportedCipherTypes"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
     }
     struct_value: {
@@ -1500,6 +1575,7 @@
     struct_value: {
         name: "supportedCipherTypes"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
     }
     struct_value: {
@@ -1551,6 +1627,11 @@
         scalar_type: "uint32_t"
     }
     struct_value: {
+        name: "maxExtendedServiceSpecificInfoLen"
+        type: TYPE_SCALAR
+        scalar_type: "uint32_t"
+    }
+    struct_value: {
         name: "maxVsaDataLen"
         type: TYPE_SCALAR
         scalar_type: "uint32_t"
@@ -1583,6 +1664,7 @@
     struct_value: {
         name: "supportedCipherSuites"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
     }
 }
@@ -1593,7 +1675,7 @@
     struct_value: {
         name: "discoverySessionId"
         type: TYPE_SCALAR
-        scalar_type: "uint16_t"
+        scalar_type: "uint8_t"
     }
     struct_value: {
         name: "peerId"
@@ -1603,8 +1685,8 @@
     struct_value: {
         name: "addr"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -1618,6 +1700,14 @@
         }
     }
     struct_value: {
+        name: "extendedServiceSpecificInfo"
+        type: TYPE_VECTOR
+        vector_value: {
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+    struct_value: {
         name: "matchFilter"
         type: TYPE_VECTOR
         vector_value: {
@@ -1643,6 +1733,7 @@
     struct_value: {
         name: "peerSupportedCipherTypes"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
     }
     struct_value: {
@@ -1663,6 +1754,7 @@
     struct_value: {
         name: "rangingIndicationType"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
     }
 }
@@ -1673,7 +1765,7 @@
     struct_value: {
         name: "discoverySessionId"
         type: TYPE_SCALAR
-        scalar_type: "uint16_t"
+        scalar_type: "uint8_t"
     }
     struct_value: {
         name: "peerId"
@@ -1683,8 +1775,8 @@
     struct_value: {
         name: "addr"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -1695,7 +1787,15 @@
         scalar_type: "bool_t"
     }
     struct_value: {
-        name: "message"
+        name: "serviceSpecificInfo"
+        type: TYPE_VECTOR
+        vector_value: {
+            type: TYPE_SCALAR
+            scalar_type: "uint8_t"
+        }
+    }
+    struct_value: {
+        name: "extendedServiceSpecificInfo"
         type: TYPE_VECTOR
         vector_value: {
             type: TYPE_SCALAR
@@ -1736,8 +1836,8 @@
     struct_value: {
         name: "addr"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -1745,39 +1845,18 @@
 }
 
 attribute: {
-    name: "::android::hardware::wifi::V1_0::NanVsaRxFrameMask"
-    type: TYPE_ENUM
-    enum_value: {
-        scalar_type: "uint32_t"
-
-        enumerator: "DISCOVERY_BEACON_MASK"
-        scalar_value: {
-            uint32_t: 1
-        }
-        enumerator: "SYNC_BEACON_MASK"
-        scalar_value: {
-            uint32_t: 2
-        }
-        enumerator: "SERVICE_DISCOVERY_MASK"
-        scalar_value: {
-            uint32_t: 4
-        }
-    }
-}
-
-attribute: {
     name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
     type: TYPE_STRUCT
     struct_value: {
         name: "discoverySessionId"
         type: TYPE_SCALAR
-        scalar_type: "uint16_t"
+        scalar_type: "uint8_t"
     }
     struct_value: {
         name: "peerDiscMacAddr"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -1818,8 +1897,8 @@
     struct_value: {
         name: "peerNdiMacAddr"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -2018,8 +2097,8 @@
     struct_value: {
         name: "addr"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -2097,8 +2176,8 @@
     struct_value: {
         name: "addr"
         type: TYPE_ARRAY
+        vector_size: 6
         vector_value: {
-            vector_size: 6
             type: TYPE_SCALAR
             scalar_type: "uint8_t"
         }
@@ -2246,11 +2325,13 @@
     struct_value: {
         name: "preambleSupport"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
     }
     struct_value: {
         name: "bwSupport"
         type: TYPE_MASK
+        scalar_type: "uint32_t"
         predefined_type: "::android::hardware::wifi::V1_0::RttBw"
     }
     struct_value: {
@@ -2342,8 +2423,8 @@
     struct_value: {
         name: "countryCode"
         type: TYPE_ARRAY
+        vector_size: 2
         vector_value: {
-            vector_size: 2
             type: TYPE_SCALAR
             scalar_type: "int8_t"
         }