Merge "Update vts files for nfc hidl file style change."
diff --git a/nfc/1.0/vts/Nfc.vts b/nfc/1.0/vts/Nfc.vts
index 8b3330f..1f50698 100644
--- a/nfc/1.0/vts/Nfc.vts
+++ b/nfc/1.0/vts/Nfc.vts
@@ -1,5 +1,4 @@
component_class: HAL_HIDL
-component_type: NFC
component_type_version: 1.0
component_name: "INfc"
@@ -9,75 +8,79 @@
import: "android.hardware.nfc@1.0::types"
interface: {
- api: {
- name: "open"
- return_type_hidl: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
+ api: {
+ name: "open"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ arg: {
+ type: TYPE_HIDL_CALLBACK
+ predefined_type: "INfcClientCallback"
+ is_callback: true
+ }
}
- arg: {
- type: TYPE_HIDL_CALLBACK
- predefined_type: "INfcClientCallback"
- is_callback: true
- }
- }
- api: {
- name: "write"
- return_type_hidl: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
+ api: {
+ name: "write"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
}
- arg: {
- type: TYPE_STRUCT
- predefined_type: "nfc_data_t"
- }
- }
- api: {
- name: "core_initialized"
- return_type_hidl: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
+ api: {
+ name: "coreInitialized"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
}
- arg: {
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_SCALAR
- scalar_type: "uint8_t"
- }
- }
- }
- api: {
- name: "pre_discover"
- return_type_hidl: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
+ api: {
+ name: "prediscover"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
}
- }
- api: {
- name: "close"
- return_type_hidl: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
+ api: {
+ name: "close"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
}
- }
- api: {
- name: "control_granted"
- return_type_hidl: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
+ api: {
+ name: "controlGranted"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
}
- }
- api: {
- name: "power_cycle"
- return_type_hidl: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
+ api: {
+ name: "powerCycle"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
}
- }
+
}
diff --git a/nfc/1.0/vts/NfcClientCallback.vts b/nfc/1.0/vts/NfcClientCallback.vts
index aab8c27..e2a3e5b 100644
--- a/nfc/1.0/vts/NfcClientCallback.vts
+++ b/nfc/1.0/vts/NfcClientCallback.vts
@@ -1,5 +1,4 @@
component_class: HAL_HIDL
-component_type: NFC
component_type_version: 1.0
component_name: "INfcClientCallback"
@@ -8,24 +7,27 @@
import: "android.hardware.nfc@1.0::types"
interface: {
- api: {
- name: "sendEvent"
- arg: {
- type: TYPE_ENUM
- predefined_type: "nfc_event_t"
+ api: {
+ name: "sendEvent"
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "NfcEvent"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "NfcStatus"
+ }
}
- arg: {
- type: TYPE_ENUM
- predefined_type: "nfc_status_t"
- }
- }
- api: {
- name: "sendData"
- arg: {
- type: TYPE_STRUCT
- predefined_type: "nfc_data_t"
- is_const: true
+ api: {
+ name: "sendData"
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
}
- }
+
}
diff --git a/nfc/1.0/vts/types.vts b/nfc/1.0/vts/types.vts
index bd5d1f4..969a8af 100644
--- a/nfc/1.0/vts/types.vts
+++ b/nfc/1.0/vts/types.vts
@@ -1,86 +1,72 @@
component_class: HAL_HIDL
-component_type: NFC
component_type_version: 1.0
component_name: "types"
package: "android.hardware.nfc"
attribute: {
- name: "nfc_event_t"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
+ name: "NfcEvent"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "uint32_t"
- enumerator: "HAL_NFC_OPEN_CPLT_EVT"
- scalar_value: {
- uint32_t: 0
+ enumerator: "OPEN_CPLT"
+ scalar_value: {
+ uint32_t: 0
+ }
+ enumerator: "CLOSE_CPLT"
+ scalar_value: {
+ uint32_t: 1
+ }
+ enumerator: "POST_INIT_CPLT"
+ scalar_value: {
+ uint32_t: 2
+ }
+ enumerator: "PRE_DISCOVER_CPLT"
+ scalar_value: {
+ uint32_t: 3
+ }
+ enumerator: "REQUEST_CONTROL"
+ scalar_value: {
+ uint32_t: 4
+ }
+ enumerator: "RELEASE_CONTROL"
+ scalar_value: {
+ uint32_t: 5
+ }
+ enumerator: "ERROR"
+ scalar_value: {
+ uint32_t: 6
+ }
}
- enumerator: "HAL_NFC_CLOSE_CPLT_EVT"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "HAL_NFC_POST_INIT_CPLT_EVT"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "HAL_NFC_PRE_DISCOVER_CPLT_EVT"
- scalar_value: {
- uint32_t: 3
- }
- enumerator: "HAL_NFC_REQUEST_CONTROL_EVT"
- scalar_value: {
- uint32_t: 4
- }
- enumerator: "HAL_NFC_RELEASE_CONTROL_EVT"
- scalar_value: {
- uint32_t: 5
- }
- enumerator: "HAL_NFC_ERROR_EVT"
- scalar_value: {
- uint32_t: 6
- }
- }
}
attribute: {
- name: "nfc_status_t"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
+ name: "NfcStatus"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "uint32_t"
- enumerator: "HAL_NFC_STATUS_OK"
- scalar_value: {
- uint32_t: 0
+ enumerator: "OK"
+ scalar_value: {
+ uint32_t: 0
+ }
+ enumerator: "FAILED"
+ scalar_value: {
+ uint32_t: 1
+ }
+ enumerator: "ERR_TRANSPORT"
+ scalar_value: {
+ uint32_t: 2
+ }
+ enumerator: "ERR_CMD_TIMEOUT"
+ scalar_value: {
+ uint32_t: 3
+ }
+ enumerator: "REFUSED"
+ scalar_value: {
+ uint32_t: 4
+ }
}
- enumerator: "HAL_NFC_STATUS_FAILED"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "HAL_NFC_STATUS_ERR_TRANSPORT"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "HAL_NFC_STATUS_ERR_CMD_TIMEOUT"
- scalar_value: {
- uint32_t: 3
- }
- enumerator: "HAL_NFC_STATUS_REFUSED"
- scalar_value: {
- uint32_t: 4
- }
- }
-}
-
-attribute: {
- name: "nfc_data_t"
- type: TYPE_STRUCT
- struct_value: {
- name: "data"
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_SCALAR
- scalar_type: "uint8_t"
- }
- }
}