Merge "Update vts files for nfc hidl file style change." (d483665b) · Commits · e / os / android_hardware_interfaces

nfc/1.0/vts/Nfc.vts

+62 −59

Original line number	Diff line number	Diff line
		component_class: HAL_HIDL
		component_type: NFC
		component_type_version: 1.0
		component_name: "INfc"

		@@ -29,13 +28,16 @@ interface: {
		scalar_type: "int32_t"
		}
		arg: {
		type: TYPE_STRUCT
		predefined_type: "nfc_data_t"
		type: TYPE_VECTOR
		vector_value: {
		type: TYPE_SCALAR
		scalar_type: "uint8_t"
		}
		}
		}

		api: {
		name: "core_initialized"
		name: "coreInitialized"
		return_type_hidl: {
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		@@ -50,7 +52,7 @@ interface: {
		}

		api: {
		name: "pre_discover"
		name: "prediscover"
		return_type_hidl: {
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		@@ -66,7 +68,7 @@ interface: {
		}

		api: {
		name: "control_granted"
		name: "controlGranted"
		return_type_hidl: {
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		@@ -74,10 +76,11 @@ interface: {
		}

		api: {
		name: "power_cycle"
		name: "powerCycle"
		return_type_hidl: {
		type: TYPE_SCALAR
		scalar_type: "int32_t"
		}
		}

		}

nfc/1.0/vts/NfcClientCallback.vts

+20 −18

Original line number	Diff line number	Diff line
		component_class: HAL_HIDL
		component_type: NFC
		component_type_version: 1.0
		component_name: "INfcClientCallback"

		@@ -12,20 +11,23 @@ interface: {
		name: "sendEvent"
		arg: {
		type: TYPE_ENUM
		predefined_type: "nfc_event_t"
		predefined_type: "NfcEvent"
		}
		arg: {
		type: TYPE_ENUM
		predefined_type: "nfc_status_t"
		predefined_type: "NfcStatus"
		}
		}

		api: {
		name: "sendData"
		arg: {
		type: TYPE_STRUCT
		predefined_type: "nfc_data_t"
		is_const: true
		type: TYPE_VECTOR
		vector_value: {
		type: TYPE_SCALAR
		scalar_type: "uint8_t"
		}
		}
		}

		}

nfc/1.0/vts/types.vts

+56 −70

Original line number	Diff line number	Diff line
		component_class: HAL_HIDL
		component_type: NFC
		component_type_version: 1.0
		component_name: "types"

		package: "android.hardware.nfc"

		attribute: {
		name: "nfc_event_t"
		name: "NfcEvent"
		type: TYPE_ENUM
		enum_value: {
		scalar_type: "uint32_t"

		enumerator: "HAL_NFC_OPEN_CPLT_EVT"
		enumerator: "OPEN_CPLT"
		scalar_value: {
		uint32_t: 0
		}
		enumerator: "HAL_NFC_CLOSE_CPLT_EVT"
		enumerator: "CLOSE_CPLT"
		scalar_value: {
		uint32_t: 1
		}
		enumerator: "HAL_NFC_POST_INIT_CPLT_EVT"
		enumerator: "POST_INIT_CPLT"
		scalar_value: {
		uint32_t: 2
		}
		enumerator: "HAL_NFC_PRE_DISCOVER_CPLT_EVT"
		enumerator: "PRE_DISCOVER_CPLT"
		scalar_value: {
		uint32_t: 3
		}
		enumerator: "HAL_NFC_REQUEST_CONTROL_EVT"
		enumerator: "REQUEST_CONTROL"
		scalar_value: {
		uint32_t: 4
		}
		enumerator: "HAL_NFC_RELEASE_CONTROL_EVT"
		enumerator: "RELEASE_CONTROL"
		scalar_value: {
		uint32_t: 5
		}
		enumerator: "HAL_NFC_ERROR_EVT"
		enumerator: "ERROR"
		scalar_value: {
		uint32_t: 6
		}
		@@ -43,44 +42,31 @@ attribute: {
		}

		attribute: {
		name: "nfc_status_t"
		name: "NfcStatus"
		type: TYPE_ENUM
		enum_value: {
		scalar_type: "uint32_t"

		enumerator: "HAL_NFC_STATUS_OK"
		enumerator: "OK"
		scalar_value: {
		uint32_t: 0
		}
		enumerator: "HAL_NFC_STATUS_FAILED"
		enumerator: "FAILED"
		scalar_value: {
		uint32_t: 1
		}
		enumerator: "HAL_NFC_STATUS_ERR_TRANSPORT"
		enumerator: "ERR_TRANSPORT"
		scalar_value: {
		uint32_t: 2
		}
		enumerator: "HAL_NFC_STATUS_ERR_CMD_TIMEOUT"
		enumerator: "ERR_CMD_TIMEOUT"
		scalar_value: {
		uint32_t: 3
		}
		enumerator: "HAL_NFC_STATUS_REFUSED"
		enumerator: "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"
		}
		}
		}