Merge \\"[qemu]: Remove qemu_pipe.h and qemud.h headers.\\" am: 851f91adce
am: 45e04a28bb
Change-Id: I41eba6052fecba64ea538f0fd8c67bc580d5cb58
diff --git a/include/hardware/fingerprint.h b/include/hardware/fingerprint.h
index b567732..618ca7e 100644
--- a/include/hardware/fingerprint.h
+++ b/include/hardware/fingerprint.h
@@ -50,7 +50,6 @@
FINGERPRINT_ERROR_NO_SPACE = 4, /* No space available to store a template */
FINGERPRINT_ERROR_CANCELED = 5, /* The current operation can't proceed. See above. */
FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6, /* fingerprint with given id can't be removed */
- FINGERPRINT_ERROR_LOCKOUT = 7, /* the functionality is temporarily locked out */
FINGERPRINT_ERROR_VENDOR_BASE = 1000 /* vendor-specific error messages start here */
} fingerprint_error_t;
@@ -251,16 +250,8 @@
*/
int (*authenticate)(struct fingerprint_device *dev, uint64_t operation_id, uint32_t gid);
- /*
- * Resets a lockout by providing a valid hardware authentication token.
- *
- * Function return: 0 on success
- * or a negative number in case of error, generally from the errno.h set.
- */
- int (*reset_lockout)(struct fingerprint_device *dev, const hw_auth_token_t *hat);
-
/* Reserved for backward binary compatibility */
- void *reserved[3];
+ void *reserved[4];
} fingerprint_device_t;
typedef struct fingerprint_module {