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

vfs0051: Use named SSMs for usb async exchanges

Browse source
This commit is contained in:
Marco Trevisan (Treviño) 2019-12-04 20:14:49 +01:00
parent a522e3fd6f
commit a64ac2296b
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libfprint/drivers/vfs5011.c
View file

@ -190,11 +190,13 @@ usbexchange_loop (FpiSsm *ssm, FpDevice *_dev)
static void static void
usb_exchange_async (FpiSsm *ssm, usb_exchange_async (FpiSsm *ssm,
struct usbexchange_data *data) struct usbexchange_data *data,
const char *exchange_name)
{ {
FpiSsm *subsm = fpi_ssm_new (FP_DEVICE (data->device), FpiSsm *subsm = fpi_ssm_new_full (FP_DEVICE (data->device),
usbexchange_loop, usbexchange_loop,
data->stepcount); data->stepcount,
exchange_name);
fpi_ssm_set_data (subsm, data, NULL); fpi_ssm_set_data (subsm, data, NULL);
fpi_ssm_start_subsm (ssm, subsm); fpi_ssm_start_subsm (ssm, subsm);
@ -684,7 +686,7 @@ activate_loop (FpiSsm *ssm, FpDevice *_dev)
self->init_sequence.receive_buf = self->init_sequence.receive_buf =
g_malloc0 (VFS5011_RECEIVE_BUF_SIZE); g_malloc0 (VFS5011_RECEIVE_BUF_SIZE);
self->init_sequence.timeout = 1000; self->init_sequence.timeout = 1000;
usb_exchange_async (ssm, &self->init_sequence); usb_exchange_async (ssm, &self->init_sequence, "ACTIVATE REQUEST");
break; break;
case DEV_ACTIVATE_INIT_COMPLETE: case DEV_ACTIVATE_INIT_COMPLETE:
@ -716,7 +718,7 @@ activate_loop (FpiSsm *ssm, FpDevice *_dev)
self->init_sequence.receive_buf = self->init_sequence.receive_buf =
g_malloc0 (VFS5011_RECEIVE_BUF_SIZE); g_malloc0 (VFS5011_RECEIVE_BUF_SIZE);
self->init_sequence.timeout = VFS5011_DEFAULT_WAIT_TIMEOUT; self->init_sequence.timeout = VFS5011_DEFAULT_WAIT_TIMEOUT;
usb_exchange_async (ssm, &self->init_sequence); usb_exchange_async (ssm, &self->init_sequence, "PREPARE CAPTURE");
break; break;
} }
@ -769,7 +771,7 @@ open_loop (FpiSsm *ssm, FpDevice *_dev)
self->init_sequence.receive_buf = self->init_sequence.receive_buf =
g_malloc0 (VFS5011_RECEIVE_BUF_SIZE); g_malloc0 (VFS5011_RECEIVE_BUF_SIZE);
self->init_sequence.timeout = VFS5011_DEFAULT_WAIT_TIMEOUT; self->init_sequence.timeout = VFS5011_DEFAULT_WAIT_TIMEOUT;
usb_exchange_async (ssm, &self->init_sequence); usb_exchange_async (ssm, &self->init_sequence, "DEVICE OPEN");
break; break;
} }
; ;