depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vfs5011: make '5 scans per enroll' work with this driver

Browse source 
Restart scan if core did not ask to terminate it explicitly.
This commit is contained in:
Vasily Khoruzhick 2015-08-30 16:36:58 -07:00
parent d9567002e4
commit 9f7e1ecf40
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libfprint/drivers/vfs5011.c
View file

@ -77,6 +77,8 @@ struct usbexchange_data {
int timeout; int timeout;
}; };
static void start_scan(struct fp_img_dev *dev);
static void async_send_cb(struct libusb_transfer *transfer) static void async_send_cb(struct libusb_transfer *transfer)
{ {
struct fpi_ssm *ssm = transfer->user_data; struct fpi_ssm *ssm = transfer->user_data;
@ -869,19 +871,22 @@ static void activate_loop_complete(struct fpi_ssm *ssm)
if (data->init_sequence.receive_buf != NULL) if (data->init_sequence.receive_buf != NULL)
g_free(data->init_sequence.receive_buf); g_free(data->init_sequence.receive_buf);
data->init_sequence.receive_buf = NULL; data->init_sequence.receive_buf = NULL;
data->loop_running = FALSE;
submit_image(ssm, data); submit_image(ssm, data);
fpi_imgdev_report_finger_status(dev, FALSE); fpi_imgdev_report_finger_status(dev, FALSE);
fpi_ssm_free(ssm); fpi_ssm_free(ssm);
if (r) data->loop_running = FALSE;
fpi_imgdev_session_error(dev, r);
if (data->deactivating) if (data->deactivating) {
fpi_imgdev_deactivate_complete(dev); fpi_imgdev_deactivate_complete(dev);
} else if (r) {
fpi_imgdev_session_error(dev, r);
} else {
start_scan(dev);
}
} }
static void open_loop(struct fpi_ssm *ssm) static void open_loop(struct fpi_ssm *ssm)
{ {
struct fp_img_dev *dev = (struct fp_img_dev *)ssm->priv; struct fp_img_dev *dev = (struct fp_img_dev *)ssm->priv;
@ -928,8 +933,6 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data)
(unsigned char *)g_malloc0(MAXLINES * VFS5011_IMAGE_WIDTH); (unsigned char *)g_malloc0(MAXLINES * VFS5011_IMAGE_WIDTH);
dev->priv = data; dev->priv = data;
dev->dev->nr_enroll_stages = 1;
r = libusb_reset_device(dev->udev); r = libusb_reset_device(dev->udev);
if (r != 0) { if (r != 0) {
fp_err("Failed to reset the device"); fp_err("Failed to reset the device");
@ -963,21 +966,28 @@ static void dev_close(struct fp_img_dev *dev)
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }
static int dev_activate(struct fp_img_dev *dev, enum fp_imgdev_state state) static void start_scan(struct fp_img_dev *dev)
{ {
struct vfs5011_data *data = (struct vfs5011_data *)dev->priv; struct vfs5011_data *data = (struct vfs5011_data *)dev->priv;
struct fpi_ssm *ssm; struct fpi_ssm *ssm;
fp_dbg("device initialized");
data->deactivating = FALSE;
data->loop_running = TRUE; data->loop_running = TRUE;
fp_dbg("creating ssm"); fp_dbg("creating ssm");
ssm = fpi_ssm_new(dev->dev, activate_loop, DEV_ACTIVATE_NUM_STATES); ssm = fpi_ssm_new(dev->dev, activate_loop, DEV_ACTIVATE_NUM_STATES);
ssm->priv = dev; ssm->priv = dev;
fp_dbg("starting ssm"); fp_dbg("starting ssm");
fpi_ssm_start(ssm, activate_loop_complete); fpi_ssm_start(ssm, activate_loop_complete);
fp_dbg("ssm done, getting out"); fp_dbg("ssm done, getting out");
}
static int dev_activate(struct fp_img_dev *dev, enum fp_imgdev_state state)
{
struct vfs5011_data *data = (struct vfs5011_data *)dev->priv;
fp_dbg("device initialized");
data->deactivating = FALSE;
start_scan(dev);
return 0; return 0;
} }