From be68bacc94dc200a6d924c5b2383e1d8e0093b0f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 22 May 2018 17:18:37 +0200
Subject: [PATCH] lib: Merge two other async callback types
Merge fp_capture_cb and fp_verify_cb.
https://bugs.freedesktop.org/show_bug.cgi?id=106551
---
libfprint/async.c | 4 ++--
libfprint/fp_internal.h | 4 ++--
libfprint/fprint.h | 10 ++++------
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/libfprint/async.c b/libfprint/async.c
index c1f2aaa..07c20c3 100644
--- a/libfprint/async.c
+++ b/libfprint/async.c
@@ -250,7 +250,7 @@ API_EXPORTED int fp_async_enroll_stop(struct fp_dev *dev,
* Returns:
*/
API_EXPORTED int fp_async_verify_start(struct fp_dev *dev,
- struct fp_print_data *data, fp_verify_cb callback, void *user_data)
+ struct fp_print_data *data, fp_img_operation_cb callback, void *user_data)
{
struct fp_driver *drv = dev->drv;
int r;
@@ -486,7 +486,7 @@ void fpi_drvcb_identify_stopped(struct fp_dev *dev)
* Returns:
*/
API_EXPORTED int fp_async_capture_start(struct fp_dev *dev, int unconditional,
- fp_capture_cb callback, void *user_data)
+ fp_img_operation_cb callback, void *user_data)
{
struct fp_driver *drv = dev->drv;
int r;
diff --git a/libfprint/fp_internal.h b/libfprint/fp_internal.h
index 694294c..5e3522b 100644
--- a/libfprint/fp_internal.h
+++ b/libfprint/fp_internal.h
@@ -125,7 +125,7 @@ struct fp_dev {
void *enroll_stage_cb_data;
fp_operation_stop_cb enroll_stop_cb;
void *enroll_stop_cb_data;
- fp_verify_cb verify_cb;
+ fp_img_operation_cb verify_cb;
void *verify_cb_data;
fp_operation_stop_cb verify_stop_cb;
void *verify_stop_cb_data;
@@ -133,7 +133,7 @@ struct fp_dev {
void *identify_cb_data;
fp_operation_stop_cb identify_stop_cb;
void *identify_stop_cb_data;
- fp_capture_cb capture_cb;
+ fp_img_operation_cb capture_cb;
void *capture_cb_data;
fp_operation_stop_cb capture_stop_cb;
void *capture_stop_cb_data;
diff --git a/libfprint/fprint.h b/libfprint/fprint.h
index ad54c4f..20888d6 100644
--- a/libfprint/fprint.h
+++ b/libfprint/fprint.h
@@ -324,6 +324,8 @@ void fp_set_debug(int level);
/* Asynchronous I/O */
typedef void (*fp_operation_stop_cb)(struct fp_dev *dev, void *user_data);
+typedef void (*fp_img_operation_cb)(struct fp_dev *dev, int result,
+ struct fp_img *img, void *user_data);
typedef void (*fp_dev_open_cb)(struct fp_dev *dev, int status, void *user_data);
int fp_async_dev_open(struct fp_dscv_dev *ddev, fp_dev_open_cb callback,
@@ -340,10 +342,8 @@ int fp_async_enroll_start(struct fp_dev *dev, fp_enroll_stage_cb callback,
int fp_async_enroll_stop(struct fp_dev *dev, fp_operation_stop_cb callback,
void *user_data);
-typedef void (*fp_verify_cb)(struct fp_dev *dev, int result,
- struct fp_img *img, void *user_data);
int fp_async_verify_start(struct fp_dev *dev, struct fp_print_data *data,
- fp_verify_cb callback, void *user_data);
+ fp_img_operation_cb callback, void *user_data);
int fp_async_verify_stop(struct fp_dev *dev, fp_operation_stop_cb callback,
void *user_data);
@@ -356,9 +356,7 @@ int fp_async_identify_start(struct fp_dev *dev, struct fp_print_data **gallery,
int fp_async_identify_stop(struct fp_dev *dev, fp_operation_stop_cb callback,
void *user_data);
-typedef void (*fp_capture_cb)(struct fp_dev *dev, int result,
- struct fp_img *img, void *user_data);
-int fp_async_capture_start(struct fp_dev *dev, int unconditional, fp_capture_cb callback, void *user_data);
+int fp_async_capture_start(struct fp_dev *dev, int unconditional, fp_img_operation_cb callback, void *user_data);
int fp_async_capture_stop(struct fp_dev *dev, fp_operation_stop_cb callback, void *user_data);