Commit be68bacc authored by Bastien Nocera's avatar Bastien Nocera

lib: Merge two other async callback types

Merge fp_capture_cb and fp_verify_cb.

https://bugs.freedesktop.org/show_bug.cgi?id=106551
parent 317d7bc9
...@@ -250,7 +250,7 @@ API_EXPORTED int fp_async_enroll_stop(struct fp_dev *dev, ...@@ -250,7 +250,7 @@ API_EXPORTED int fp_async_enroll_stop(struct fp_dev *dev,
* Returns: * Returns:
*/ */
API_EXPORTED int fp_async_verify_start(struct fp_dev *dev, 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; struct fp_driver *drv = dev->drv;
int r; int r;
...@@ -486,7 +486,7 @@ void fpi_drvcb_identify_stopped(struct fp_dev *dev) ...@@ -486,7 +486,7 @@ void fpi_drvcb_identify_stopped(struct fp_dev *dev)
* Returns: * Returns:
*/ */
API_EXPORTED int fp_async_capture_start(struct fp_dev *dev, int unconditional, 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; struct fp_driver *drv = dev->drv;
int r; int r;
......
...@@ -125,7 +125,7 @@ struct fp_dev { ...@@ -125,7 +125,7 @@ struct fp_dev {
void *enroll_stage_cb_data; void *enroll_stage_cb_data;
fp_operation_stop_cb enroll_stop_cb; fp_operation_stop_cb enroll_stop_cb;
void *enroll_stop_cb_data; void *enroll_stop_cb_data;
fp_verify_cb verify_cb; fp_img_operation_cb verify_cb;
void *verify_cb_data; void *verify_cb_data;
fp_operation_stop_cb verify_stop_cb; fp_operation_stop_cb verify_stop_cb;
void *verify_stop_cb_data; void *verify_stop_cb_data;
...@@ -133,7 +133,7 @@ struct fp_dev { ...@@ -133,7 +133,7 @@ struct fp_dev {
void *identify_cb_data; void *identify_cb_data;
fp_operation_stop_cb identify_stop_cb; fp_operation_stop_cb identify_stop_cb;
void *identify_stop_cb_data; void *identify_stop_cb_data;
fp_capture_cb capture_cb; fp_img_operation_cb capture_cb;
void *capture_cb_data; void *capture_cb_data;
fp_operation_stop_cb capture_stop_cb; fp_operation_stop_cb capture_stop_cb;
void *capture_stop_cb_data; void *capture_stop_cb_data;
......
...@@ -324,6 +324,8 @@ void fp_set_debug(int level); ...@@ -324,6 +324,8 @@ void fp_set_debug(int level);
/* Asynchronous I/O */ /* Asynchronous I/O */
typedef void (*fp_operation_stop_cb)(struct fp_dev *dev, void *user_data); 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); 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, 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, ...@@ -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, int fp_async_enroll_stop(struct fp_dev *dev, fp_operation_stop_cb callback,
void *user_data); 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, 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, int fp_async_verify_stop(struct fp_dev *dev, fp_operation_stop_cb callback,
void *user_data); void *user_data);
...@@ -356,9 +356,7 @@ int fp_async_identify_start(struct fp_dev *dev, struct fp_print_data **gallery, ...@@ -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, int fp_async_identify_stop(struct fp_dev *dev, fp_operation_stop_cb callback,
void *user_data); void *user_data);
typedef void (*fp_capture_cb)(struct fp_dev *dev, int result, int fp_async_capture_start(struct fp_dev *dev, int unconditional, fp_img_operation_cb callback, void *user_data);
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_stop(struct fp_dev *dev, fp_operation_stop_cb callback, void *user_data); int fp_async_capture_stop(struct fp_dev *dev, fp_operation_stop_cb callback, void *user_data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment