mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-06-12 02:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib: Add more args to fpi_ssm callbacks

Browse Source 
Pass the struct fp_dev and user_data to fpi_ssm callbacks, so that we
might be able to get rid of the fpi_ssm_get_user_data(), and
fpi_ssm_get_dev() as most drivers just get those from the ssm anyway
in their callbacks.
This commit is contained in:
Bastien Nocera
2018-09-18 13:46:39 +02:00
parent d34d7c26de
commit e397571f83
18 changed files with 112 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libfprint/drivers/aesx660.c
+6 -6
View File
@@ -195,7 +195,7 @@ static void finger_det_set_idle_cmd_cb(struct libusb_transfer *transfer)
libusb_free_transfer(transfer);
}
static void finger_det_sm_complete(fpi_ssm *ssm)
static void finger_det_sm_complete(fpi_ssm *ssm, struct fp_dev *_dev, void *user_data)
{
struct fp_img_dev *dev = fpi_ssm_get_user_data(ssm);
struct aesX660_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
@@ -215,7 +215,7 @@ static void finger_det_sm_complete(fpi_ssm *ssm)
}
}
static void finger_det_run_state(fpi_ssm *ssm)
static void finger_det_run_state(fpi_ssm *ssm, struct fp_dev *_dev, void *user_data)
{
switch (fpi_ssm_get_cur_state(ssm)) {
case FINGER_DET_SEND_LED_CMD:
@@ -370,7 +370,7 @@ out:
libusb_free_transfer(transfer);
}
static void capture_run_state(fpi_ssm *ssm)
static void capture_run_state(fpi_ssm *ssm, struct fp_dev *_dev, void *user_data)
{
struct fp_img_dev *dev = fpi_ssm_get_user_data(ssm);
struct aesX660_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
@@ -399,7 +399,7 @@ static void capture_run_state(fpi_ssm *ssm)
}
}
static void capture_sm_complete(fpi_ssm *ssm)
static void capture_sm_complete(fpi_ssm *ssm, struct fp_dev *_dev, void *user_data)
{
struct fp_img_dev *dev = fpi_ssm_get_user_data(ssm);
struct aesX660_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
@@ -532,7 +532,7 @@ out:
libusb_free_transfer(transfer);
}
static void activate_run_state(fpi_ssm *ssm)
static void activate_run_state(fpi_ssm *ssm, struct fp_dev *_dev, void *user_data)
{
struct fp_img_dev *dev = fpi_ssm_get_user_data(ssm);
struct aesX660_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
@@ -578,7 +578,7 @@ static void activate_run_state(fpi_ssm *ssm)
}
}
static void activate_sm_complete(fpi_ssm *ssm)
static void activate_sm_complete(fpi_ssm *ssm, struct fp_dev *_dev, void *user_data)
{
struct fp_img_dev *dev = fpi_ssm_get_user_data(ssm);
int err = fpi_ssm_get_error(ssm);