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

elanspi: Permit running in emulated environment

Browse source 
This removes the HID reset, which we cannot emulate currently and also
disabes the line timeout to as simulation might run too slowly at times.
This commit is contained in:
Matthew Mirvish 2021-06-21 14:24:27 -04:00 committed by Benjamin Berg
parent 019a294ec4
commit 8be666bb05
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libfprint/drivers/elanspi.c
View file

@ -93,6 +93,10 @@ G_DEFINE_TYPE (FpiDeviceElanSpi, fpi_device_elanspi, FP_TYPE_IMAGE_DEVICE);
static void static void
elanspi_do_hwreset (FpiDeviceElanSpi *self, GError **err) elanspi_do_hwreset (FpiDeviceElanSpi *self, GError **err)
{ {
/* Skip in emulation mode, since we don't mock hid devices */
if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
return;
/* /*
* TODO: Make this also work with the non-HID cases * TODO: Make this also work with the non-HID cases
*/ */
@ -474,8 +478,8 @@ elanspi_capture_old_handler (FpiSsm *ssm, FpDevice *dev)
/* is the sensor ready? */ /* is the sensor ready? */
if (!(self->sensor_status & 4)) if (!(self->sensor_status & 4))
{ {
/* has the timeout expired? */ /* has the timeout expired? -- disabled in testing since valgrind is very slow */
if (g_get_monotonic_time () > self->capture_timeout) if (g_get_monotonic_time () > self->capture_timeout && g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") != 0)
{ {
/* end with a timeout */ /* end with a timeout */
fpi_ssm_mark_failed (ssm, g_error_new (G_IO_ERROR, G_IO_ERROR_TIMED_OUT, "timed out waiting for new line")); fpi_ssm_mark_failed (ssm, g_error_new (G_IO_ERROR, G_IO_ERROR_TIMED_OUT, "timed out waiting for new line"));