diff options
| author | Sasha Levitskiy <sanek@google.com> | 2014-12-11 06:49:36 -0800 |
|---|---|---|
| committer | Sasha Levitskiy <sanek@google.com> | 2015-02-17 15:57:35 -0800 |
| commit | 3b7402ef30efb03a40523d3745626e01b38e6f2a (patch) | |
| tree | 0e20ca94ccb5d09b071bb9a29140633af4db8499 /modules | |
| parent | 5d4ee176fb9b9c48505476a2200e20ecaca90353 (diff) | |
| download | hardware_libhardware-3b7402ef30efb03a40523d3745626e01b38e6f2a.zip hardware_libhardware-3b7402ef30efb03a40523d3745626e01b38e6f2a.tar.gz hardware_libhardware-3b7402ef30efb03a40523d3745626e01b38e6f2a.tar.bz2 | |
hardware: libhardware: introduce new fingerprint HAL 2.0 features.
Change-Id: I4ab0a511417742a4b0b912ebf98a3773ec22bb10
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/fingerprint/fingerprint.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/modules/fingerprint/fingerprint.c b/modules/fingerprint/fingerprint.c index 0346518..091d7ba 100644 --- a/modules/fingerprint/fingerprint.c +++ b/modules/fingerprint/fingerprint.c @@ -33,12 +33,27 @@ static int fingerprint_close(hw_device_t *dev) } static int fingerprint_enroll(struct fingerprint_device __unused *dev, + uint32_t __unused gid, uint32_t __unused timeout_sec) { return FINGERPRINT_ERROR; } +static int fingerprint_enroll_cancel(struct fingerprint_device __unused *dev) { + return FINGERPRINT_ERROR; +} + static int fingerprint_remove(struct fingerprint_device __unused *dev, - uint32_t __unused fingerprint_id) { + fingerprint_finger_id_t __unused fingerprint_id) { + return FINGERPRINT_ERROR; +} + +static int fingerprint_set_active_group(struct fingerprint_device __unused *dev, + uint32_t __unused gid) { + return FINGERPRINT_ERROR; +} + +static int fingerprint_authenticate(struct fingerprint_device __unused *dev, + uint64_t __unused operation_id) { return FINGERPRINT_ERROR; } @@ -61,12 +76,15 @@ static int fingerprint_open(const hw_module_t* module, const char __unused *id, memset(dev, 0, sizeof(fingerprint_device_t)); dev->common.tag = HARDWARE_DEVICE_TAG; - dev->common.version = HARDWARE_MODULE_API_VERSION(1, 0); + dev->common.version = FINGERPRINT_MODULE_API_VERSION_2_0; dev->common.module = (struct hw_module_t*) module; dev->common.close = fingerprint_close; dev->enroll = fingerprint_enroll; + dev->enroll_cancel = fingerprint_enroll_cancel; dev->remove = fingerprint_remove; + dev->set_active_group = fingerprint_set_active_group; + dev->authenticate = fingerprint_authenticate; dev->set_notify = set_notify_callback; dev->notify = NULL; @@ -81,7 +99,7 @@ static struct hw_module_methods_t fingerprint_module_methods = { fingerprint_module_t HAL_MODULE_INFO_SYM = { .common = { .tag = HARDWARE_MODULE_TAG, - .module_api_version = FINGERPRINT_MODULE_API_VERSION_1_0, + .module_api_version = FINGERPRINT_MODULE_API_VERSION_2_0, .hal_api_version = HARDWARE_HAL_API_VERSION, .id = FINGERPRINT_HARDWARE_MODULE_ID, .name = "Demo Fingerprint HAL", |