merge in nyc-release history after reset to nyc-dev
diff --git a/include/hardware/bt_common_types.h b/include/hardware/bt_common_types.h
index 77c845b..01b5256 100644
--- a/include/hardware/bt_common_types.h
+++ b/include/hardware/bt_common_types.h
@@ -52,7 +52,7 @@
typedef struct
{
- uint8_t id;
+ uint16_t id;
bt_uuid_t uuid;
bt_gatt_db_attribute_type_t type;
uint16_t attribute_handle;
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 {
