114 changed files with 1667 additions and 41406 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,6 +1,6 @@
 include:
  - local: '.gitlab-ci/libfprint-templates.yaml'
-  - project: 'freedesktop/ci-templates'
+  - project: 'wayland/ci-templates'
    ref: master
    file: '/templates/fedora.yml'
  - remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/master/flatpak/flatpak_ci_initiative.yml'
@ -9,7 +9,6 @@ variables:
  extends: .libfprint_common_variables
  FDO_DISTRIBUTION_TAG: latest
  FDO_DISTRIBUTION_VERSION: rawhide
-  FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
  FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
  BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
  LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
@ -20,7 +19,7 @@ stages:
  - test
  - flatpak

-image: $FEDORA_IMAGE
+image: "$FEDORA_IMAGE"

 .build_one_driver_template: &build_one_driver
  script:
@ -53,8 +52,7 @@ build:
  artifacts:
    expose_as: "HTML Documentation"
    paths:
-    - _build/doc/html
-    - _build/doc/html/index.html
+    - _build/doc/html/
    expire_in: 1 week

 test:
@ -69,11 +67,8 @@ test:
    - ninja -C _build coverage
    - cat _build/meson-logs/coverage.txt
  artifacts:
-    expose_as: 'Coverage Report'
-    when: always
    paths:
      - _build/meson-logs
-      - _build/meson-logs/coveragereport/index.html
    expire_in: 1 week
  coverage: '/^TOTAL.*\s+(\d+\%)$/'

@ -86,14 +81,6 @@ test_valgrind:
    - meson -Ddrivers=all . _build
    - ninja -C _build
    - meson test -C _build --print-errorlogs --no-stdsplit --setup=valgrind
-  artifacts:
-    expose_as: 'Valgrind test logs'
-    when: always
-    paths:
-      - _build/meson-logs
-      - _build/meson-logs/testlog-valgrind.txt
-    expire_in: 1 week
-

 test_scan_build:
  stage: test
@ -103,8 +90,10 @@ test_scan_build:
  allow_failure: true
  script:
    - meson -Ddrivers=all . _build
-    # Wrapper to add --status-bugs and disable malloc checker
+    # This is ugly, the wrapper disables the malloc checker
    - SCANBUILD=$CI_PROJECT_DIR/.gitlab-ci/scan-build ninja -C _build scan-build
+    # Check that the directory is empty
+    - "! ls -A _build/meson-logs/scanbuild | grep -q ."
  artifacts:
    paths:
      - _build/meson-logs
@ -160,15 +149,5 @@ container_fedora_build:
      - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
  variables:
    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
-    FDO_FORCE_REBUILD: 1
    # a list of packages to install
-    FDO_DISTRIBUTION_PACKAGES:
-      $LIBFPRINT_DEPENDENCIES
-      vala
-      libpcap-devel
-      libudev-devel
-    FDO_DISTRIBUTION_EXEC: |
-      git clone https://github.com/martinpitt/umockdev.git && \
-        cd umockdev && \
-        meson _build --prefix=/usr && \
-        ninja -C _build && ninja -C _build install
+    FDO_DISTRIBUTION_PACKAGES: $LIBFPRINT_DEPENDENCIES
--- a/.gitlab-ci/libfprint-templates.yaml
+++ b/.gitlab-ci/libfprint-templates.yaml
@ -13,7 +13,6 @@
    gtk3-devel
    libabigail
    libgusb-devel
-    libgudev-devel
    libX11-devel
    libXv-devel
    meson
@ -26,4 +25,3 @@
    uncrustify
    valgrind
    clang-analyzer
-    diffutils
--- a/.gitlab-ci/scan-build
+++ b/.gitlab-ci/scan-build
@ -1,4 +1,4 @@
 #!/bin/sh

 # This wrapper just disables the malloc checker
-exec /usr/bin/scan-build --status-bugs -disable-checker unix.Malloc "$@"
+exec /usr/bin/scan-build -disable-checker unix.Malloc "$@"
--- a/65
+++ b/65
@ -1,71 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.

-2021-06-30: v1.94.0 release
-
-Highlights:
- * Implement suspend/resume handling including USB wakeup configuration.
-   This requires writing the "persist" and "wakeup" sysfs attributes.
- * Add simple temperature module to prevent devices from becoming too hot
- * Add feature for continuous scanning
- * New internal "critical section" API to simplify driver development
- * elan: new PID 0x0c58
- * elanmoc: Fixes for multi-user handling and FW changes
- * virtual-device: Do not time out for SCAN command
-
-2021-06-30: v1.92.1 release
-
-Highlights:
- * elanmoc: New driver for ELAN match-on-chip devices
- * egis0570: New driver for some Egis Technology devices
- * synaptics: Fix empty identify causing enroll issues
- * elan: Support more PIDs
- * misc: Architecture related bugfixes
-
-2021-06-30: v1.92.0 release
-
-Highlights:
- * Support for SPI devices was added together with the elanspi driver
- * Generate hwdb for autosuspend (which is now pulled by systemd)
- * An API was added to clear the device storage.
-   Note: Devices may not implement the "list" API anymore.
- * Device features can now be queried using a common API
-
-New drivers:
- * vfs7552
- * nb1010
- * elanspi
-
-Driver changes:
- * uru4000: Fix deactivation when unplugged unexpectedly
- * goodixmoc: Correctly complete verify/identify after retry condition
- * goodixmoc: Support power shield feature
- * goodixmoc: Support new PIDs
- * synaptics: Fix driver lockup when sequence counter overflows (#358)
- * synaptics: Remove unnecessary device reset
- * synaptics: Support new PIDs
- * synaptics: Add clear_storage and remove list support
- * synaptics: Fix initialization if the device is still busy when opening
- * upeksonly: Fix double free in USB transfer callbacks
- * elan: Support new PIDs
- * vfs301: Fix leak of USB transfer
- * uru4000: Silence warning happening during startup
-
-Internal API changes:
- * ssm: Add getter for the device
- * ssm: Add cleanup state feature
- * image-device: Allow overriding number of enroll stages
- * context: Support udev based device discovery
- * spi-transfer: Add SPI transfer helper routines
-
-Other:
- * Use pcap based USB replay for CI
- * New virtual drivers for more advanced testing
- * Ensure async operations are run in the thread local main context
- * Disable drivers on big-endian unless they are verified to work
- * Add missing gobject-introspection dependency
-
-
 2020-12-01: v1.90.7 release

 Highlights:
--- a/data/autosuspend.hwdb
+++ b/data/autosuspend.hwdb
@ -4,7 +4,6 @@
 # Supported by libfprint driver aes1610
 usb:v08FFp1600*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes1660
 usb:v08FFp1660*
@ -25,19 +24,16 @@ usb:v08FFp168D*
 usb:v08FFp168E*
 usb:v08FFp168F*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes2501
 usb:v08FFp2500*
 usb:v08FFp2580*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes2550
 usb:v08FFp2550*
 usb:v08FFp2810*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes2660
 usb:v08FFp2660*
@ -59,23 +55,14 @@ usb:v08FFp268E*
 usb:v08FFp268F*
 usb:v08FFp2691*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes3500
 usb:v08FFp5731*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes4000
 usb:v5501p08FF*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver egis0570
-usb:v1C7Ap0570*
-usb:v1C7Ap0571*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver elan
 usb:v04F3p0903*
@ -131,81 +118,52 @@ usb:v04F3p0C30*
 usb:v04F3p0C31*
 usb:v04F3p0C32*
 usb:v04F3p0C33*
-usb:v04F3p0C3D*
 usb:v04F3p0C42*
 usb:v04F3p0C4D*
-usb:v04F3p0C4F*
-usb:v04F3p0C63*
-usb:v04F3p0C6E*
-usb:v04F3p0C58*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver elanmoc
-usb:v04F3p0C7E*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver etes603
 usb:v1C7Ap0603*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver goodixmoc
 usb:v27C6p5840*
-usb:v27C6p609C*
-usb:v27C6p60A2*
-usb:v27C6p639C*
-usb:v27C6p63AC*
-usb:v27C6p63BC*
 usb:v27C6p6496*
-usb:v27C6p6584*
-usb:v27C6p658C*
-usb:v27C6p6592*
+usb:v27C6p60A2*
+usb:v27C6p63AC*
+usb:v27C6p639C*
 usb:v27C6p6594*
-usb:v27C6p659C*
-usb:v27C6p6A94*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver nb1010
 usb:v298Dp1010*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver synaptics
 usb:v06CBp00BD*
+usb:v06CBp00E9*
 usb:v06CBp00DF*
 usb:v06CBp00F9*
 usb:v06CBp00FC*
 usb:v06CBp00C2*
 usb:v06CBp00C9*
 usb:v06CBp0100*
-usb:v06CBp00F0*
-usb:v06CBp0103*
-usb:v06CBp0123*
-usb:v06CBp0126*
-usb:v06CBp0129*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver upeksonly
 usb:v147Ep2016*
 usb:v147Ep1000*
 usb:v147Ep1001*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver upektc
 usb:v0483p2015*
 usb:v147Ep3001*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver upektc_img
 usb:v147Ep2020*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver uru4000
 usb:v045Ep00BC*
@ -215,28 +173,23 @@ usb:v05BAp0007*
 usb:v05BAp0008*
 usb:v05BAp000A*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vcom5s
 usb:v061Ap0110*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs0050
 usb:v138Ap0050*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs101
 usb:v138Ap0001*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs301
 usb:v138Ap0005*
 usb:v138Ap0008*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs5011
 usb:v138Ap0010*
@ -245,18 +198,17 @@ usb:v138Ap0015*
 usb:v138Ap0017*
 usb:v138Ap0018*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs7552
 usb:v138Ap0091*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Known unsupported devices
 usb:v04F3p036B*
 usb:v04F3p0C00*
 usb:v04F3p0C4B*
 usb:v04F3p0C4C*
+usb:v04F3p0C4F*
 usb:v04F3p0C57*
 usb:v04F3p0C5E*
 usb:v04F3p2706*
@ -273,8 +225,6 @@ usb:v06CBp00C4*
 usb:v06CBp00CB*
 usb:v06CBp00D8*
 usb:v06CBp00DA*
-usb:v06CBp00E7*
-usb:v06CBp00E9*
 usb:v0A5Cp5801*
 usb:v0A5Cp5805*
 usb:v0A5Cp5834*
@ -282,7 +232,6 @@ usb:v0A5Cp5840*
 usb:v0A5Cp5841*
 usb:v0A5Cp5842*
 usb:v0A5Cp5843*
-usb:v0A5Cp5844*
 usb:v0A5Cp5845*
 usb:v10A5p0007*
 usb:v1188p9545*
@ -301,6 +250,7 @@ usb:v147Ep1002*
 usb:v1491p0088*
 usb:v16D1p1027*
 usb:v1C7Ap0300*
+usb:v1C7Ap0570*
 usb:v1C7Ap0575*
 usb:v27C6p5042*
 usb:v27C6p5110*
@ -325,4 +275,3 @@ usb:v2808p9338*
 usb:v298Dp2033*
 usb:v3538p0930*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0
--- a/demo/gtk-libfprint-test.c
+++ b/demo/gtk-libfprint-test.c
@ -526,7 +526,7 @@ libfprint_demo_window_init (LibfprintDemoWindow *window)
      return;
    }

-  if (!fp_device_has_feature (g_ptr_array_index (devices, 0), FP_DEVICE_FEATURE_CAPTURE))
+  if (!fp_device_supports_capture (g_ptr_array_index (devices, 0)))
    {
      libfprint_demo_set_mode (window, NOIMAGING_MODE);
      return;
--- a/demo/org.freedesktop.libfprint.Demo.json
+++ b/demo/org.freedesktop.libfprint.Demo.json
@ -47,22 +47,10 @@
                }
            ]
        },
-        {
-            "name": "gudev",
-            "buildsystem": "meson",
-            "config-opts": [ "-Dtests=disabled", "-Dintrospection=disabled" ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libgudev/236/libgudev-236.tar.xz",
-                    "sha256": "e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524"
-                }
-            ]
-        },
        {
            "name": "libfprint",
            "buildsystem": "meson",
-            "config-opts": [ "-Dudev_hwdb=disabled", "-Dudev_rules=disabled", "-Dx11-examples=false", "-Dgtk-examples=true", "-Ddrivers=all" ],
+            "config-opts": [ "-Dudev_hwdb=disabled", "-Dx11-examples=false", "-Dgtk-examples=true", "-Ddrivers=all" ],
            "sources": [
                {
                    "type": "git",
--- a/doc/libfprint-2-sections.txt
+++ b/doc/libfprint-2-sections.txt
@ -20,11 +20,9 @@ FP_TYPE_DEVICE
 FP_DEVICE_RETRY
 FP_DEVICE_ERROR
 FpDeviceType
-FpDeviceFeature
 FpScanType
 FpDeviceRetry
 FpDeviceError
-FpFingerStatusFlags
 fp_device_retry_quark
 fp_device_error_quark
 FpEnrollProgress
@ -35,8 +33,6 @@ fp_device_get_name
 fp_device_get_scan_type
 fp_device_get_nr_enroll_stages
 fp_device_get_finger_status
-fp_device_get_features
-fp_device_has_feature
 fp_device_has_storage
 fp_device_supports_identify
 fp_device_supports_capture
@ -49,9 +45,6 @@ fp_device_identify
 fp_device_capture
 fp_device_delete_print
 fp_device_list_prints
-fp_device_clear_storage
-fp_device_suspend
-fp_device_resume
 fp_device_open_finish
 fp_device_close_finish
 fp_device_enroll_finish
@ -60,9 +53,6 @@ fp_device_identify_finish
 fp_device_capture_finish
 fp_device_delete_print_finish
 fp_device_list_prints_finish
-fp_device_clear_storage_finish
-fp_device_suspend_finish
-fp_device_resume_finish
 fp_device_open_sync
 fp_device_close_sync
 fp_device_enroll_sync
@ -71,9 +61,6 @@ fp_device_identify_sync
 fp_device_capture_sync
 fp_device_delete_print_sync
 fp_device_list_prints_sync
-fp_device_clear_storage_sync
-fp_device_suspend_sync
-fp_device_resume_sync
 FpDevice
 </SECTION>

@ -144,6 +131,7 @@ fpi_get_driver_types
 FpDeviceClass
 FpTimeoutFunc
 FpiDeviceAction
+FpiDeviceFeature
 FpIdEntry
 FpiDeviceUdevSubtypeFlags
 fpi_device_get_usb_device
@ -165,9 +153,6 @@ fpi_device_action_is_cancelled
 fpi_device_add_timeout
 fpi_device_set_nr_enroll_stages
 fpi_device_set_scan_type
-fpi_device_update_features
-fpi_device_critical_enter
-fpi_device_critical_leave
 fpi_device_remove
 fpi_device_report_finger_status
 fpi_device_report_finger_status_changes
@ -180,12 +165,10 @@ fpi_device_verify_complete
 fpi_device_identify_complete
 fpi_device_capture_complete
 fpi_device_delete_complete
-fpi_device_list_complete
-fpi_device_suspend_complete
-fpi_device_resume_complete
 fpi_device_enroll_progress
 fpi_device_verify_report
 fpi_device_identify_report
+fpi_device_list_complete
 fpi_device_class_auto_initialize_features
 </SECTION>

--- a/doc/libfprint-2.types
+++ b/doc/libfprint-2.types
@ -1,5 +1,5 @@
-#include <fprint.h>
-#include <fp-image-device.h>
+#include <libfprint-2/fprint.h>
+#include <libfprint-2/fp-image-device.h>

 fp_context_get_type
 fp_device_get_type
--- a/doc/meson.build
+++ b/doc/meson.build
@ -26,7 +26,6 @@ docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')
 gnome.gtkdoc(versioned_libname,
    main_xml: 'libfprint-docs.xml',
    src_dir: join_paths(meson.source_root(), 'libfprint'),
-    include_directories: include_directories('../libfprint'),
    dependencies: libfprint_dep,
    content_files: content_files,
    expand_content_files: expand_content_files,
--- a/examples/enroll.c
+++ b/examples/enroll.c
@ -76,7 +76,7 @@ on_enroll_completed (FpDevice *dev, GAsyncResult *res, void *user_data)
    {
      enroll_data->ret_value = EXIT_SUCCESS;

-      if (fp_device_has_feature (dev, FP_DEVICE_FEATURE_STORAGE))
+      if (fp_device_has_storage (dev))
        g_debug ("Device has storage, saving a print reference locally");
      else
        g_debug ("Device has not storage, saving print only locally");
--- a/examples/identify.c
+++ b/examples/identify.c
@ -212,7 +212,7 @@ on_list_completed (FpDevice *dev, GAsyncResult *res, gpointer user_data)
 static void
 start_identification (FpDevice *dev, IdentifyData *identify_data)
 {
-  if (fp_device_has_feature (dev, FP_DEVICE_FEATURE_STORAGE))
+  if (fp_device_has_storage (dev))
    {
      g_print ("Creating finger template, using device storage...\n");
      fp_device_list_prints (dev, NULL,
@ -293,7 +293,7 @@ main (void)
      return EXIT_FAILURE;
    }

-  if (!fp_device_has_feature (dev, FP_DEVICE_FEATURE_IDENTIFY))
+  if (!fp_device_supports_identify (dev))
    {
      g_warning ("Device %s does not support identification.",
                 fp_device_get_name (dev));
--- a/examples/img-capture.c
+++ b/examples/img-capture.c
@ -162,7 +162,7 @@ main (int argc, const char *argv[])
      return EXIT_FAILURE;
    }

-  if (!fp_device_has_feature (dev, FP_DEVICE_FEATURE_CAPTURE))
+  if (!fp_device_supports_capture (dev))
    {
      g_warning ("Device %s doesn't support capture",
                 fp_device_get_name (dev));
--- a/examples/manage-prints.c
+++ b/examples/manage-prints.c
@ -231,7 +231,7 @@ on_device_opened (FpDevice     *dev,
      return;
    }

-  if (!fp_device_has_feature (dev, FP_DEVICE_FEATURE_STORAGE))
+  if (!fp_device_has_storage (dev))
    {
      g_warning ("Device %s doesn't support storage", fp_device_get_name (dev));
      g_main_loop_quit (list_data->loop);
--- a/examples/utilities.c
+++ b/examples/utilities.c
@ -101,7 +101,6 @@ finger_to_string (FpFinger finger)
    case FP_FINGER_RIGHT_LITTLE:
      return "right little";

-    case FP_FINGER_UNKNOWN:
    default:
      return "unknown";
    }
--- a/examples/verify.c
+++ b/examples/verify.c
@ -260,7 +260,7 @@ start_verification (FpDevice *dev, VerifyData *verify_data)
      return;
    }

-  if (fp_device_has_feature (dev, FP_DEVICE_FEATURE_STORAGE))
+  if (fp_device_has_storage (dev))
    {
      g_print ("Creating finger template, using device storage...\n");
      fp_device_list_prints (dev, NULL,
--- a/libfprint/drivers/aesx660.c
+++ b/libfprint/drivers/aesx660.c
@ -365,7 +365,7 @@ capture_read_stripe_data_cb (FpiUsbTransfer *transfer,
      return;
    }

-  fp_dbg ("Got %" G_GSIZE_FORMAT " bytes of data", actual_length);
+  fp_dbg ("Got %lu bytes of data", actual_length);
  while (actual_length)
    {
      gssize payload_length;
@ -386,7 +386,7 @@ capture_read_stripe_data_cb (FpiUsbTransfer *transfer,
                       (priv->stripe_packet->data[AESX660_RESPONSE_SIZE_MSB_OFFSET] << 8);
      fp_dbg ("Got frame, type %.2x payload of size %.4lx",
              priv->stripe_packet->data[AESX660_RESPONSE_TYPE_OFFSET],
-              (long) payload_length);
+              payload_length);

      still_needed_len = MAX (0, AESX660_HEADER_SIZE + payload_length - (gssize) priv->stripe_packet->len);
      copy_len = MIN (actual_length, still_needed_len);
@ -441,7 +441,7 @@ capture_run_state (FpiSsm *ssm, FpDevice *_dev)
      break;

    case CAPTURE_SET_IDLE:
-      fp_dbg ("Got %" G_GSIZE_FORMAT " frames", priv->strips_len);
+      fp_dbg ("Got %lu frames", priv->strips_len);
      aesX660_send_cmd (ssm, _dev, set_idle_cmd, sizeof (set_idle_cmd),
                        capture_set_idle_cmd_cb);
      break;
--- a/libfprint/drivers/egis0570.c
+++ b/libfprint/drivers/egis0570.c
@ -1,444 +0,0 @@
-/*
- * Egis Technology Inc. (aka. LighTuning) 0570 driver for libfprint
- * Copyright (C) 2021 Maxim Kolesnikov <kolesnikov@svyazcom.ru>
- * Copyright (C) 2021 Saeed/Ali Rk <saeed.ali.rahimi@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#define FP_COMPONENT "egis0570"
-
-#include "egis0570.h"
-#include "drivers_api.h"
-
-/* Packet types */
-#define PKT_TYPE_INIT 0
-#define PKT_TYPE_REPEAT 1
-
-/* Struct */
-struct _FpDeviceEgis0570
-{
-  FpImageDevice parent;
-
-  gboolean      running;
-  gboolean      stop;
-
-  GSList       *strips;
-  guint8       *background;
-  gsize         strips_len;
-
-  int           pkt_num;
-  int           pkt_type;
-};
-G_DECLARE_FINAL_TYPE (FpDeviceEgis0570, fpi_device_egis0570, FPI, DEVICE_EGIS0570, FpImageDevice);
-G_DEFINE_TYPE (FpDeviceEgis0570, fpi_device_egis0570, FP_TYPE_IMAGE_DEVICE);
-
-static unsigned char
-egis_get_pixel (struct fpi_frame_asmbl_ctx *ctx, struct fpi_frame *frame, unsigned int x, unsigned int y)
-{
-  return frame->data[x + y * ctx->frame_width];
-}
-
-static struct fpi_frame_asmbl_ctx assembling_ctx = {
-  .frame_width = EGIS0570_IMGWIDTH,
-  .frame_height = EGIS0570_RFMGHEIGHT,
-  .image_width = EGIS0570_IMGWIDTH * 4 / 3,
-  .get_pixel = egis_get_pixel,
-};
-
-/*
- * Service
- */
-
-static gboolean
-is_last_pkt (FpDevice *dev)
-{
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-
-  int type = self->pkt_type;
-  int num = self->pkt_num;
-
-  gboolean r;
-
-  r = ((type == PKT_TYPE_INIT) && (num == (EGIS0570_INIT_TOTAL - 1)));
-  r |= ((type == PKT_TYPE_REPEAT) && (num == (EGIS0570_REPEAT_TOTAL - 1)));
-
-  return r;
-}
-
-/*
- * Returns a bit for each frame on whether or not a finger has been detected.
- * e.g. 00110 means that there is a finger in frame two and three.
- */
-static char
-postprocess_frames (FpDeviceEgis0570 *self, guint8 * img)
-{
-  size_t mean[EGIS0570_IMGCOUNT] = {0, 0, 0, 0, 0};
-
-  if (!self->background)
-    {
-      self->background = g_malloc (EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT);
-      memset (self->background, 255, EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT);
-
-      for (size_t k = 0; k < EGIS0570_IMGCOUNT; k += 1)
-        {
-          guint8 * frame = &img[(k * EGIS0570_IMGSIZE) + EGIS0570_RFMDIS * EGIS0570_IMGWIDTH];
-
-          for (size_t i = 0; i < EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT; i += 1)
-            self->background[i] = MIN (self->background[i], frame[i]);
-        }
-
-      return 0;
-    }
-
-  for (size_t k = 0; k < EGIS0570_IMGCOUNT; k += 1)
-    {
-      guint8 * frame = &img[(k * EGIS0570_IMGSIZE) + EGIS0570_RFMDIS * EGIS0570_IMGWIDTH];
-
-      for (size_t i = 0; i < EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT; i += 1)
-        {
-          if (frame[i] - EGIS0570_MARGIN  > self->background[i])
-            frame[i] -= self->background[i];
-          else
-            frame[i] = 0;
-
-          mean[k] += frame[i];
-        }
-
-      mean[k] /= EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT;
-    }
-
-  char result = 0;
-
-  for (size_t k = 0; k < EGIS0570_IMGCOUNT; k += 1)
-    {
-      fp_dbg ("Finger status (picture number, mean) : %ld , %ld", k, mean[k]);
-      if (mean[k] > EGIS0570_MIN_MEAN)
-        result |= 1 << k;
-    }
-
-  return result;
-}
-
-/*
- * Device communication
- */
-
-static void
-data_resp_cb (FpiUsbTransfer *transfer, FpDevice *dev, gpointer user_data, GError *error)
-{
-  unsigned char *stripdata;
-  gboolean end = FALSE;
-  FpImageDevice *img_self = FP_IMAGE_DEVICE (dev);
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-
-  if (error)
-    {
-      fpi_ssm_mark_failed (transfer->ssm, error);
-      return;
-    }
-
-  int where_finger_is = postprocess_frames (self, transfer->buffer);
-
-  if (where_finger_is > 0)
-    {
-      FpiImageDeviceState state;
-
-      fpi_image_device_report_finger_status (img_self, TRUE);
-
-      g_object_get (dev, "fpi-image-device-state", &state, NULL);
-      if (state == FPI_IMAGE_DEVICE_STATE_CAPTURE)
-        {
-          for (size_t k = 0; k < EGIS0570_IMGCOUNT; k += 1)
-            {
-              if (where_finger_is & (1 << k))
-                {
-                  struct fpi_frame *stripe = g_malloc (EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT + sizeof (struct fpi_frame));
-                  stripe->delta_x = 0;
-                  stripe->delta_y = 0;
-                  stripdata = stripe->data;
-                  memcpy (stripdata, (transfer->buffer) + (((k) * EGIS0570_IMGSIZE) + EGIS0570_IMGWIDTH * EGIS0570_RFMDIS), EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT);
-                  self->strips = g_slist_prepend (self->strips, stripe);
-                  self->strips_len += 1;
-                }
-              else
-                {
-                  end = TRUE;
-                  break;
-                }
-            }
-        }
-    }
-  else
-    {
-      end = TRUE;
-    }
-
-  if (end)
-    {
-      if (!self->stop && (self->strips_len > 0))
-        {
-          FpImage *img;
-          self->strips = g_slist_reverse (self->strips);
-          fpi_do_movement_estimation (&assembling_ctx, self->strips);
-          img = fpi_assemble_frames (&assembling_ctx, self->strips);
-          img->flags |= (FPI_IMAGE_COLORS_INVERTED | FPI_IMAGE_PARTIAL);
-          g_slist_free_full (self->strips, g_free);
-          self->strips = NULL;
-          self->strips_len = 0;
-          FpImage *resizeImage = fpi_image_resize (img, EGIS0570_RESIZE, EGIS0570_RESIZE);
-          fpi_image_device_image_captured (img_self, resizeImage);
-        }
-
-      fpi_image_device_report_finger_status (img_self, FALSE);
-    }
-
-  fpi_ssm_next_state (transfer->ssm);
-}
-
-static void
-recv_data_resp (FpiSsm *ssm, FpDevice *dev)
-{
-  FpiUsbTransfer *transfer = fpi_usb_transfer_new (dev);
-
-  fpi_usb_transfer_fill_bulk (transfer, EGIS0570_EPIN, EGIS0570_INPSIZE);
-
-  transfer->ssm = ssm;
-  transfer->short_is_error = TRUE;
-
-  fpi_usb_transfer_submit (transfer, EGIS0570_TIMEOUT, NULL, data_resp_cb, NULL);
-}
-
-static void
-cmd_resp_cb (FpiUsbTransfer *transfer, FpDevice *dev, gpointer user_data, GError *error)
-{
-  if (error)
-    fpi_ssm_mark_failed (transfer->ssm, error);
-}
-
-static void
-recv_cmd_resp (FpiSsm *ssm, FpDevice *dev)
-{
-  FpiUsbTransfer *transfer = fpi_usb_transfer_new (dev);
-
-  fpi_usb_transfer_fill_bulk (transfer, EGIS0570_EPIN, EGIS0570_PKTSIZE);
-
-  transfer->ssm = ssm;
-
-  fpi_usb_transfer_submit (transfer, EGIS0570_TIMEOUT, NULL, cmd_resp_cb, NULL);
-}
-
-static void
-send_cmd_req (FpiSsm *ssm, FpDevice *dev, unsigned char *pkt)
-{
-  FpiUsbTransfer *transfer = fpi_usb_transfer_new (dev);
-
-  fpi_usb_transfer_fill_bulk_full (transfer, EGIS0570_EPOUT, pkt, EGIS0570_PKTSIZE, NULL);
-
-  transfer->ssm = ssm;
-  transfer->short_is_error = TRUE;
-
-  fpi_usb_transfer_submit (transfer, EGIS0570_TIMEOUT, NULL, fpi_ssm_usb_transfer_cb, NULL);
-}
-
-/*
- * SSM States
- */
-
-enum sm_states {
-  SM_INIT,
-  SM_START,
-  SM_REQ,
-  SM_RESP,
-  SM_REC_DATA,
-  SM_DONE,
-  SM_STATES_NUM
-};
-
-static void
-ssm_run_state (FpiSsm *ssm, FpDevice *dev)
-{
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-  FpImageDevice *img_dev = FP_IMAGE_DEVICE (dev);
-
-  switch (fpi_ssm_get_cur_state (ssm))
-    {
-    case SM_INIT:
-      self->pkt_type = PKT_TYPE_INIT;
-      fpi_ssm_next_state (ssm);
-      break;
-
-    case SM_START:
-      if (self->stop)
-        {
-          fp_dbg ("deactivating, marking completed");
-          fpi_ssm_mark_completed (ssm);
-          fpi_image_device_deactivate_complete (img_dev, NULL);
-        }
-      else
-        {
-          self->pkt_num = 0;
-          fpi_ssm_next_state (ssm);
-        }
-      break;
-
-    case SM_REQ:
-      if (self->pkt_type == PKT_TYPE_INIT)
-        send_cmd_req (ssm, dev, init_pkts[self->pkt_num]);
-      else
-        send_cmd_req (ssm, dev, repeat_pkts[self->pkt_num]);
-      break;
-
-    case SM_RESP:
-      if (is_last_pkt (dev) == FALSE)
-        {
-          recv_cmd_resp (ssm, dev);
-          self->pkt_num += 1;
-          fpi_ssm_jump_to_state (ssm, SM_REQ);
-        }
-      else
-        {
-          if (self->pkt_type == PKT_TYPE_INIT)
-            self->pkt_type = PKT_TYPE_REPEAT;
-
-          fpi_ssm_next_state (ssm);
-        }
-      break;
-
-    case SM_REC_DATA:
-      recv_data_resp (ssm, dev);
-      break;
-
-    case SM_DONE:
-      fpi_ssm_jump_to_state (ssm, SM_START);
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-}
-
-/*
- * Activation
- */
-
-static void
-loop_complete (FpiSsm *ssm, FpDevice *dev, GError *error)
-{
-  FpImageDevice *img_dev = FP_IMAGE_DEVICE (dev);
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-
-  self->running = FALSE;
-  g_clear_pointer (&self->background, g_free);
-
-  if (error)
-    fpi_image_device_session_error (img_dev, error);
-}
-
-static void
-dev_activate (FpImageDevice *dev)
-{
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (dev), ssm_run_state, SM_STATES_NUM);
-
-  self->stop    = FALSE;
-
-  fpi_ssm_start (ssm, loop_complete);
-
-  self->running = TRUE;
-
-  fpi_image_device_activate_complete (dev, NULL);
-}
-
-/*
- * Opening
- */
-
-static void
-dev_init (FpImageDevice *dev)
-{
-  GError *error = NULL;
-
-  g_usb_device_claim_interface (fpi_device_get_usb_device (FP_DEVICE (dev)), 0, 0, &error);
-
-  fpi_image_device_open_complete (dev, error);
-}
-
-/*
- * Closing
- */
-
-static void
-dev_deinit (FpImageDevice *dev)
-{
-  GError *error = NULL;
-
-  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (dev)), 0, 0, &error);
-
-  fpi_image_device_close_complete (dev, error);
-}
-
-/*
- * Deactivation
- */
-
-static void
-dev_deactivate (FpImageDevice *dev)
-{
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-
-  if (self->running)
-    self->stop = TRUE;
-  else
-    fpi_image_device_deactivate_complete (dev, NULL);
-}
-
-/*
- * Driver data
- */
-
-static const FpIdEntry id_table[] = {
-  { .vid = 0x1c7a, .pid = 0x0570, },
-  { .vid = 0x1c7a, .pid = 0x0571, },
-  { .vid = 0,      .pid = 0, },
-};
-
-static void
-fpi_device_egis0570_init (FpDeviceEgis0570 *self)
-{
-}
-
-static void
-fpi_device_egis0570_class_init (FpDeviceEgis0570Class *klass)
-{
-  FpDeviceClass *dev_class = FP_DEVICE_CLASS (klass);
-  FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_CLASS (klass);
-
-  dev_class->id = "egis0570";
-  dev_class->full_name = "Egis Technology Inc. (aka. LighTuning) 0570";
-  dev_class->type = FP_DEVICE_TYPE_USB;
-  dev_class->id_table = id_table;
-  dev_class->scan_type = FP_SCAN_TYPE_SWIPE;
-
-  img_class->img_open = dev_init;
-  img_class->img_close = dev_deinit;
-  img_class->activate = dev_activate;
-  img_class->deactivate = dev_deactivate;
-
-  img_class->img_width = EGIS0570_IMGWIDTH;
-  img_class->img_height = -1;
-
-  img_class->bz3_threshold = EGIS0570_BZ3_THRESHOLD; /* security issue */
-}
--- a/libfprint/drivers/egis0570.h
+++ b/libfprint/drivers/egis0570.h
@ -1,177 +0,0 @@
-/*
- * Egis Technology Inc. (aka. LighTuning) 0570 driver for libfprint
- * Copyright (C) 2021 Maxim Kolesnikov <kolesnikov@svyazcom.ru>
- * Copyright (C) 2021 Saeed/Ali Rk <saeed.ali.rahimi@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __EGIS0570_H
-
-#define __EGIS0570_H 1
-
-/*
- * Device data
- */
-
-#define EGIS0570_CONF 1
-#define EGIS0570_INTF 0
-
-/*
- * Device endpoints
- */
-
-#define EGIS0570_EPOUT 0x04 /* ( 4 | FPI_USB_ENDPOINT_OUT ) */
-#define EGIS0570_EPIN 0x83  /* ( 3 | FPI_USB_ENDPOINT_IN ) */
-
-/*
- * Initialization packets (7 bytes each)
- *
- * First 4 bytes are equivalent to string "EGIS", which must be just a company identificator
- * Other 3 bytes are not recognized yet and may be not important, as they are always the same
-
- * Answers for each packet contain 7 bytes again
- * First 4 bytes are reversed "EGIS", which is "SIGE", which is company ID again
- * Other 3 bytes are not recognized yet
- * But there is a pattern.
- * Sending last packet makes sensor return image
- */
-
-#define EGIS0570_TIMEOUT 10000
-#define EGIS0570_PKTSIZE 7
-
-#define EGIS0570_INIT_TOTAL (sizeof ((init_pkts)) / sizeof ((init_pkts[0])))
-
-static unsigned char init_pkts[][EGIS0570_PKTSIZE] =
-{
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x20, 0x3f },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x58, 0x3f },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x21, 0x09 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x57, 0x09 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x22, 0x03 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x56, 0x03 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x23, 0x01 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x55, 0x01 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x24, 0x01 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x54, 0x01 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x16, 0x3e },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x09, 0x0b },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x14, 0x03 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x15, 0x00 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x0f },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x10, 0x00 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x11, 0x38 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x12, 0x00 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x13, 0x71 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x03, 0x80 },
-  { 0x45, 0x47, 0x49, 0x53, 0x00, 0x02, 0x80 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x2f },
-  { 0x45, 0x47, 0x49, 0x53, 0x06, 0x00, 0xfe }        /* image returned after this packet */
-};
-
-/* There is another Packet !
- * That just Work the same !!
- * And the Size is different !!!
- */
-
-/*
-
- #define EGIS0570_INIT_TOTAL2 (sizeof((init_pkts2)) / sizeof((init_pkts2[0])))
-
-   static unsigned char init_pkts2[][EGIS0570_PKTSIZE] =
-   {
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x10, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x11, 0x38},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x12, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x13, 0x71},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x20, 0x3f},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x58, 0x3f},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x21, 0x07},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x57, 0x07},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x22, 0x02},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x56, 0x02},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x23, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x55, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x24, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x54, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x25, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x53, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x15, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x16, 0x3b},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x09, 0x0a},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x14, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x0f},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x03, 0x80},
-        {0x45, 0x47, 0x49, 0x53, 0x00, 0x02, 0x80},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x2f},
-        {0x45, 0x47, 0x49, 0x53, 0x06, 0x00, 0xfe}
-   };
-
- */
-
-/*
- * After sending initial packets device returns image data (32512 bytes)
- * To ask device to send image data again, host needs to send four additional packets
- * Further work is to repeatedly send four repeat packets and read image data
- */
-
-#define EGIS0570_INPSIZE 32512
-
-/* 5 image with captured in different time of size 114 * 57 = 6498
- * 5 * 6498 = 32490 plus 22 extra unrecognized char size data
- * Two continuous image in this 5 images may have time delay of less than 20ms
- */
-
-#define EGIS0570_IMGSIZE 6498
-#define EGIS0570_IMGWIDTH 114
-#define EGIS0570_IMGHEIGHT 57
-
-/* size of middle area that is used from each frame */
-#define EGIS0570_RFMGHEIGHT 17
-/* rows to ignore from top and bottom of the image*/
-#define EGIS0570_RFMDIS (EGIS0570_IMGHEIGHT - EGIS0570_RFMGHEIGHT) / 2
-#define EGIS0570_IMGCOUNT 5
-
-/*
- * Image repeat request
- * First 4 bytes are the same as in initialization packets
- * Have no idea what the other 3 bytes mean
- */
-
-#define EGIS0570_REPEAT_TOTAL (sizeof ((repeat_pkts)) / sizeof ((repeat_pkts[0])))
-
-static unsigned char repeat_pkts[][EGIS0570_PKTSIZE] =
-{
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x0f },
-  { 0x45, 0x47, 0x49, 0x53, 0x00, 0x02, 0x0f },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x2f },
-  { 0x45, 0x47, 0x49, 0x53, 0x06, 0x00, 0xfe }         /* image returned after this packet */
-};
-
-/*
- * This sensor is small so I decided to reduce bz3_threshold from
- * 40 to 10 to have more success to fail ratio
- * Bozorth3 Algorithm seems not fine at the end
- * foreget about security :))
- */
-
-#define EGIS0570_BZ3_THRESHOLD 25 /* and even less What a joke */
-
-#define EGIS0570_MIN_MEAN 20
-#define EGIS0570_MARGIN 3
-
-#define EGIS0570_RESIZE 2
-
-#endif
--- a/libfprint/drivers/elan.c
+++ b/libfprint/drivers/elan.c
@ -760,7 +760,7 @@ calibrate_run_state (FpiSsm *ssm, FpDevice *dev)
          if (self->calib_status == 0x00 &&
              self->last_read[0] == 0x01)
            self->calib_status = 0x01;
-          fpi_ssm_next_state_delayed (ssm, 50);
+          fpi_ssm_next_state_delayed (ssm, 50, NULL);
        }
      break;

--- a/libfprint/drivers/elan.h
+++ b/libfprint/drivers/elan.h
@ -213,13 +213,8 @@ static const FpIdEntry elan_id_table[] = {
  {.vid = ELAN_VEND_ID,  .pid = 0x0c31, .driver_data = ELAN_ALL_DEV},
  {.vid = ELAN_VEND_ID,  .pid = 0x0c32, .driver_data = ELAN_ALL_DEV},
  {.vid = ELAN_VEND_ID,  .pid = 0x0c33, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c3d, .driver_data = ELAN_ALL_DEV},
  {.vid = ELAN_VEND_ID,  .pid = 0x0c42, .driver_data = ELAN_0C42},
  {.vid = ELAN_VEND_ID,  .pid = 0x0c4d, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c4f, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c63, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c6e, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c58, .driver_data = ELAN_ALL_DEV},
  {.vid = 0,  .pid = 0,  .driver_data = 0},
 };

--- a/libfprint/drivers/elanmoc/elanmoc.c
+++ b/libfprint/drivers/elanmoc/elanmoc.c
--- a/libfprint/drivers/elanmoc/elanmoc.h
+++ b/libfprint/drivers/elanmoc/elanmoc.h
@ -1,195 +0,0 @@
-/*
- * Copyright (C) 2021 Elan Microelectronics
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include "fpi-device.h"
-#include "fpi-ssm.h"
-#include <libusb.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-G_DECLARE_FINAL_TYPE (FpiDeviceElanmoc, fpi_device_elanmoc, FPI, DEVICE_ELANMOC, FpDevice)
-
-#define ELAN_MOC_DRIVER_FULLNAME "Elan MOC Sensors"
-#define ELAN_M0C_CMD_LEN 0x3
-#define ELAN_EP_CMD_OUT (0x1 | LIBUSB_ENDPOINT_OUT)
-#define ELAN_EP_CMD_IN (0x3 | LIBUSB_ENDPOINT_IN)
-#define ELAN_EP_MOC_CMD_IN (0x4 | LIBUSB_ENDPOINT_IN)
-#define ELAN_EP_IMG_IN (0x2 | LIBUSB_ENDPOINT_IN)
-
-#define ELAN_MOC_CMD_TIMEOUT 5000
-#define ELAN_MOC_CAL_RETRY 500
-#define ELAN_MOC_ENROLL_TIMES 9
-#define ELAN_MAX_USER_ID_LEN 92
-#define ELAN_MAX_ENROLL_NUM 9
-
-#define ELAN_MSG_VERIFY_ERR 0xfd
-#define ELAN_MSG_DIRTY 0xfb
-#define ELAN_MSG_AREA_NOT_ENOUGH 0xfe
-#define ELAN_MSG_TOO_HIGH 0x41
-#define ELAN_MSG_TOO_LEFT 0x42
-#define ELAN_MSG_TOO_LOW 0x43
-#define ELAN_MSG_TOO_RIGHT 0x44
-#define ELAN_MSG_OK 0x00
-
-#define ELAN_MAX_HDR_LEN 3
-#define ELAN_USERDATE_SIZE (ELAN_MAX_USER_ID_LEN + 3)
-
-#define ELAN_MSG_DRIVER_VERSION "1004"
-
-struct elanmoc_cmd
-{
-  unsigned char cmd_header[ELAN_MAX_HDR_LEN];
-  int           cmd_len;
-  int           resp_len;
-};
-
-static const struct elanmoc_cmd fw_ver_cmd = {
-  .cmd_header = {0x40, 0x19},
-  .cmd_len = 2,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd sensor_dim_cmd = {
-  .cmd_header = {0x00, 0x0c},
-  .cmd_len = 2,
-  .resp_len = 4,
-};
-
-static const struct elanmoc_cmd cal_status_cmd = {
-  .cmd_header = {0x40, 0xff, 0x00},
-  .cmd_len = 3,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd enrolled_number_cmd = {
-  .cmd_header = {0x40, 0xff, 0x04},
-  .cmd_len = 3,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_verify_cmd = {
-  .cmd_header = {0x40, 0xff, 0x73},
-  .cmd_len = 5,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_above_cmd = {
-  .cmd_header = {0x40, 0xff, 0x02},
-  .cmd_len = 3,
-  .resp_len = 0,
-};
-
-static const struct elanmoc_cmd elanmoc_enroll_cmd = {
-  .cmd_header = {0x40, 0xff, 0x01},
-  .cmd_len = 7,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_delete_cmd = {
-  .cmd_header = {0x40, 0xff, 0x13},
-  .cmd_len = 128,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_enroll_commit_cmd = {
-  .cmd_header = {0x40, 0xff, 0x11},
-  .cmd_len = 128,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_remove_all_cmd = {
-  .cmd_header = {0x40, 0xff, 0x98},
-  .cmd_len = 3,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_get_userid_cmd = {
-  .cmd_header = {0x43, 0x21, 0x00},
-  .cmd_len = 3,
-  .resp_len = 97,
-};
-
-static const struct elanmoc_cmd elanmoc_set_mod_cmd = {
-  .cmd_header = {0x40, 0xff, 0x14},
-  .cmd_len = 4,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_check_reenroll_cmd = {
-  .cmd_header = {0x40, 0xff, 0x22},
-  .cmd_len = 3 + ELAN_USERDATE_SIZE,
-  .resp_len = 2,
-};
-
-typedef void (*ElanCmdMsgCallback) (FpiDeviceElanmoc *self,
-                                    GError           *error);
-
-enum moc_enroll_states {
-  MOC_ENROLL_GET_ENROLLED_NUM,
-  MOC_ENROLL_REENROLL_CHECK,
-  MOC_ENROLL_WAIT_FINGER,
-  MOC_ENROLL_COMMIT_RESULT,
-  MOC_ENROLL_NUM_STATES,
-};
-
-enum moc_list_states {
-  MOC_LIST_GET_ENROLLED,
-  MOC_LIST_GET_FINGER,
-  MOC_LIST_NUM_STATES,
-};
-
-enum delete_states {
-  DELETE_SEND_CMD,
-  DELETE_NUM_STATES,
-};
-
-enum dev_init_states {
-  DEV_WAIT_READY,
-  DEV_SET_MODE,
-  DEV_GET_VER,
-  DEV_GET_DIM,
-  DEV_GET_ENROLLED,
-  DEV_INIT_STATES,
-};
-
-enum dev_exit_states {
-  DEV_EXIT_ABOVE,
-  DEV_EXIT_STATES,
-};
-
-struct _FpiDeviceElanmoc
-{
-  FpDevice        parent;
-  FpiSsm         *task_ssm;
-  FpiSsm         *cmd_ssm;
-  FpiUsbTransfer *cmd_transfer;
-  gboolean        cmd_cancelable;
-  gsize           cmd_len_in;
-  unsigned short  fw_ver;
-  unsigned char   x_trace;
-  unsigned char   y_trace;
-  int             num_frames;
-  int             curr_enrolled;
-  int             cancel_result;
-  int             cmd_retry_cnt;
-  int             list_index;
-  GPtrArray      *list_result;
-};
--- a/libfprint/drivers/elanspi.c
+++ b/libfprint/drivers/elanspi.c
--- a/libfprint/drivers/elanspi.h
+++ b/libfprint/drivers/elanspi.h
@ -1,351 +0,0 @@
-/*
- * Elan SPI driver for libfprint
- *
- * Copyright (C) 2021 Matthew Mirvish <matthew@mm12.xyz>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include <config.h>
-
-#ifndef HAVE_UDEV
-#error "elanspi requires udev"
-#endif
-
-#include <fp-device.h>
-#include <fpi-device.h>
-
-#define ELANSPI_TP_PID 0x04f3
-
-/* Sensor ID information copied from the windows driver */
-
-struct elanspi_sensor_entry
-{
-  unsigned char sensor_id, height, width, ic_version;
-  gboolean      is_otp_model;
-  const gchar * name;
-};
-
-static const struct elanspi_sensor_entry elanspi_sensor_table[] = {
-  {0x0, 0x78, 0x78, 0x0, 0x0, "eFSA120S"},
-  {0x1, 0x78, 0x78, 0x1, 0x1, "eFSA120SA"},
-  {0x2, 0xA0, 0xA0, 0x0, 0x0, "eFSA160S"},
-  {0x3, 0xd0, 0x50, 0x0, 0x0, "eFSA820R"},
-  {0x4, 0xC0, 0x38, 0x0, 0x0, "eFSA519R"},
-  {0x5, 0x60, 0x60, 0x0, 0x0, "eFSA96S"},
-  {0x6, 0x60, 0x60, 0x1, 0x1, "eFSA96SA"},
-  {0x7, 0x60, 0x60, 0x2, 0x1, "eFSA96SB"},
-  {0x8, 0xa0, 0x50, 0x1, 0x1, "eFSA816RA"},
-  {0x9, 0x90, 0x40, 0x1, 0x1, "eFSA614RA"},
-  {0xA, 0x90, 0x40, 0x2, 0x1, "eFSA614RB"},
-  {0xB, 0x40, 0x58, 0x1, 0x1, "eFSA688RA"},
-  {0xC, 0x50, 0x50, 0x1, 0x0, "eFSA80SA"},
-  {0xD, 0x47, 0x80, 0x1, 0x1, "eFSA712RA"},
-  {0xE, 0x50, 0x50, 0x2, 0x0, "eFSA80SC"},
-  {0,   0,    0,    0,   0,   NULL}
-};
-
-struct elanspi_reg_entry
-{
-  unsigned char addr, value;
-  /* terminates with 0xFF, 0xFF since register 0x0 is valid */
-};
-
-struct elanspi_regtable
-{
-  const struct elanspi_reg_entry *other;
-  struct
-  {
-    unsigned char                   sid;
-    const struct elanspi_reg_entry *table;
-  } entries[];
-};
-
-static const struct elanspi_reg_entry elanspi_calibration_table_default[] = {
-  {0x05, 0x60},
-  {0x06, 0xc0},
-  {0x07, 0x80},
-  {0x08, 0x04},
-  {0x0a, 0x97},
-  {0x0b, 0x72},
-  {0x0c, 0x69},
-  {0x0f, 0x2a},
-  {0x11, 0x2a},
-  {0x13, 0x27},
-  {0x15, 0x67},
-  {0x18, 0x04},
-  {0x21, 0x20},
-  {0x22, 0x36},
-  {0x2a, 0x5f},
-  {0x2b, 0xc0},
-  {0x2e, 0xff},
-
-  {0xff, 0xff}
-};
-
-static const struct elanspi_reg_entry elanspi_calibration_table_id567[] = {
-  {0x2A, 0x07},
-  {0x5,  0x60},
-  {0x6,  0xC0},
-  {0x7,  0x80},
-  {0x8,  0x04},
-  {0xA,  0x97},
-  {0xB,  0x72},
-  {0xC,  0x69},
-  {0xF,  0x2A},
-  {0x11, 0x2A},
-  {0x13, 0x27},
-  {0x15, 0x67},
-  {0x18, 0x04},
-  {0x21, 0x20},
-  {0x22, 0x36},
-  {0x2A, 0x5F},
-  {0x2B, 0xC0},
-  {0x2E, 0xFF},
-
-  {0xff, 0xff}
-};
-
-static const struct elanspi_reg_entry elanspi_calibration_table_id0[] = {
-  {0x5,  0x60},
-  {0x6,  0xC0},
-  {0x8,  0x04},
-  {0xA,  0x97},
-  {0xB,  0x72},
-  {0xC,  0x69},
-  {0xF,  0x2B},
-  {0x11, 0x2B},
-  {0x13, 0x28},
-  {0x15, 0x28},
-  {0x18, 0x04},
-  {0x21, 0x20},
-  {0x2A, 0x4B},
-
-  {0xff, 0xff}
-};
-
-// old style sensor calibration, with only one page of registers
-static const struct elanspi_regtable elanspi_calibration_table_old = {
-  .other = elanspi_calibration_table_default,
-  .entries = {
-    { .sid = 0x0, .table = elanspi_calibration_table_id0 },
-    { .sid = 0x5, .table = elanspi_calibration_table_id567 },
-    { .sid = 0x6, .table = elanspi_calibration_table_id567 },
-    { .sid = 0x7, .table = elanspi_calibration_table_id567 },
-    { .sid = 0x0, .table = NULL }
-  }
-};
-
-// new style sensor calibration, with two pages of registers
-static const struct elanspi_reg_entry elanspi_calibration_table_page0_id14[] = {
-  {0x00, 0x5a},
-  {0x01, 0x00},
-  {0x02, 0x4f},
-  {0x03, 0x00},
-  {0x04, 0x4f},
-  {0x05, 0xa0},
-  {0x06, 0x00},
-  {0x07, 0x00},
-  {0x08, 0x00},
-  {0x09, 0x04},
-  {0x0a, 0x74},
-  {0x0b, 0x05},
-  {0x0c, 0x08},
-  {0x0d, 0x00},
-  {0x0e, 0x00},
-  {0x0f, 0x14},
-  {0x10, 0x3c},
-  {0x11, 0x41},
-  {0x12, 0x0c},
-  {0x13, 0x00},
-  {0x14, 0x00},
-  {0x15, 0x04},
-  {0x16, 0x02},
-  {0x17, 0x00},
-  {0x18, 0x01},
-  {0x19, 0xf4},
-  {0x1a, 0x00},
-  {0x1b, 0x00},
-  {0x1c, 0x00},
-  {0x1d, 0x00},
-  {0x1e, 0x00},
-  {0x1f, 0x00},
-  {0x20, 0x00},
-  {0x21, 0x80},
-  {0x22, 0x06},
-  {0x23, 0x00},
-  {0x24, 0x00},
-  {0x25, 0x00},
-  {0x26, 0x00},
-  {0x27, 0x00},
-  {0x28, 0x00},
-  {0x29, 0x04},
-  {0x2a, 0x5f},
-  {0x2b, 0xe2},
-  {0x2c, 0xa0},
-  {0x2d, 0x00},
-  {0x2e, 0xff},
-  {0x2f, 0x40},
-  {0x30, 0x01},
-  {0x31, 0x38},
-  {0x32, 0x00},
-  {0x33, 0x00},
-  {0x34, 0x00},
-  {0x35, 0x1f},
-  {0x36, 0xff},
-  {0x37, 0x00},
-  {0x38, 0x00},
-  {0x39, 0x00},
-  {0x3a, 0x00},
-  {0xff, 0xff}
-};
-
-static const struct elanspi_reg_entry elanspi_calibration_table_page1_id14[] = {
-  {0x00, 0x7b},
-  {0x01, 0x7f},
-  {0x02, 0x77},
-  {0x03, 0xd4},
-  {0x04, 0x7d},
-  {0x05, 0x19},
-  {0x06, 0x80},
-  {0x07, 0x40},
-  {0x08, 0x11},
-  {0x09, 0x00},
-  {0x0a, 0x00},
-  {0x0b, 0x14},
-  {0x0c, 0x00},
-  {0x0d, 0x00},
-  {0x0e, 0x32},
-  {0x0f, 0x02},
-  {0x10, 0x08},
-  {0x11, 0x6c},
-  {0x12, 0x00},
-  {0x13, 0x00},
-  {0x14, 0x32},
-  {0x15, 0x01},
-  {0x16, 0x16},
-  {0x17, 0x01},
-  {0x18, 0x14},
-  {0x19, 0x01},
-  {0x1a, 0x16},
-  {0x1b, 0x01},
-  {0x1c, 0x17},
-  {0x1d, 0x01},
-  {0x1e, 0x0a},
-  {0x1f, 0x01},
-  {0x20, 0x0a},
-  {0x21, 0x02},
-  {0x22, 0x08},
-  {0x23, 0x29},
-  {0x24, 0x00},
-  {0x25, 0x0c},
-  {0x26, 0x1a},
-  {0x27, 0x30},
-  {0x28, 0x1a},
-  {0x29, 0x30},
-  {0x2a, 0x00},
-  {0x2b, 0x00},
-  {0x2c, 0x01},
-  {0x2d, 0x16},
-  {0x2e, 0x01},
-  {0x2f, 0x17},
-  {0x30, 0x03},
-  {0x31, 0x2d},
-  {0x32, 0x03},
-  {0x33, 0x2d},
-  {0x34, 0x14},
-  {0x35, 0x00},
-  {0x36, 0x00},
-  {0x37, 0x00},
-  {0x38, 0x00},
-  {0x39, 0x03},
-  {0x3a, 0xfe},
-  {0x3b, 0x00},
-  {0x3c, 0x00},
-  {0x3d, 0x02},
-  {0x3e, 0x00},
-  {0x3f, 0x00},
-  {0xff, 0xff}
-};
-
-static const struct elanspi_regtable elanspi_calibration_table_new_page0 = {
-  .other = NULL,
-  .entries = {
-    { .sid = 0xe, .table = elanspi_calibration_table_page0_id14 },
-    { .sid = 0x0, .table = NULL }
-  }
-};
-
-static const struct elanspi_regtable elanspi_calibration_table_new_page1 = {
-  .other = NULL,
-  .entries = {
-    { .sid = 0xe, .table = elanspi_calibration_table_page1_id14 },
-    { .sid = 0x0, .table = NULL }
-  }
-};
-
-#define ELANSPI_NO_ROTATE 0
-#define ELANSPI_90LEFT_ROTATE 1
-#define ELANSPI_180_ROTATE 2
-#define ELANSPI_90RIGHT_ROTATE 3
-
-#define ELANSPI_HV_FLIPPED 1
-
-#define ELANSPI_UDEV_TYPES FPI_DEVICE_UDEV_SUBTYPE_SPIDEV | FPI_DEVICE_UDEV_SUBTYPE_HIDRAW
-#define ELANSPI_TP_VID 0x04f3
-
-// using checkargs ACPI:HIDPID
-static const FpIdEntry elanspi_id_table[] = {
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x3057}, .driver_data = ELANSPI_180_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x3087}, .driver_data = ELANSPI_180_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x30c6}, .driver_data = ELANSPI_180_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN70A1", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x3134}, .driver_data = ELANSPI_90LEFT_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x3148}, .driver_data = ELANSPI_180_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x30b2}, .driver_data = ELANSPI_NO_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN70A1", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x30b2}, .driver_data = ELANSPI_NO_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x309f}, .driver_data = ELANSPI_180_ROTATE},
-  {.udev_types = 0}
-};
-
-#define ELANSPI_MAX_OLD_STAGE1_CALIBRATION_MEAN 1000
-
-#define ELANSPI_MIN_OLD_STAGE2_CALBIRATION_MEAN 3000
-#define ELANSPI_MAX_OLD_STAGE2_CALBIRATION_MEAN 8000
-
-#define ELANSPI_HV_CALIBRATION_TARGET_MEAN 3000
-
-#define ELANSPI_MIN_EMPTY_INVALID_PERCENT 6
-#define ELANSPI_MAX_REAL_INVALID_PERCENT 3
-
-#define ELANSPI_MIN_REAL_STDDEV (592 * 592)
-#define ELANSPI_MAX_EMPTY_STDDEV (350 * 350)
-
-#define ELANSPI_MIN_FRAMES_DEBOUNCE 2
-
-#define ELANSPI_SWIPE_FRAMES_DISCARD 1
-#define ELANSPI_MIN_FRAMES_SWIPE (7 + ELANSPI_SWIPE_FRAMES_DISCARD)
-#define ELANSPI_MAX_FRAMES_SWIPE (20 + ELANSPI_SWIPE_FRAMES_DISCARD)
-
-#define ELANSPI_MAX_FRAME_HEIGHT 43
-#define ELANSPI_MIN_FRAME_TO_FRAME_DIFF (250 * 250)
-
-#define ELANSPI_HV_SENSOR_FRAME_DELAY 23
-
-#define ELANSPI_OTP_TIMEOUT_USEC (12 * 1000)
-
-#define ELANSPI_OLD_CAPTURE_TIMEOUT_USEC (100 * 1000)
-#define ELANSPI_HV_CAPTURE_TIMEOUT_USEC (50 * 1000)
--- a/libfprint/drivers/goodixmoc/goodix.c
+++ b/libfprint/drivers/goodixmoc/goodix.c
@ -54,6 +54,7 @@ struct _FpiDeviceGoodixMoc
  gint               enroll_stage;
  gint               max_enroll_stage;
  gint               max_stored_prints;
+  GCancellable      *cancellable;
  GPtrArray         *list_result;
  guint8             template_id[TEMPLATE_ID_SIZE];
  gboolean           is_enroll_identify;
@ -219,7 +220,7 @@ fp_cmd_run_state (FpiSsm   *ssm,
      fpi_usb_transfer_fill_bulk (transfer, EP_IN, EP_IN_MAX_BUF_SIZE);
      fpi_usb_transfer_submit (transfer,
                               self->cmd_cancelable ? 0 : DATA_TIMEOUT,
-                               self->cmd_cancelable ? fpi_device_get_cancellable (dev) : NULL,
+                               self->cmd_cancelable ? self->cancellable : NULL,
                               fp_cmd_receive_cb,
                               fpi_ssm_get_data (ssm));
      break;
@ -1317,11 +1318,6 @@ gx_fp_probe (FpDevice *device)
    {
    case 0x6496:
    case 0x60A2:
-    case 0x609C:
-    case 0x639C:
-    case 0x63AC:
-    case 0x63BC:
-    case 0x6A94:
      self->max_enroll_stage = 12;
      break;

@ -1352,6 +1348,8 @@ gx_fp_init (FpDevice *device)
  self->max_stored_prints = FP_MAX_FINGERNUM;
  self->is_power_button_shield_on = false;

+  self->cancellable = g_cancellable_new ();
+
  self->sensorcfg = g_new0 (gxfp_sensor_cfg_t, 1);

  ret = gx_proto_init_sensor_config (self->sensorcfg);
@ -1389,6 +1387,7 @@ gx_fp_release_interface (FpiDeviceGoodixMoc *self,
 {
  g_autoptr(GError) release_error = NULL;

+  g_clear_object (&self->cancellable);
  g_clear_pointer (&self->sensorcfg, g_free);

  /* Release usb interface */
@ -1444,10 +1443,8 @@ gx_fp_verify_identify (FpDevice *device)
 {
  FpiDeviceGoodixMoc *self = FPI_DEVICE_GOODIXMOC (device);

-  self->task_ssm = fpi_ssm_new_full (device, fp_verify_sm_run_state,
-                                     FP_VERIFY_NUM_STATES,
-                                     FP_VERIFY_PWR_BTN_SHIELD_OFF,
-                                     "verify");
+  self->task_ssm = fpi_ssm_new (device, fp_verify_sm_run_state,
+                                FP_VERIFY_NUM_STATES);

  fpi_ssm_start (self->task_ssm, fp_verify_ssm_done);

@ -1462,10 +1459,8 @@ gx_fp_enroll (FpDevice *device)
  self->enroll_stage = 0;
  self->is_enroll_identify = true;

-  self->task_ssm = fpi_ssm_new_full (device, fp_enroll_sm_run_state,
-                                     FP_ENROLL_NUM_STATES,
-                                     FP_ENROLL_PWR_BTN_SHIELD_OFF,
-                                     "enroll");
+  self->task_ssm = fpi_ssm_new (device, fp_enroll_sm_run_state,
+                                FP_ENROLL_NUM_STATES);

  fpi_ssm_start (self->task_ssm, fp_enroll_ssm_done);

@ -1538,20 +1533,27 @@ fpi_device_goodixmoc_init (FpiDeviceGoodixMoc *self)

 }

+static void
+gx_fp_cancel (FpDevice *device)
+{
+  FpiDeviceGoodixMoc *self = FPI_DEVICE_GOODIXMOC (device);
+
+  /* Cancel any current interrupt transfer (resulting us to go into
+   * response reading mode again); then create a new cancellable
+   * for the next transfers. */
+  g_cancellable_cancel (self->cancellable);
+  g_clear_object (&self->cancellable);
+  self->cancellable = g_cancellable_new ();
+
+}
+
 static const FpIdEntry id_table[] = {
  { .vid = 0x27c6,  .pid = 0x5840,  },
-  { .vid = 0x27c6,  .pid = 0x609C,  },
-  { .vid = 0x27c6,  .pid = 0x60A2,  },
-  { .vid = 0x27c6,  .pid = 0x639C,  },
-  { .vid = 0x27c6,  .pid = 0x63AC,  },
-  { .vid = 0x27c6,  .pid = 0x63BC,  },
  { .vid = 0x27c6,  .pid = 0x6496,  },
-  { .vid = 0x27c6,  .pid = 0x6584,  },
-  { .vid = 0x27c6,  .pid = 0x658C,  },
-  { .vid = 0x27c6,  .pid = 0x6592,  },
+  { .vid = 0x27c6,  .pid = 0x60A2,  },
+  { .vid = 0x27c6,  .pid = 0x63AC,  },
+  { .vid = 0x27c6,  .pid = 0x639C,  },
  { .vid = 0x27c6,  .pid = 0x6594,  },
-  { .vid = 0x27c6,  .pid = 0x659C,  },
-  { .vid = 0x27c6,  .pid = 0x6A94,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };

@ -1567,7 +1569,6 @@ fpi_device_goodixmoc_class_init (FpiDeviceGoodixMocClass *klass)
  dev_class->scan_type = FP_SCAN_TYPE_PRESS;
  dev_class->id_table = id_table;
  dev_class->nr_enroll_stages = DEFAULT_ENROLL_SAMPLES;
-  dev_class->temp_hot_seconds = -1;

  dev_class->open   = gx_fp_init;
  dev_class->close  = gx_fp_exit;
@ -1575,9 +1576,10 @@ fpi_device_goodixmoc_class_init (FpiDeviceGoodixMocClass *klass)
  dev_class->enroll = gx_fp_enroll;
  dev_class->delete = gx_fp_template_delete;
  dev_class->list   = gx_fp_template_list;
+  dev_class->cancel = gx_fp_cancel;
  dev_class->verify   = gx_fp_verify_identify;
  dev_class->identify = gx_fp_verify_identify;

  fpi_device_class_auto_initialize_features (dev_class);
-  dev_class->features |= FP_DEVICE_FEATURE_DUPLICATES_CHECK;
+  dev_class->features |= FPI_DEVICE_FEATURE_DUPLICATES_CHECK;
 }
--- a/libfprint/drivers/nb1010.c
+++ b/libfprint/drivers/nb1010.c
@ -353,7 +353,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
    {
    case M_WAIT_PRINT:
      /* Wait fingerprint scanning */
-      fpi_ssm_next_state_delayed (ssm, NB1010_TRANSITION_DELAY);
+      fpi_ssm_next_state_delayed (ssm, NB1010_TRANSITION_DELAY, NULL);
      break;

    case M_REQUEST_PRINT:
--- a/libfprint/drivers/synaptics/bmkt_response.h
+++ b/libfprint/drivers/synaptics/bmkt_response.h
@ -468,7 +468,6 @@ typedef union
  bmkt_del_all_users_resp_t    del_all_users_resp;
  bmkt_enroll_templates_resp_t enroll_templates_resp;
  bmkt_del_user_resp_t         del_user_resp;
-  bmkt_del_all_users_resp_t    del_all_user_resp;
  bmkt_enrolled_fingers_resp_t enrolled_fingers_resp;
 } bmkt_response_data_t;

--- a/libfprint/drivers/synaptics/synaptics.c
+++ b/libfprint/drivers/synaptics/synaptics.c
@ -32,17 +32,13 @@ static void compose_and_send_identify_msg (FpDevice *device);

 static const FpIdEntry id_table[] = {
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00BD,  },
+  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00E9,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00DF,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00F9,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00FC,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00C2,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00C9,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0100,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00F0,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0103,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0123,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0126,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0129,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };

@ -201,16 +197,11 @@ cmd_interrupt_cb (FpiUsbTransfer *transfer,
                  GError         *error)
 {
  g_debug ("interrupt transfer done");
-  fpi_device_critical_enter (device);
-
  if (error)
    {
      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
        {
          g_error_free (error);
-          if (FPI_DEVICE_SYNAPTICS (device)->cmd_suspended)
-            fpi_ssm_jump_to_state (transfer->ssm, SYNAPTICS_CMD_SUSPENDED);
-          else
          fpi_ssm_jump_to_state (transfer->ssm, SYNAPTICS_CMD_GET_RESP);
          return;
        }
@ -272,9 +263,6 @@ synaptics_cmd_run_state (FpiSsm   *ssm,
      break;

    case SYNAPTICS_CMD_WAIT_INTERRUPT:
-      /* Interruptions are permitted only during an interrupt transfer */
-      fpi_device_critical_leave (dev);
-
      transfer = fpi_usb_transfer_new (dev);
      transfer->ssm = ssm;
      fpi_usb_transfer_fill_interrupt (transfer, USB_EP_INTERRUPT, USB_INTERRUPT_DATA_SIZE);
@ -302,17 +290,6 @@ synaptics_cmd_run_state (FpiSsm   *ssm,
    case SYNAPTICS_CMD_RESTART:
      fpi_ssm_jump_to_state (ssm, SYNAPTICS_CMD_SEND_PENDING);
      break;
-
-    case SYNAPTICS_CMD_SUSPENDED:
-      /* The resume handler continues to the next state! */
-      fpi_device_critical_leave (dev);
-      fpi_device_suspend_complete (dev, NULL);
-      break;
-
-    case SYNAPTICS_CMD_RESUME:
-      fpi_device_critical_enter (dev);
-      fpi_ssm_jump_to_state (ssm, SYNAPTICS_CMD_WAIT_INTERRUPT);
-      break;
    }
 }

@ -328,7 +305,6 @@ cmd_ssm_done (FpiSsm *ssm, FpDevice *dev, GError *error)
  if (error || self->cmd_complete_on_removal)
    callback (self, NULL, error);

-  fpi_device_critical_leave (dev);
  self->cmd_complete_on_removal = FALSE;
 }

@ -438,7 +414,6 @@ synaptics_sensor_cmd (FpiDeviceSynaptics *self,
                                       SYNAPTICS_CMD_NUM_STATES);
          fpi_ssm_set_data (self->cmd_ssm, callback, NULL);

-          fpi_device_critical_enter (FP_DEVICE (self));
          fpi_ssm_start (self->cmd_ssm, cmd_ssm_done);
        }
    }
@ -485,7 +460,7 @@ create_print (FpiDeviceSynaptics *self,
              guint8              finger_id)
 {
  FpPrint *print;
-  g_autofree gchar *user_id_safe = NULL;
+  g_autofree gchar *user_id_safe;
  GVariant *data = NULL;
  GVariant *uid = NULL;

@ -510,6 +485,100 @@ create_print (FpiDeviceSynaptics *self,
  return print;
 }

+static void
+list_msg_cb (FpiDeviceSynaptics *self,
+             bmkt_response_t    *resp,
+             GError             *error)
+{
+  bmkt_enroll_templates_resp_t *get_enroll_templates_resp;
+
+  if (error)
+    {
+      g_clear_pointer (&self->list_result, g_ptr_array_unref);
+      fpi_device_list_complete (FP_DEVICE (self), NULL, error);
+      return;
+    }
+
+  get_enroll_templates_resp = &resp->response.enroll_templates_resp;
+
+  switch (resp->response_id)
+    {
+    case BMKT_RSP_QUERY_FAIL:
+      if (resp->result == BMKT_FP_DATABASE_EMPTY)
+        {
+          fp_info ("Database is empty");
+
+          fpi_device_list_complete (FP_DEVICE (self),
+                                    g_steal_pointer (&self->list_result),
+                                    NULL);
+        }
+      else
+        {
+          fp_info ("Failed to query enrolled users: %d", resp->result);
+          g_clear_pointer (&self->list_result, g_ptr_array_unref);
+          fpi_device_list_complete (FP_DEVICE (self),
+                                    NULL,
+                                    fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
+                                                              "Failed to query enrolled users: %d",
+                                                              resp->result));
+        }
+      break;
+
+    case BMKT_RSP_QUERY_RESPONSE_COMPLETE:
+      fp_info ("Query complete!");
+
+      fpi_device_list_complete (FP_DEVICE (self),
+                                g_steal_pointer (&self->list_result),
+                                NULL);
+
+      break;
+
+    case BMKT_RSP_TEMPLATE_RECORDS_REPORT:
+
+      for (int n = 0; n < BMKT_MAX_NUM_TEMPLATES_INTERNAL_FLASH; n++)
+        {
+          FpPrint *print;
+
+          if (get_enroll_templates_resp->templates[n].user_id_len == 0)
+            continue;
+
+          fp_info ("![query %d of %d] template %d: status=0x%x, userId=%s, fingerId=%d",
+                   get_enroll_templates_resp->query_sequence,
+                   get_enroll_templates_resp->total_query_messages,
+                   n,
+                   get_enroll_templates_resp->templates[n].template_status,
+                   get_enroll_templates_resp->templates[n].user_id,
+                   get_enroll_templates_resp->templates[n].finger_id);
+
+          print = create_print (self,
+                                get_enroll_templates_resp->templates[n].user_id,
+                                get_enroll_templates_resp->templates[n].finger_id);
+
+          g_ptr_array_add (self->list_result, g_object_ref_sink (print));
+        }
+
+      synaptics_sensor_cmd (self,
+                            self->cmd_seq_num,
+                            BMKT_CMD_GET_NEXT_QUERY_RESPONSE,
+                            NULL,
+                            0,
+                            NULL);
+
+      break;
+    }
+}
+
+static void
+list (FpDevice *device)
+{
+  FpiDeviceSynaptics *self = FPI_DEVICE_SYNAPTICS (device);
+
+  G_DEBUG_HERE ();
+
+  self->list_result = g_ptr_array_new_with_free_func (g_object_unref);
+  synaptics_sensor_cmd (self, 0, BMKT_CMD_GET_TEMPLATE_RECORDS, NULL, 0, list_msg_cb);
+}
+
 static void
 verify_complete_after_finger_removal (FpiDeviceSynaptics *self)
 {
@ -534,12 +603,6 @@ verify_msg_cb (FpiDeviceSynaptics *self,
  FpDevice *device = FP_DEVICE (self);
  bmkt_verify_resp_t *verify_resp;

-  if (self->action_starting)
-    {
-      fpi_device_critical_leave (device);
-      self->action_starting = FALSE;
-    }
-
  if (error)
    {
      fpi_device_verify_complete (device, error);
@ -632,8 +695,6 @@ verify (FpDevice *device)

  G_DEBUG_HERE ();

-  self->action_starting = TRUE;
-  fpi_device_critical_enter (device);
  synaptics_sensor_cmd (self, 0, BMKT_CMD_VERIFY_USER, user_id, user_id_len, verify_msg_cb);
 }

@ -661,12 +722,6 @@ identify_msg_cb (FpiDeviceSynaptics *self,
 {
  FpDevice *device = FP_DEVICE (self);

-  if (self->action_starting)
-    {
-      fpi_device_critical_leave (device);
-      self->action_starting = FALSE;
-    }
-
  if (error)
    {
      fpi_device_identify_complete (device, error);
@ -755,25 +810,6 @@ identify_msg_cb (FpiDeviceSynaptics *self,
 static void
 identify (FpDevice *device)
 {
-  GPtrArray *prints = NULL;
-  FpiDeviceSynaptics *self = FPI_DEVICE_SYNAPTICS (device);
-
-  fpi_device_get_identify_data (device, &prints);
-
-  /* Identify over no prints does not work for synaptics.
-   * This *may* make sense for other devices though, as identify may return
-   * a matched print even if it is not in the list of prints.
-   */
-  if (prints->len == 0)
-    {
-      fpi_device_identify_report (device, NULL, NULL, NULL);
-      fpi_device_identify_complete (device, NULL);
-      return;
-    }
-
-  self->action_starting = TRUE;
-  fpi_device_critical_enter (device);
-
  init_identify_msg (device);
  compose_and_send_identify_msg (device);
 }
@ -876,12 +912,6 @@ enroll_msg_cb (FpiDeviceSynaptics *self,
  FpDevice *device = FP_DEVICE (self);
  bmkt_enroll_resp_t *enroll_resp;

-  if (self->action_starting)
-    {
-      fpi_device_critical_leave (device);
-      self->action_starting = FALSE;
-    }
-
  if (error)
    {
      fpi_device_enroll_complete (device, NULL, error);
@ -1028,9 +1058,6 @@ enroll (FpDevice *device)
  payload[1] = finger;
  memcpy (payload + 2, user_id, user_id_len);

-  self->action_starting = TRUE;
-  fpi_device_critical_enter (device);
-
  synaptics_sensor_cmd (self, 0, BMKT_CMD_ENROLL_USER, payload, user_id_len + 2, enroll_msg_cb);
 }

@ -1044,7 +1071,6 @@ delete_msg_cb (FpiDeviceSynaptics *self,

  if (error)
    {
-      fpi_device_critical_leave (device);
      fpi_device_delete_complete (device, error);
      return;
    }
@ -1059,24 +1085,17 @@ delete_msg_cb (FpiDeviceSynaptics *self,
      break;

    case BMKT_RSP_DEL_USER_FP_FAIL:
-      fpi_device_critical_leave (device);
-      if (resp->result == BMKT_FP_DATABASE_NO_RECORD_EXISTS ||
-          resp->result == BMKT_FP_DATABASE_EMPTY)
-        {
-          fp_info ("Database no record");
-          fpi_device_delete_complete (device, NULL);
-        }
-      else
-        {
      fp_info ("Failed to delete enrolled user: %d", resp->result);
+      if (resp->result == BMKT_FP_DATABASE_NO_RECORD_EXISTS)
+        fpi_device_delete_complete (device,
+                                    fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND));
+      else
        fpi_device_delete_complete (device,
                                    fpi_device_error_new (FP_DEVICE_ERROR_GENERAL));
-        }
      break;

    case BMKT_RSP_DEL_USER_FP_OK:
      fp_info ("Successfully deleted enrolled user");
-      fpi_device_critical_leave (device);
      fpi_device_delete_complete (device, NULL);
      break;
    }
@ -1111,58 +1130,9 @@ delete_print (FpDevice *device)
  payload[0] = finger;
  memcpy (payload + 1, user_id, user_id_len);

-  fpi_device_critical_enter (device);
  synaptics_sensor_cmd (self, 0, BMKT_CMD_DEL_USER_FP, payload, user_id_len + 1, delete_msg_cb);
 }

-static void
-clear_storage_msg_cb (FpiDeviceSynaptics *self,
-                      bmkt_response_t    *resp,
-                      GError             *error)
-{
-  FpDevice *device = FP_DEVICE (self);
-  bmkt_del_all_users_resp_t *del_all_user_resp;
-
-  if (error)
-    {
-      fpi_device_clear_storage_complete (device, error);
-      return;
-    }
-  del_all_user_resp = &resp->response.del_all_user_resp;
-
-  switch (resp->response_id)
-    {
-    case BMKT_RSP_DELETE_PROGRESS:
-      fp_info ("Deleting All Enrolled Users is %d%% complete",
-               del_all_user_resp->progress);
-      break;
-
-    case BMKT_RSP_DEL_FULL_DB_FAIL:
-      if (resp->result == BMKT_FP_DATABASE_EMPTY)
-        fpi_device_clear_storage_complete (device, NULL);
-      else
-        fpi_device_clear_storage_complete (device,
-                                           fpi_device_error_new (FP_DEVICE_ERROR_GENERAL));
-      break;
-
-    case BMKT_RSP_DEL_FULL_DB_OK:
-      fp_info ("Successfully deleted all enrolled user");
-      fpi_device_clear_storage_complete (device, NULL);
-      break;
-    }
-}
-
-static void
-clear_storage (FpDevice *device)
-{
-  FpiDeviceSynaptics *self = FPI_DEVICE_SYNAPTICS (device);
-
-  g_debug ("clear all prints in database");
-  synaptics_sensor_cmd (self, 0, BMKT_CMD_DEL_FULL_DB, NULL, 0, clear_storage_msg_cb);
-  return;
-}
-
-
 static void
 prob_msg_cb (FpiDeviceSynaptics *self,
             bmkt_response_t    *resp,
@ -1170,18 +1140,14 @@ prob_msg_cb (FpiDeviceSynaptics *self,
 {
  GUsbDevice *usb_dev = NULL;
  g_autofree gchar *serial = NULL;
-  GError *err = NULL;

  usb_dev = fpi_device_get_usb_device (FP_DEVICE (self));

  if (error)
    {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        err = fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL, "unsupported firmware version");
-
      g_usb_device_close (usb_dev, NULL);
-      fpi_device_probe_complete (FP_DEVICE (self), NULL, NULL, err);
-      g_clear_error (&error);
+      fpi_device_probe_complete (FP_DEVICE (self), NULL, NULL,
+                                 fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL, "unsupported firmware version"));
      return;
    }

@ -1190,17 +1156,13 @@ prob_msg_cb (FpiDeviceSynaptics *self,
  else
    serial = g_usb_device_get_string_descriptor (usb_dev,
                                                 g_usb_device_get_serial_number_index (usb_dev),
-                                                 &err);
+                                                 &error);

  /* BMKT_OPERATION_DENIED is returned if the sensor is already initialized */
  if (resp->result == BMKT_SUCCESS || resp->result == BMKT_OPERATION_DENIED)
    {
      g_usb_device_close (usb_dev, NULL);
-      fpi_device_probe_complete (FP_DEVICE (self), serial, NULL, err);
-    }
-  else if (resp->result == BMKT_FP_SYSTEM_BUSY)
-    {
-      synaptics_sensor_cmd (self, self->cmd_seq_num, BMKT_CMD_CANCEL_OP, NULL, 0, NULL);
+      fpi_device_probe_complete (FP_DEVICE (self), serial, NULL, error);
    }
  else
    {
@ -1323,9 +1285,6 @@ fps_init_msg_cb (FpiDeviceSynaptics *self,
 {
  if (error)
    {
-      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_clear_error (&error);
-
      fpi_device_open_complete (FP_DEVICE (self), error);
      return;
    }
@ -1335,10 +1294,6 @@ fps_init_msg_cb (FpiDeviceSynaptics *self,
    {
      fpi_device_open_complete (FP_DEVICE (self), NULL);
    }
-  else if (resp->result == BMKT_FP_SYSTEM_BUSY)
-    {
-      synaptics_sensor_cmd (self, self->cmd_seq_num, BMKT_CMD_CANCEL_OP, NULL, 0, NULL);
-    }
  else
    {
      g_warning ("Initializing fingerprint sensor failed with %d!", resp->result);
@ -1351,12 +1306,8 @@ fps_deinit_cb (FpiDeviceSynaptics *self,
               bmkt_response_t    *resp,
               GError             *error)
 {
-  g_autoptr(GError) err = NULL;
-
  /* Release usb interface */
-  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (self)), 0, 0, &err);
-  if (!error)
-    error = g_steal_pointer (&err);
+  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (self)), 0, 0, &error);

  g_clear_object (&self->interrupt_cancellable);

@ -1427,59 +1378,6 @@ cancel (FpDevice *dev)
  self->interrupt_cancellable = g_cancellable_new ();
 }

-static void
-suspend (FpDevice *dev)
-{
-  FpiDeviceSynaptics *self = FPI_DEVICE_SYNAPTICS (dev);
-  FpiDeviceAction action = fpi_device_get_current_action (dev);
-
-  g_debug ("got suspend request");
-
-  if (action != FPI_DEVICE_ACTION_VERIFY && action != FPI_DEVICE_ACTION_IDENTIFY)
-    {
-      fpi_device_suspend_complete (dev, fpi_device_error_new (FP_DEVICE_ERROR_NOT_SUPPORTED));
-      return;
-    }
-
-  /* We are guaranteed to have a cmd_ssm running at this time. */
-  g_assert (self->cmd_ssm);
-  g_assert (fpi_ssm_get_cur_state (self->cmd_ssm) == SYNAPTICS_CMD_WAIT_INTERRUPT);
-  self->cmd_suspended = TRUE;
-
-  /* Cancel the current transfer.
-   * The CMD SSM will go into the suspend state and signal readyness. */
-  g_cancellable_cancel (self->interrupt_cancellable);
-  g_clear_object (&self->interrupt_cancellable);
-  self->interrupt_cancellable = g_cancellable_new ();
-}
-
-static void
-resume (FpDevice *dev)
-{
-  FpiDeviceSynaptics *self = FPI_DEVICE_SYNAPTICS (dev);
-  FpiDeviceAction action = fpi_device_get_current_action (dev);
-
-  g_debug ("got resume request");
-
-  if (action != FPI_DEVICE_ACTION_VERIFY && action != FPI_DEVICE_ACTION_IDENTIFY)
-    {
-      g_assert_not_reached ();
-      fpi_device_resume_complete (dev, fpi_device_error_new (FP_DEVICE_ERROR_NOT_SUPPORTED));
-      return;
-    }
-
-  /* We must have a suspended cmd_ssm at this point */
-  g_assert (self->cmd_ssm);
-  g_assert (self->cmd_suspended);
-  g_assert (fpi_ssm_get_cur_state (self->cmd_ssm) == SYNAPTICS_CMD_SUSPENDED);
-  self->cmd_suspended = FALSE;
-
-  /* Restart interrupt transfer. */
-  fpi_ssm_jump_to_state (self->cmd_ssm, SYNAPTICS_CMD_RESUME);
-
-  fpi_device_resume_complete (dev, NULL);
-}
-
 static void
 fpi_device_synaptics_init (FpiDeviceSynaptics *self)
 {
@ -1497,7 +1395,6 @@ fpi_device_synaptics_class_init (FpiDeviceSynapticsClass *klass)
  dev_class->scan_type = FP_SCAN_TYPE_PRESS;
  dev_class->id_table = id_table;
  dev_class->nr_enroll_stages = ENROLL_SAMPLES;
-  dev_class->temp_hot_seconds = -1;

  dev_class->open = dev_init;
  dev_class->close = dev_exit;
@ -1506,10 +1403,8 @@ fpi_device_synaptics_class_init (FpiDeviceSynapticsClass *klass)
  dev_class->identify = identify;
  dev_class->enroll = enroll;
  dev_class->delete = delete_print;
-  dev_class->clear_storage = clear_storage;
  dev_class->cancel = cancel;
-  dev_class->suspend = suspend;
-  dev_class->resume = resume;
+  dev_class->list = list;

  fpi_device_class_auto_initialize_features (dev_class);
 }
--- a/libfprint/drivers/synaptics/synaptics.h
+++ b/libfprint/drivers/synaptics/synaptics.h
@ -93,8 +93,6 @@ typedef enum {
  SYNAPTICS_CMD_WAIT_INTERRUPT,
  SYNAPTICS_CMD_SEND_ASYNC,
  SYNAPTICS_CMD_RESTART,
-  SYNAPTICS_CMD_SUSPENDED,
-  SYNAPTICS_CMD_RESUME,
  SYNAPTICS_CMD_NUM_STATES,
 } SynapticsCmdState;

@ -112,12 +110,10 @@ struct _FpiDeviceSynaptics
  FpiSsm               *cmd_ssm;
  FpiUsbTransfer       *cmd_pending_transfer;
  gboolean              cmd_complete_on_removal;
-  gboolean              cmd_suspended;
  guint8                id_idx;

  bmkt_sensor_version_t mis_version;

-  gboolean              action_starting;
  GCancellable         *interrupt_cancellable;

  gint                  enroll_stage;
--- a/libfprint/drivers/upek_proto.c
+++ b/libfprint/drivers/upek_proto.c
@ -1,24 +1,21 @@
 /*
- * Code copied from gstreamer-plugins-bad gst/gdp/dataprotocol.c
- *
+ * LGPL CRC code copied from GStreamer-0.10.10:
 * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
 * Copyright (C) 2004,2006 Thomas Vander Stichele <thomas at apestaart dot org>
- * Copyright (C) 2014 Tim-Philipp Müller <tim centricular com>
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version
+ * 2.1 of the License.
 *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

 #include "upek_proto.h"
--- a/libfprint/drivers/upek_proto.h
+++ b/libfprint/drivers/upek_proto.h
@ -1,24 +1,21 @@
 /*
- * Code copied from gstreamer-plugins-bad gst/gdp/dataprotocol.c
- *
+ * LGPL CRC code copied from GStreamer-0.10.10:
 * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
 * Copyright (C) 2004,2006 Thomas Vander Stichele <thomas at apestaart dot org>
- * Copyright (C) 2014 Tim-Philipp Müller <tim centricular com>
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version
+ * 2.1 of the License.
 *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

 #include <stdint.h>
--- a/libfprint/drivers/upeksonly.c
+++ b/libfprint/drivers/upeksonly.c
@ -79,7 +79,7 @@ struct _FpiDeviceUpeksonly
  int                              num_flying;

  GSList                          *rows;
-  unsigned                         num_rows;
+  size_t                           num_rows;
  unsigned char                   *rowbuf;
  int                              rowbuf_offset;

@ -176,7 +176,6 @@ last_transfer_killed (FpImageDevice *dev)
      fpi_image_device_session_error (dev, g_steal_pointer (&self->kill_error));
      return;

-    case NOT_KILLING:
    default:
      return;
    }
@ -215,7 +214,7 @@ handoff_img (FpImageDevice *dev)

  self->rows = g_slist_reverse (self->rows);

-  fp_dbg ("%u rows", self->num_rows);
+  fp_dbg ("%lu rows", self->num_rows);
  img = fpi_assemble_lines (&self->assembling_ctx, self->rows, self->num_rows);

  g_slist_free_full (self->rows, g_free);
@ -295,7 +294,7 @@ row_complete (FpImageDevice *dev)
          if (self->num_blank > FINGER_REMOVED_THRESHOLD)
            {
              self->finger_state = FINGER_REMOVED;
-              fp_dbg ("detected finger removal. Blank rows: %d, Full rows: %u",
+              fp_dbg ("detected finger removal. Blank rows: %d, Full rows: %lu",
                      self->num_blank, self->num_rows);
              handoff_img (dev);
              return;
--- a/libfprint/drivers/upektc.c
+++ b/libfprint/drivers/upektc.c
@ -411,7 +411,7 @@ dev_init (FpImageDevice *dev)
      break;

    default:
-      fp_err ("Device variant %" G_GUINT64_FORMAT " is not known", driver_data);
+      fp_err ("Device variant %lu is not known", driver_data);
      g_assert_not_reached ();
      fpi_image_device_open_complete (dev, fpi_device_error_new (FP_DEVICE_ERROR_GENERAL));
      return;
--- a/libfprint/drivers/upektc_img.c
+++ b/libfprint/drivers/upektc_img.c
@ -221,7 +221,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
      if (response_size > transfer->actual_length)
        {
          fp_dbg ("response_size is %lu, actual_length is %d",
-                  (gulong) response_size, (gint) transfer->actual_length);
+                  response_size, (gint) transfer->actual_length);
          fp_dbg ("Waiting for rest of transfer");
          BUG_ON (self->response_rest);
          self->response_rest = response_size - transfer->actual_length;
@ -309,7 +309,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
                                            data);
          BUG_ON (self->image_size != IMAGE_SIZE);
          fp_dbg ("Image size is %lu",
-                  (gulong) self->image_size);
+                  self->image_size);
          img = fp_image_new (IMAGE_WIDTH, IMAGE_HEIGHT);
          img->flags |= FPI_IMAGE_PARTIAL;
          memcpy (img->data, self->image_bits,
--- a/libfprint/drivers/upekts.c
+++ b/libfprint/drivers/upekts.c
@ -10,20 +10,19 @@
 * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
 * Copyright (C) 2004,2006 Thomas Vander Stichele <thomas at apestaart dot org>

- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version
+ * 2.1 of the License.
 *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

 #define FP_COMPONENT "upekts"
@ -366,7 +365,7 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device,
      fp_err ("async msg read too short (%d)",
              (gint) transfer->actual_length);
      error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                        "Packet from device was too short (%" G_GSSIZE_FORMAT ")",
+                                        "Packet from device was too short (%lu)",
                                        transfer->actual_length);
      goto err;
    }
@ -993,7 +992,7 @@ e_handle_resp00 (FpDevice *dev, unsigned char *data,

  if (data_len != 14)
    {
-      fp_err ("received 3001 poll response of %" G_GSIZE_FORMAT " bytes?", data_len);
+      fp_err ("received 3001 poll response of %lu bytes?", data_len);
      do_enroll_stop (dev, NULL,
                      fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
                                                "received 3001 response with wrong length"));
@ -1090,7 +1089,7 @@ e_handle_resp02 (FpDevice *dev, unsigned char *data,

  if (data_len < sizeof (scan_comp))
    {
-      fp_err ("fingerprint data too short (%" G_GSIZE_FORMAT "u bytes)", data_len);
+      fp_err ("fingerprint data too short (%lu bytes)", data_len);
      error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, "fingerprint data too short");
    }
  else if (memcmp (data, scan_comp, sizeof (scan_comp)) != 0)
@ -1318,7 +1317,7 @@ v_handle_resp00 (FpDevice *dev, unsigned char *data,

  if (data_len != 14)
    {
-      fp_warn ("received 3001 poll response of %" G_GSIZE_FORMAT "u bytes?", data_len);
+      fp_warn ("received 3001 poll response of %lu bytes?", data_len);
      error = fpi_device_error_new (FP_DEVICE_ERROR_PROTO);
      goto out;
    }
--- a/libfprint/drivers/uru4000.c
+++ b/libfprint/drivers/uru4000.c
@ -131,7 +131,6 @@ struct _FpiDeviceUru4000
  void                           *img_data;
  int                             img_data_actual_length;
  uint16_t                        img_lines_done, img_block;
-  GRand                          *rand;
  uint32_t                        img_enc_seed;

  irq_cb_fn                       irq_cb;
@ -360,7 +359,7 @@ start_irq_handler (FpImageDevice *dev)
  transfer = fpi_usb_transfer_new (FP_DEVICE (dev));
  transfer->ssm = NULL;
  transfer->short_is_error = TRUE;
-  fpi_usb_transfer_fill_interrupt (transfer,
+  fpi_usb_transfer_fill_bulk (transfer,
                              EP_INTR,
                              IRQ_LENGTH);
  fpi_usb_transfer_submit (transfer, 0, self->irq_cancellable, irq_handler, NULL);
@ -398,7 +397,7 @@ finger_presence_irq_cb (FpImageDevice *dev,
    fpi_image_device_report_finger_status (dev, TRUE);
  else if (type == IRQDATA_FINGER_OFF)
    fpi_image_device_report_finger_status (dev, FALSE);
-  else if (type != IRQDATA_SCANPWR_ON)
+  else
    fp_warn ("ignoring unexpected interrupt %04x", type);
 }

@ -723,8 +722,7 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
              fp_dbg ("changing encryption keys.");
              img->block_info[self->img_block].flags &= ~BLOCKF_CHANGE_KEY;
              img->key_number++;
-              self->img_enc_seed = g_rand_int_range (self->rand, 0, RAND_MAX);
-              fp_dbg ("New image encryption seed: %d", self->img_enc_seed);
+              self->img_enc_seed = rand ();
              fpi_ssm_jump_to_state (ssm, IMAGING_SEND_INDEX);
              return;
            }
@ -867,7 +865,7 @@ rebootpwr_run_state (FpiSsm *ssm, FpDevice *_dev)
        }
      else
        {
-          fpi_ssm_jump_to_state_delayed (ssm, 10, REBOOTPWR_GET_HWSTAT);
+          fpi_ssm_jump_to_state_delayed (ssm, 10, REBOOTPWR_GET_HWSTAT, NULL);
        }
      break;
    }
@ -949,11 +947,11 @@ powerup_run_state (FpiSsm *ssm, FpDevice *_dev)
        }
      else if (!self->profile->auth_cr)
        {
-          fpi_ssm_jump_to_state_delayed (ssm, POWERUP_SET_HWSTAT, 10);
+          fpi_ssm_jump_to_state_delayed (ssm, POWERUP_SET_HWSTAT, 10, NULL);
        }
      else
        {
-          fpi_ssm_next_state_delayed (ssm, 10);
+          fpi_ssm_next_state_delayed (ssm, 10, NULL);
        }
      break;

@ -1221,8 +1219,7 @@ execute_state_change (FpImageDevice *dev)

      ssm = fpi_ssm_new (FP_DEVICE (dev), imaging_run_state,
                         IMAGING_NUM_STATES);
-      self->img_enc_seed = g_rand_int_range (self->rand, 0, RAND_MAX);
-      fp_dbg ("Image encryption seed: %d", self->img_enc_seed);
+      self->img_enc_seed = rand ();
      self->img_transfer = fpi_usb_transfer_new (FP_DEVICE (dev));
      self->img_transfer->ssm = ssm;
      self->img_transfer->short_is_error = FALSE;
@ -1358,11 +1355,6 @@ dev_init (FpImageDevice *dev)

  self = FPI_DEVICE_URU4000 (dev);

-  g_clear_pointer (&self->rand, g_rand_free);
-  self->rand = g_rand_new ();
-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
-    g_rand_set_seed (self->rand, 0xFACADE);
-
  driver_data = fpi_device_get_driver_data (FP_DEVICE (dev));
  self->profile = &uru4k_dev_info[driver_data];
  self->interface = g_usb_interface_get_number (iface);
@ -1415,7 +1407,6 @@ dev_deinit (FpImageDevice *dev)
    PK11_FreeSlot (self->slot);
  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (dev)),
                                  self->interface, 0, &error);
-  g_clear_pointer (&self->rand, g_rand_free);
  fpi_image_device_close_complete (dev, error);
 }

--- a/libfprint/drivers/vfs0050.c
+++ b/libfprint/drivers/vfs0050.c
@ -613,7 +613,7 @@ activate_ssm (FpiSsm *ssm, FpDevice *dev)
      clear_data (self);

      /* Wait for probable vdev->active changing */
-      fpi_ssm_next_state_delayed (ssm, VFS_SSM_TIMEOUT);
+      fpi_ssm_next_state_delayed (ssm, VFS_SSM_TIMEOUT, NULL);
      break;

    case SSM_NEXT_RECEIVE:
@ -632,7 +632,8 @@ activate_ssm (FpiSsm *ssm, FpDevice *dev)

    case SSM_WAIT_ANOTHER_SCAN:
      /* Orange light is on now */
-      fpi_ssm_jump_to_state_delayed (ssm, SSM_TURN_ON, VFS_SSM_ORANGE_TIMEOUT);
+      fpi_ssm_jump_to_state_delayed (ssm, SSM_TURN_ON, VFS_SSM_ORANGE_TIMEOUT,
+                                     NULL);
      break;

    default:
--- a/libfprint/drivers/vfs101.c
+++ b/libfprint/drivers/vfs101.c
@ -785,7 +785,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)

    case M_LOOP_0_SLEEP:
      /* Wait fingerprint scanning */
-      fpi_ssm_next_state_delayed (ssm, 50);
+      fpi_ssm_next_state_delayed (ssm, 50, NULL);
      break;

    case M_LOOP_0_GET_STATE:
@ -828,7 +828,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
      img_extract (ssm, dev);

      /* Wait handling image */
-      fpi_ssm_next_state_delayed (ssm, 10);
+      fpi_ssm_next_state_delayed (ssm, 10, NULL);
      break;

    case M_LOOP_0_CHECK_ACTION:
@ -851,7 +851,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
      if (vfs_finger_state (self) == VFS_FINGER_PRESENT)
        {
          fpi_image_device_report_finger_status (dev, TRUE);
-          fpi_ssm_next_state_delayed (ssm, 250);
+          fpi_ssm_next_state_delayed (ssm, 250, NULL);
        }
      else
        {
@ -881,7 +881,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)

    case M_LOOP_1_SLEEP:
      /* Wait fingerprint scanning */
-      fpi_ssm_next_state_delayed (ssm, 10);
+      fpi_ssm_next_state_delayed (ssm, 10, NULL);
      break;

    case M_LOOP_2_ABORT_PRINT:
@ -917,7 +917,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
        {
          /* Wait aborting */
          self->counter++;
-          fpi_ssm_next_state_delayed (ssm, 100);
+          fpi_ssm_next_state_delayed (ssm, 100, NULL);
        }
      else
        {
@ -1055,7 +1055,7 @@ m_init_state (FpiSsm *ssm, FpDevice *_dev)
        {
          /* Wait aborting */
          self->counter++;
-          fpi_ssm_next_state_delayed (ssm, 100);
+          fpi_ssm_next_state_delayed (ssm, 100, NULL);
        }
      else
        {
@ -1084,7 +1084,7 @@ m_init_state (FpiSsm *ssm, FpDevice *_dev)
            {
              /* Wait removing finger */
              self->counter++;
-              fpi_ssm_next_state_delayed (ssm, 250);
+              fpi_ssm_next_state_delayed (ssm, 250, NULL);
            }
          else
            {
--- a/libfprint/drivers/vfs301.c
+++ b/libfprint/drivers/vfs301.c
@ -97,7 +97,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)

    case M_WAIT_PRINT:
      /* Wait fingerprint scanning */
-      fpi_ssm_next_state_delayed (ssm, 200);
+      fpi_ssm_next_state_delayed (ssm, 200, NULL);
      break;

    case M_CHECK_PRINT:
@ -115,7 +115,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)

    case M_READ_PRINT_WAIT:
      /* Wait fingerprint scanning */
-      fpi_ssm_next_state_delayed (ssm, 200);
+      fpi_ssm_next_state_delayed (ssm, 200, NULL);
      break;

    case M_READ_PRINT_POLL:
--- a/libfprint/drivers/vfs301_proto.c
+++ b/libfprint/drivers/vfs301_proto.c
@ -465,7 +465,7 @@ int
 vfs301_proto_peek_event (FpDeviceVfs301 *dev)
 {
  g_autoptr(GError) error = NULL;
-  g_autoptr(FpiUsbTransfer) transfer = NULL;
+  FpiUsbTransfer *transfer;

  const char no_event[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
  const char got_event[] = {0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00};
--- a/libfprint/drivers/vfs5011.c
+++ b/libfprint/drivers/vfs5011.c
@ -196,7 +196,6 @@ usb_exchange_async (FpiSsm                  *ssm,
  FpiSsm *subsm = fpi_ssm_new_full (FP_DEVICE (data->device),
                                    usbexchange_loop,
                                    data->stepcount,
-                                    data->stepcount,
                                    exchange_name);

  fpi_ssm_set_data (subsm, data, NULL);
@ -706,7 +705,7 @@ activate_loop (FpiSsm *ssm, FpDevice *_dev)
      break;

    case DEV_ACTIVATE_DATA_COMPLETE:
-      fpi_ssm_next_state_delayed (ssm, 1);
+      fpi_ssm_next_state_delayed (ssm, 1, NULL);
      break;

    case DEV_ACTIVATE_PREPARE_NEXT_CAPTURE:
--- a/libfprint/drivers/vfs7552.c
+++ b/libfprint/drivers/vfs7552.c
@ -327,7 +327,6 @@ usb_exchange_async (FpiSsm                  *ssm,
  FpiSsm *subsm = fpi_ssm_new_full (fpi_ssm_get_device (ssm),
                                    usbexchange_loop,
                                    data->stepcount,
-                                    data->stepcount,
                                    exchange_name);

  fpi_ssm_set_data (subsm, data, NULL);
@ -487,7 +486,7 @@ deactivate_run_state (FpiSsm *ssm, FpDevice *_dev)
  switch (fpi_ssm_get_cur_state (ssm))
    {
    case DEACTIVATE_ENTER:
-      fpi_ssm_next_state_delayed (ssm, 10);
+      fpi_ssm_next_state_delayed (ssm, 10, NULL);
      break;

    case DEACTIVATE_DISABLE_SENSOR:
--- a/libfprint/drivers/virtual-device-private.h
+++ b/libfprint/drivers/virtual-device-private.h
@ -99,13 +99,11 @@ struct _FpDeviceVirtualDeviceStorage
 G_DECLARE_FINAL_TYPE (FpDeviceVirtualDeviceStorage, fpi_device_virtual_device_storage, FP, DEVICE_VIRTUAL_DEVICE_STORAGE, FpDeviceVirtualDevice)


-gboolean process_cmds (FpDeviceVirtualDevice * self,
-                       gboolean                scan,
-                       char                  **scan_id,
-                       GError                **error);
-gboolean start_scan_command (FpDeviceVirtualDevice *self,
-                             char                 **scan_id,
+char * process_cmds (FpDeviceVirtualDevice * self, gboolean scan, GError **error);
+char * start_scan_command (FpDeviceVirtualDevice *self,
                           GError               **error);
+gboolean should_wait_for_command (FpDeviceVirtualDevice *self,
+                                  GError                *error);
 gboolean should_wait_to_sleep (FpDeviceVirtualDevice *self,
                               const char            *scan_id,
                               GError                *error);
--- a/libfprint/drivers/virtual-device-storage.c
+++ b/libfprint/drivers/virtual-device-storage.c
@ -42,7 +42,8 @@ dev_identify (FpDevice *dev)
  FpDeviceVirtualDevice *self = FP_DEVICE_VIRTUAL_DEVICE (dev);
  g_autofree char *scan_id = NULL;

-  if (!start_scan_command (self, &scan_id, &error))
+  scan_id = start_scan_command (self, &error);
+  if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PENDING))
    return;

  if (scan_id)
@ -67,17 +68,12 @@ dev_identify (FpDevice *dev)
                                             new_scan,
                                             (GEqualFunc) fp_print_equal,
                                             NULL))
-        {
-          match = FALSE;
-          g_clear_object (&new_scan);
-        }
+        error = fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND);
      else if (g_ptr_array_find_with_equal_func (prints,
                                                 new_scan,
                                                 (GEqualFunc) fp_print_equal,
                                                 &idx))
-        {
        match = g_ptr_array_index (prints, idx);
-        }

      if (!self->match_reported)
        {
@ -151,10 +147,11 @@ dev_list (FpDevice *dev)
  g_autoptr(GError) error = NULL;
  FpDeviceVirtualDevice *vdev = FP_DEVICE_VIRTUAL_DEVICE (dev);

-  if (!process_cmds (vdev, FALSE, NULL, &error))
+  process_cmds (vdev, FALSE, &error);
+  if (should_wait_for_command (vdev, error))
    return;

-  if (error)
+  if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
    {
      fpi_device_list_complete (dev, NULL, g_steal_pointer (&error));
      return;
@ -163,27 +160,6 @@ dev_list (FpDevice *dev)
  fpi_device_list_complete (dev, get_stored_prints (vdev), NULL);
 }

-static void
-dev_clear_storage (FpDevice *dev)
-{
-  g_autoptr(GPtrArray) prints_list = NULL;
-  g_autoptr(GError) error = NULL;
-  FpDeviceVirtualDevice *vdev = FP_DEVICE_VIRTUAL_DEVICE (dev);
-
-  if (!process_cmds (vdev, FALSE, NULL, &error))
-    return;
-
-  if (error)
-    {
-      fpi_device_clear_storage_complete (dev, g_steal_pointer (&error));
-      return;
-    }
-
-  g_hash_table_remove_all (vdev->prints_storage);
-
-  fpi_device_clear_storage_complete (dev, NULL);
-}
-
 static void
 dev_delete (FpDevice *dev)
 {
@ -193,10 +169,11 @@ dev_delete (FpDevice *dev)
  FpPrint *print = NULL;
  const char *id = NULL;

-  if (!process_cmds (vdev, FALSE, NULL, &error))
+  process_cmds (vdev, FALSE, &error);
+  if (should_wait_for_command (vdev, error))
    return;

-  if (error)
+  if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
    {
      fpi_device_delete_complete (dev, g_steal_pointer (&error));
      return;
@ -225,15 +202,6 @@ dev_delete (FpDevice *dev)
                                fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND));
 }

-static void
-dev_probe (FpDevice *dev)
-{
-  /* Disable features listed in driver_data */
-  fpi_device_update_features (dev, fpi_device_get_driver_data (dev), 0);
-
-  fpi_device_probe_complete (dev, NULL, NULL, NULL);
-}
-
 static void
 fpi_device_virtual_device_storage_init (FpDeviceVirtualDeviceStorage *self)
 {
@ -256,8 +224,8 @@ fpi_device_virtual_device_storage_finalize (GObject *object)
 }

 static const FpIdEntry driver_ids[] = {
-  { .virtual_envvar = "FP_VIRTUAL_DEVICE_STORAGE", .driver_data = 0 },
-  { .virtual_envvar = "FP_VIRTUAL_DEVICE_STORAGE_NO_LIST", .driver_data = FP_DEVICE_FEATURE_STORAGE_LIST },
+  { .virtual_envvar = "FP_VIRTUAL_DEVICE_STORAGE" },
+  { .virtual_envvar = "FP_VIRTUAL_DEVICE_IDENT" },
  { .virtual_envvar = NULL }
 };

@ -273,12 +241,10 @@ fpi_device_virtual_device_storage_class_init (FpDeviceVirtualDeviceStorageClass
  dev_class->full_name = "Virtual device with storage and identification for debugging";
  dev_class->id_table = driver_ids;

-  dev_class->probe = dev_probe;
  dev_class->identify = dev_identify;
  dev_class->list = dev_list;
  dev_class->delete = dev_delete;
-  dev_class->clear_storage = dev_clear_storage;

  fpi_device_class_auto_initialize_features (dev_class);
-  dev_class->features |= FP_DEVICE_FEATURE_DUPLICATES_CHECK;
+  dev_class->features |= FPI_DEVICE_FEATURE_DUPLICATES_CHECK;
 }
--- a/libfprint/drivers/virtual-device.c
+++ b/libfprint/drivers/virtual-device.c
@ -37,7 +37,6 @@ G_DEFINE_TYPE (FpDeviceVirtualDevice, fpi_device_virtual_device, FP_TYPE_DEVICE)
 #define INSERT_CMD_PREFIX "INSERT "
 #define REMOVE_CMD_PREFIX "REMOVE "
 #define SCAN_CMD_PREFIX "SCAN "
-#define CONT_CMD_PREFIX "CONT "
 #define ERROR_CMD_PREFIX "ERROR "
 #define RETRY_CMD_PREFIX "RETRY "
 #define FINGER_CMD_PREFIX "FINGER "
@ -58,8 +57,6 @@ maybe_continue_current_action (FpDeviceVirtualDevice *self)
  if (self->sleep_timeout_id)
    return;

-  g_assert (self->wait_command_id == 0);
-
  switch (fpi_device_get_current_action (dev))
    {
    case FPI_DEVICE_ACTION_ENROLL:
@ -90,14 +87,6 @@ maybe_continue_current_action (FpDeviceVirtualDevice *self)
      FP_DEVICE_GET_CLASS (self)->close (dev);
      break;

-    case FPI_DEVICE_ACTION_CLEAR_STORAGE:
-      FP_DEVICE_GET_CLASS (self)->clear_storage (dev);
-      break;
-
-    /* Not implemented/nothing to do. */
-    case FPI_DEVICE_ACTION_NONE:
-    case FPI_DEVICE_ACTION_PROBE:
-    case FPI_DEVICE_ACTION_CAPTURE:
    default:
      break;
    }
@ -119,56 +108,23 @@ sleep_timeout_cb (gpointer data)
  return FALSE;
 }

-static gboolean
-wait_for_command_timeout (gpointer data)
-{
-  FpDeviceVirtualDevice *self = FP_DEVICE_VIRTUAL_DEVICE (data);
-  FpiDeviceAction action;
-  GError *error = NULL;
-
-  self->wait_command_id = 0;
-
-  action = fpi_device_get_current_action (FP_DEVICE (self));
-  if (action == FPI_DEVICE_ACTION_LIST || action == FPI_DEVICE_ACTION_DELETE)
-    {
-      self->ignore_wait = TRUE;
-      maybe_continue_current_action (self);
-      self->ignore_wait = FALSE;
-
-      return FALSE;
-    }
-
-  error = g_error_new (G_IO_ERROR, G_IO_ERROR_TIMED_OUT, "No commands arrived in time to run!");
-  fpi_device_action_error (FP_DEVICE (self), error);
-
-  return FALSE;
-}
-
-gboolean
+char *
 process_cmds (FpDeviceVirtualDevice * self,
              gboolean                scan,
-              char                  **scan_id,
              GError                **error)
 {
-  gboolean removed;
-
  if (g_cancellable_is_cancelled (self->cancellable) ||
      (fpi_device_get_current_action (FP_DEVICE (self)) != FPI_DEVICE_ACTION_NONE &&
       g_cancellable_is_cancelled (fpi_device_get_cancellable (FP_DEVICE (self)))))
    {
      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CANCELLED,
                           "Operation was cancelled");
-      return TRUE;
+      return NULL;
    }

  while (self->pending_commands->len > 0)
    {
-      g_autofree gchar *cmd = NULL;
-
-      /* TODO: g_ptr_array_steal_index requires GLib 2.58, we depend on 2.56 */
-      cmd = g_ptr_array_index (self->pending_commands, 0);
-      g_ptr_array_index (self->pending_commands, 0) = NULL;
-      g_ptr_array_remove_index (self->pending_commands, 0);
+      gchar *cmd = g_ptr_array_index (self->pending_commands, 0);

      g_debug ("Processing command %s", cmd);

@ -179,6 +135,7 @@ process_cmds (FpDeviceVirtualDevice * self,
          g_hash_table_add (self->prints_storage,
                            g_strdup (cmd + strlen (INSERT_CMD_PREFIX)));

+          g_ptr_array_remove_index (self->pending_commands, 0);
          continue;
        }
      else if (g_str_has_prefix (cmd, REMOVE_CMD_PREFIX))
@ -188,49 +145,50 @@ process_cmds (FpDeviceVirtualDevice * self,
                                    cmd + strlen (REMOVE_CMD_PREFIX)))
            g_warning ("ID %s was not found in storage", cmd + strlen (REMOVE_CMD_PREFIX));

+          g_ptr_array_remove_index (self->pending_commands, 0);
          continue;
        }
      else if (g_str_has_prefix (cmd, SLEEP_CMD_PREFIX))
        {
          guint64 sleep_ms = g_ascii_strtoull (cmd + strlen (SLEEP_CMD_PREFIX), NULL, 10);

-          g_debug ("Sleeping %" G_GUINT64_FORMAT "ms", sleep_ms);
+          g_debug ("Sleeping %lums", sleep_ms);
          self->sleep_timeout_id = g_timeout_add (sleep_ms, sleep_timeout_cb, self);
+          g_ptr_array_remove_index (self->pending_commands, 0);

-          return FALSE;
+          return NULL;
        }
      else if (g_str_has_prefix (cmd, ERROR_CMD_PREFIX))
        {
          g_propagate_error (error,
                             fpi_device_error_new (g_ascii_strtoull (cmd + strlen (ERROR_CMD_PREFIX), NULL, 10)));

-          return TRUE;
-        }
-      else if (!scan && g_str_has_prefix (cmd, CONT_CMD_PREFIX))
-        {
-          return TRUE;
+          g_ptr_array_remove_index (self->pending_commands, 0);
+          return NULL;
        }

      /* If we are not scanning, then we have to stop here. */
      if (!scan)
        {
          g_warning ("Could not process command: %s", cmd);
+          g_ptr_array_remove_index (self->pending_commands, 0);
          break;
        }

      if (g_str_has_prefix (cmd, SCAN_CMD_PREFIX))
        {
-          if (scan_id)
-            *scan_id = g_strdup (cmd + strlen (SCAN_CMD_PREFIX));
+          char *res = g_strdup (cmd + strlen (SCAN_CMD_PREFIX));

-          return TRUE;
+          g_ptr_array_remove_index (self->pending_commands, 0);
+          return res;
        }
      else if (g_str_has_prefix (cmd, RETRY_CMD_PREFIX))
        {
          g_propagate_error (error,
                             fpi_device_retry_new (g_ascii_strtoull (cmd + strlen (RETRY_CMD_PREFIX), NULL, 10)));

-          return TRUE;
+          g_ptr_array_remove_index (self->pending_commands, 0);
+          return NULL;
        }
      else if (g_str_has_prefix (cmd, FINGER_CMD_PREFIX))
        {
@ -241,23 +199,19 @@ process_cmds (FpDeviceVirtualDevice * self,
                                                   finger_present ? FP_FINGER_STATUS_PRESENT : FP_FINGER_STATUS_NONE,
                                                   finger_present ? FP_FINGER_STATUS_NONE : FP_FINGER_STATUS_PRESENT);

+          g_ptr_array_remove_index (self->pending_commands, 0);
          continue;
        }
      else
        {
          g_warning ("Could not process command: %s", cmd);
+          g_ptr_array_remove_index (self->pending_commands, 0);
        }
    }

-  if (self->ignore_wait)
-    return TRUE;
-
-  g_object_get (self, "removed", &removed, NULL);
-
-  g_assert (self->wait_command_id == 0);
-  if (!scan || removed)
-    self->wait_command_id = g_timeout_add (500, wait_for_command_timeout, self);
-  return FALSE;
+  /* No commands left, throw a timeout error. */
+  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "No commands left that can be run!");
+  return NULL;
 }

 static void
@ -280,7 +234,7 @@ recv_instruction_cb (GObject      *source_object,
  gsize bytes;

  bytes = fpi_device_virtual_listener_read_finish (listener, res, &error);
-  fp_dbg ("Got instructions of length %" G_GSIZE_FORMAT, bytes);
+  fp_dbg ("Got instructions of length %ld", bytes);

  if (error)
    {
@ -309,7 +263,6 @@ recv_instruction_cb (GObject      *source_object,
      else if (g_str_has_prefix (cmd, UNPLUG_CMD))
        {
          fpi_device_remove (FP_DEVICE (self));
-          maybe_continue_current_action (self);
        }
      else if (g_str_has_prefix (cmd, SET_ENROLL_STAGES_PREFIX))
        {
@ -386,19 +339,16 @@ dev_init (FpDevice *dev)

  G_DEBUG_HERE ();

-  self->ignore_wait = TRUE;
-  if (!process_cmds (self, FALSE, NULL, &error))
-    {
-      self->ignore_wait = FALSE;
-      return;
-    }
-  self->ignore_wait = FALSE;
-
-  if (error)
+  process_cmds (self, FALSE, &error);
+  if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
    {
      fpi_device_open_complete (dev, g_steal_pointer (&error));
      return;
    }
+  else if (self->sleep_timeout_id)
+    {
+      return;
+    }
  else if (self->listener)
    {
      fpi_device_open_complete (dev, NULL);
@ -425,21 +375,65 @@ dev_init (FpDevice *dev)
  fpi_device_open_complete (dev, NULL);
 }

+static gboolean
+wait_for_command_timeout (gpointer data)
+{
+  FpDeviceVirtualDevice *self = FP_DEVICE_VIRTUAL_DEVICE (data);
+  GError *error = NULL;
+
+  self->wait_command_id = 0;
+
+  switch (fpi_device_get_current_action (FP_DEVICE (self)))
+    {
+    case FPI_DEVICE_ACTION_LIST:
+    case FPI_DEVICE_ACTION_DELETE:
+      self->ignore_wait = TRUE;
+      maybe_continue_current_action (self);
+      self->ignore_wait = FALSE;
+      return FALSE;
+
+    default:
+      break;
+    }
+
+  error = g_error_new (G_IO_ERROR, G_IO_ERROR_TIMED_OUT, "No commands arrived in time to run!");
+  fpi_device_action_error (FP_DEVICE (self), error);
+
+  return FALSE;
+}
+
 gboolean
+should_wait_for_command (FpDeviceVirtualDevice *self,
+                         GError                *error)
+{
+  if (!error && self->sleep_timeout_id)
+    return TRUE;
+
+  if (self->ignore_wait)
+    return FALSE;
+
+  if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
+    return FALSE;
+
+  if (self->wait_command_id)
+    return FALSE;
+
+  self->wait_command_id = g_timeout_add (500, wait_for_command_timeout, self);
+  return TRUE;
+}
+
+char *
 start_scan_command (FpDeviceVirtualDevice *self,
-                    char                 **scan_id,
                    GError               **error)
 {
  g_autoptr(GError) local_error = NULL;
-  gboolean cont;
+  g_autofree char *scan_id = NULL;

  if (fp_device_get_finger_status (FP_DEVICE (self)) == FP_FINGER_STATUS_NONE)
    self->injected_synthetic_cmd = FALSE;

-  cont = process_cmds (self, TRUE, scan_id, &local_error);
-  /* We report finger needed if we are waiting for instructions
-   * (i.e. we did not get an explicit SLEEP command).
-   */
+  scan_id = process_cmds (self, TRUE, &local_error);
+
  if (!self->sleep_timeout_id)
    {
      fpi_device_report_finger_status_changes (FP_DEVICE (self),
@ -447,13 +441,14 @@ start_scan_command (FpDeviceVirtualDevice *self,
                                               FP_FINGER_STATUS_NONE);
    }

-  if (!cont)
-    return FALSE;
+  if (should_wait_for_command (self, local_error))
+    {
+      g_assert (!scan_id);

-  /* Scan or error*/
-  fpi_device_report_finger_status_changes (FP_DEVICE (self),
-                                           FP_FINGER_STATUS_NEEDED,
-                                           FP_FINGER_STATUS_NONE);
+      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PENDING,
+                           "Still waiting for command");
+      return NULL;
+    }

  if (local_error)
    g_propagate_error (error, g_steal_pointer (&local_error));
@ -462,7 +457,7 @@ start_scan_command (FpDeviceVirtualDevice *self,
                                             FP_FINGER_STATUS_PRESENT,
                                             FP_FINGER_STATUS_NONE);

-  return TRUE;
+  return g_steal_pointer (&scan_id);
 }

 gboolean
@ -483,7 +478,7 @@ should_wait_to_sleep (FpDeviceVirtualDevice *self,
  if (g_str_has_prefix (cmd, SLEEP_CMD_PREFIX))
    {
      g_autoptr(GError) local_error = NULL;
-      process_cmds (self, FALSE, NULL, &local_error);
+      g_free (process_cmds (self, FALSE, &local_error));

      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
        return FALSE;
@ -521,7 +516,8 @@ dev_verify (FpDevice *dev)
  FpDeviceVirtualDevice *self = FP_DEVICE_VIRTUAL_DEVICE (dev);
  g_autofree char *scan_id = NULL;

-  if (!start_scan_command (self, &scan_id, &error))
+  scan_id = start_scan_command (self, &error);
+  if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PENDING))
    return;

  if (scan_id)
@ -543,7 +539,7 @@ dev_verify (FpDevice *dev)

      if (self->prints_storage && !g_hash_table_contains (self->prints_storage, scan_id))
        {
-          g_clear_object (&new_scan);
+          error = fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND);
          success = FALSE;
        }
      else
@ -587,7 +583,8 @@ dev_enroll (FpDevice *dev)
  FpPrint *print = NULL;
  g_autofree char *id = NULL;

-  if (!start_scan_command (self, &id, &error))
+  id = start_scan_command (self, &error);
+  if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PENDING))
    return;

  fpi_device_get_enroll_data (dev, &print);
@ -699,7 +696,6 @@ dev_cancel (FpDevice *dev)

  g_debug ("Got cancellation!");
  g_clear_handle_id (&self->sleep_timeout_id, g_source_remove);
-  g_clear_handle_id (&self->wait_command_id, g_source_remove);

  maybe_continue_current_action (self);
 }
@ -718,19 +714,19 @@ dev_deinit (FpDevice *dev)
  g_autoptr(GError) error = NULL;
  FpDeviceVirtualDevice *self = FP_DEVICE_VIRTUAL_DEVICE (dev);

-  self->ignore_wait = TRUE;
-  if (!process_cmds (self, FALSE, NULL, &error))
-    {
-      self->ignore_wait = FALSE;
-      return;
-    }
-  self->ignore_wait = FALSE;
-
-  if (error)
+  process_cmds (self, FALSE, &error);
+  if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
    {
      fpi_device_close_complete (dev, g_steal_pointer (&error));
      return;
    }
+  else if (self->sleep_timeout_id)
+    {
+      return;
+    }
+
+  g_clear_handle_id (&self->wait_command_id, g_source_remove);
+  g_clear_handle_id (&self->sleep_timeout_id, g_source_remove);

  if (!self->keep_alive)
    stop_listener (self);
--- a/libfprint/drivers/virtual-image.c
+++ b/libfprint/drivers/virtual-image.c
@ -197,9 +197,6 @@ on_listener_connected (FpiDeviceVirtualListener *listener,
    case FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF:
      recv_image (self);

-    case FPI_IMAGE_DEVICE_STATE_INACTIVE:
-    case FPI_IMAGE_DEVICE_STATE_ACTIVATING:
-    case FPI_IMAGE_DEVICE_STATE_DEACTIVATING:
    default:
      break;
    }
--- a/libfprint/fp-context.c
+++ b/libfprint/fp-context.c
@ -23,11 +23,16 @@
 #include "fpi-context.h"
 #include "fpi-device.h"
 #include <gusb.h>
-#include <stdio.h>

 #include <config.h>

 #ifdef HAVE_UDEV
+#include <sys/ioctl.h>
+#include <sys/unistd.h>
+#include <sys/types.h>
+#include <sys/fcntl.h>
+#include <sys/stat.h>
+#include <linux/hidraw.h>
 #include <gudev/gudev.h>
 #endif

@ -48,8 +53,6 @@ typedef struct
  GUsbContext  *usb_ctx;
  GCancellable *cancellable;

-  GSList       *sources;
-
  gint          pending_devices;
  gboolean      enumerated;

@ -99,7 +102,6 @@ typedef struct
 {
  FpContext *context;
  FpDevice  *device;
-  GSource   *source;
 } RemoveDeviceData;

 static gboolean
@ -113,36 +115,21 @@ remove_device_idle_cb (RemoveDeviceData *data)
  g_signal_emit (data->context, signals[DEVICE_REMOVED_SIGNAL], 0, data->device);
  g_ptr_array_remove_index_fast (priv->devices, idx);

-  return G_SOURCE_REMOVE;
-}
-
-static void
-remove_device_data_free (RemoveDeviceData *data)
-{
-  FpContextPrivate *priv = fp_context_get_instance_private (data->context);
-
-  priv->sources = g_slist_remove (priv->sources, data->source);
  g_free (data);
+
+  return G_SOURCE_REMOVE;
 }

 static void
 remove_device (FpContext *context, FpDevice *device)
 {
-  g_autoptr(GSource) source = NULL;
-  FpContextPrivate *priv = fp_context_get_instance_private (context);
  RemoveDeviceData *data;

  data = g_new (RemoveDeviceData, 1);
  data->context = context;
  data->device = device;

-  source = data->source = g_idle_source_new ();
-  g_source_set_callback (source,
-                         G_SOURCE_FUNC (remove_device_idle_cb), data,
-                         (GDestroyNotify) remove_device_data_free);
-  g_source_attach (source, g_main_context_get_thread_default ());
-
-  priv->sources = g_slist_prepend (priv->sources, source);
+  g_idle_add ((GSourceFunc) remove_device_idle_cb, data);
 }

 static void
@ -160,17 +147,10 @@ device_removed_cb (FpContext *context, FpDevice *device)

  /* Wait for device close if the device is currently still open. */
  if (open)
-    {
-      g_signal_connect_object (device, "notify::open",
-                               (GCallback) device_remove_on_notify_open_cb,
-                               context,
-                               G_CONNECT_SWAPPED);
-    }
+    g_signal_connect_swapped (device, "notify::open", (GCallback) device_remove_on_notify_open_cb, context);
  else
-    {
    remove_device (context, device);
 }
-}

 static void
 async_device_init_done_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
@ -197,10 +177,7 @@ async_device_init_done_cb (GObject *source_object, GAsyncResult *res, gpointer u

  g_ptr_array_add (priv->devices, device);

-  g_signal_connect_object (device, "removed",
-                           (GCallback) device_removed_cb,
-                           context,
-                           G_CONNECT_SWAPPED);
+  g_signal_connect_swapped (device, "removed", (GCallback) device_removed_cb, context);

  g_signal_emit (context, signals[DEVICE_ADDED_SIGNAL], 0, device);
 }
@ -297,8 +274,6 @@ fp_context_finalize (GObject *object)
  g_clear_object (&priv->cancellable);
  g_clear_pointer (&priv->drivers, g_array_unref);

-  g_slist_free_full (g_steal_pointer (&priv->sources), (GDestroyNotify) g_source_destroy);
-
  if (priv->usb_ctx)
    g_object_run_dispose (G_OBJECT (priv->usb_ctx));
  g_clear_object (&priv->usb_ctx);
@ -516,18 +491,22 @@ fp_context_enumerate (FpContext *context)
              {
                for (matched_hidraw = hidraw_devices; matched_hidraw; matched_hidraw = matched_hidraw->next)
                  {
-                    /* Find the parent HID node, and check the vid/pid from its HID_ID property */
-                    g_autoptr(GUdevDevice) parent = g_udev_device_get_parent_with_subsystem (matched_hidraw->data, "hid", NULL);
-                    const gchar * hid_id = g_udev_device_get_property (parent, "HID_ID");
-                    guint32 vendor, product;
+                    const gchar * devnode = g_udev_device_get_device_file (matched_hidraw->data);
+                    int temp_hid = -1, res;
+                    struct hidraw_devinfo info;

-                    if (!parent || !hid_id)
+                    if (!devnode)
                      continue;

-                    if (sscanf (hid_id, "%*X:%X:%X", &vendor, &product) != 2)
+                    temp_hid = open (devnode, O_RDWR);
+                    if (temp_hid < 0)
                      continue;

-                    if (vendor == entry->hid_id.vid && product == entry->hid_id.pid)
+                    res = ioctl (temp_hid, HIDIOCGRAWINFO, &info);
+                    close (temp_hid);
+                    if (res < 0)
+                      continue;
+                    if (info.vendor == entry->hid_id.vid && info.product == entry->hid_id.pid)
                      break;
                  }
                /* If match was not found exit */
@ -574,7 +553,7 @@ fp_context_enumerate (FpContext *context)
 *
 * Get all devices. fp_context_enumerate() will be called as needed.
 *
- * Returns: (transfer none) (element-type FpDevice): a new #GPtrArray of #FpDevice's.
+ * Returns: (transfer none) (element-type FpDevice): a new #GPtrArray of #GUsbDevice's.
 */
 GPtrArray *
 fp_context_get_devices (FpContext *context)
--- a/libfprint/fp-device-private.h
+++ b/libfprint/fp-device-private.h
@ -22,23 +22,6 @@

 #include "fpi-device.h"

-/* Chosen so that if we turn on after WARM -> COLD, it takes exactly one time
- * constant to go from COLD -> HOT.
- *   TEMP_COLD_THRESH = 1 / (e + 1)
- */
-#define TEMP_COLD_THRESH (0.26894142136999512075)
-#define TEMP_WARM_HOT_THRESH (1.0 - TEMP_COLD_THRESH)
-#define TEMP_HOT_WARM_THRESH (0.5)
-
-/* Delay updates by 100ms to avoid hitting the border exactly */
-#define TEMP_DELAY_SECONDS 0.1
-
-/* Hopefully 3min is long enough to not get in the way, while also not
- * properly overheating any devices.
- */
-#define DEFAULT_TEMP_HOT_SECONDS (3 * 60)
-#define DEFAULT_TEMP_COLD_SECONDS (9 * 60)
-
 typedef struct
 {
  FpDeviceType type;
@ -53,12 +36,10 @@ typedef struct

  gboolean   is_removed;
  gboolean   is_open;
-  gboolean        is_suspended;

  gchar     *device_id;
  gchar     *device_name;
  FpScanType scan_type;
-  FpDeviceFeature features;

  guint64    driver_data;

@ -68,37 +49,14 @@ typedef struct
  /* We always make sure that only one task is run at a time. */
  FpiDeviceAction     current_action;
  GTask              *current_task;
-  GError             *current_cancellation_reason;
  GAsyncReadyCallback current_user_cb;
-  GCancellable       *current_cancellable;
  gulong              current_cancellable_id;
-  gulong              current_task_cancellable_id;
  GSource            *current_idle_cancel_source;
  GSource            *current_task_idle_return_source;

  /* State for tasks */
  gboolean            wait_for_finger;
  FpFingerStatusFlags finger_status;
-
-  /* Driver critical sections */
-  guint    critical_section;
-  GSource *critical_section_flush_source;
-  gboolean cancel_queued;
-  gboolean suspend_queued;
-  gboolean resume_queued;
-
-  /* Suspend/resume tasks */
-  GTask  *suspend_resume_task;
-  GError *suspend_error;
-
-  /* Device temperature model information and state */
-  GSource      *temp_timeout;
-  FpTemperature temp_current;
-  gint32        temp_hot_seconds;
-  gint32        temp_cold_seconds;
-  gint64        temp_last_update;
-  gboolean      temp_last_active;
-  gdouble       temp_current_ratio;
 } FpDevicePrivate;


@ -129,8 +87,3 @@ typedef struct
 } FpMatchData;

 void match_data_free (FpMatchData *match_data);
-
-void fpi_device_configure_wakeup (FpDevice *device,
-                                  gboolean  enabled);
-void fpi_device_update_temp (FpDevice *device,
-                             gboolean  is_active);
--- a/libfprint/fp-device.c
+++ b/libfprint/fp-device.c
--- a/libfprint/fp-device.h
+++ b/libfprint/fp-device.h
@ -47,32 +47,6 @@ typedef enum {
  FP_DEVICE_TYPE_USB,
 } FpDeviceType;

-/**
- * FpDeviceFeature:
- * @FP_DEVICE_FEATURE_NONE: Device does not support any feature
- * @FP_DEVICE_FEATURE_CAPTURE: Supports image capture
- * @FP_DEVICE_FEATURE_VERIFY: Supports finger verification
- * @FP_DEVICE_FEATURE_IDENTIFY: Supports finger identification
- * @FP_DEVICE_FEATURE_STORAGE: Device has a persistent storage
- * @FP_DEVICE_FEATURE_STORAGE_LIST: Supports listing the storage templates
- * @FP_DEVICE_FEATURE_STORAGE_DELETE: Supports deleting stored templates
- * @FP_DEVICE_FEATURE_STORAGE_CLEAR: Supports clearing the whole storage
- * @FP_DEVICE_FEATURE_DUPLICATES_CHECK: Natively supports duplicates detection
- * @FP_DEVICE_FEATURE_ALWAYS_ON: Whether the device can run continuously
- */
-typedef enum /*< flags >*/ {
-  FP_DEVICE_FEATURE_NONE = 0,
-  FP_DEVICE_FEATURE_CAPTURE = 1 << 0,
-  FP_DEVICE_FEATURE_IDENTIFY = 1 << 1,
-  FP_DEVICE_FEATURE_VERIFY = 1 << 2,
-  FP_DEVICE_FEATURE_STORAGE = 1 << 3,
-  FP_DEVICE_FEATURE_STORAGE_LIST = 1 << 4,
-  FP_DEVICE_FEATURE_STORAGE_DELETE = 1 << 5,
-  FP_DEVICE_FEATURE_STORAGE_CLEAR = 1 << 6,
-  FP_DEVICE_FEATURE_DUPLICATES_CHECK = 1 << 7,
-  FP_DEVICE_FEATURE_ALWAYS_ON = 1 << 8,
-} FpDeviceFeature;
-
 /**
 * FpScanType:
 * @FP_SCAN_TYPE_SWIPE: Sensor requires swiping the finger.
@ -83,23 +57,6 @@ typedef enum {
  FP_SCAN_TYPE_PRESS,
 } FpScanType;

-/**
- * FpTemperature:
- * @FP_TEMPERATURE_COLD: Sensor is considered cold.
- * @FP_TEMPERATURE_WARM: Sensor is warm, usage time may be limited.
- * @FP_TEMPERATURE_HOT: Sensor is hot and cannot be used.
- *
- * When a device is created, it is assumed to be cold. Applications such as
- * fprintd may want to ensure all devices on the system are cold before
- * shutting down in order to ensure that the cool-off period is not violated
- * because the internal libfprint state about the device is lost.
- */
-typedef enum {
-  FP_TEMPERATURE_COLD,
-  FP_TEMPERATURE_WARM,
-  FP_TEMPERATURE_HOT,
-} FpTemperature;
-
 /**
 * FpDeviceRetry:
 * @FP_DEVICE_RETRY_GENERAL: The scan did not succeed due to poor scan quality
@ -137,7 +94,6 @@ typedef enum {
 * @FP_DEVICE_ERROR_DATA_FULL: No space on device available for operation
 * @FP_DEVICE_ERROR_DATA_DUPLICATE: Enrolling template duplicates storaged templates
 * @FP_DEVICE_ERROR_REMOVED: The device has been removed.
- * @FP_DEVICE_ERROR_TOO_HOT: The device might be getting too hot
 *
 * Error codes for device operations. More specific errors from other domains
 * such as #G_IO_ERROR or #G_USB_DEVICE_ERROR may also be reported.
@ -155,7 +111,6 @@ typedef enum {
  FP_DEVICE_ERROR_DATA_DUPLICATE,
  /* Leave some room to add more DATA related errors */
  FP_DEVICE_ERROR_REMOVED = 0x100,
-  FP_DEVICE_ERROR_TOO_HOT,
 } FpDeviceError;

 GQuark fp_device_retry_quark (void);
@ -222,11 +177,10 @@ gboolean     fp_device_is_open (FpDevice *device);
 FpScanType   fp_device_get_scan_type (FpDevice *device);
 FpFingerStatusFlags fp_device_get_finger_status (FpDevice *device);
 gint         fp_device_get_nr_enroll_stages (FpDevice *device);
-FpTemperature fp_device_get_temperature (FpDevice *device);

-FpDeviceFeature     fp_device_get_features (FpDevice *device);
-gboolean            fp_device_has_feature (FpDevice       *device,
-                                           FpDeviceFeature feature);
+gboolean     fp_device_supports_identify (FpDevice *device);
+gboolean     fp_device_supports_capture (FpDevice *device);
+gboolean     fp_device_has_storage (FpDevice *device);

 /* Opening the device */
 void fp_device_open (FpDevice           *device,
@ -239,16 +193,6 @@ void fp_device_close (FpDevice           *device,
                      GAsyncReadyCallback callback,
                      gpointer            user_data);

-void fp_device_suspend (FpDevice           *device,
-                        GCancellable       *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer            user_data);
-
-void fp_device_resume (FpDevice           *device,
-                       GCancellable       *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer            user_data);
-
 void fp_device_enroll (FpDevice           *device,
                       FpPrint            *template_print,
                       GCancellable       *cancellable,
@ -293,23 +237,12 @@ void fp_device_list_prints (FpDevice           *device,
                            GAsyncReadyCallback callback,
                            gpointer            user_data);

-void fp_device_clear_storage (FpDevice           *device,
-                              GCancellable       *cancellable,
-                              GAsyncReadyCallback callback,
-                              gpointer            user_data);
-
 gboolean fp_device_open_finish (FpDevice     *device,
                                GAsyncResult *result,
                                GError      **error);
 gboolean fp_device_close_finish (FpDevice     *device,
                                 GAsyncResult *result,
                                 GError      **error);
-gboolean fp_device_suspend_finish (FpDevice     *device,
-                                   GAsyncResult *result,
-                                   GError      **error);
-gboolean fp_device_resume_finish (FpDevice     *device,
-                                  GAsyncResult *result,
-                                  GError      **error);
 FpPrint *fp_device_enroll_finish (FpDevice     *device,
                                  GAsyncResult *result,
                                  GError      **error);
@ -332,9 +265,7 @@ gboolean fp_device_delete_print_finish (FpDevice     *device,
 GPtrArray * fp_device_list_prints_finish (FpDevice     *device,
                                          GAsyncResult *result,
                                          GError      **error);
-gboolean fp_device_clear_storage_finish (FpDevice     *device,
-                                         GAsyncResult *result,
-                                         GError      **error);
+

 gboolean fp_device_open_sync (FpDevice     *device,
                              GCancellable *cancellable,
@ -375,22 +306,6 @@ gboolean fp_device_delete_print_sync (FpDevice     *device,
 GPtrArray * fp_device_list_prints_sync (FpDevice     *device,
                                        GCancellable *cancellable,
                                        GError      **error);
-gboolean fp_device_clear_storage_sync (FpDevice     *device,
-                                       GCancellable *cancellable,
-                                       GError      **error);
-gboolean fp_device_suspend_sync (FpDevice     *device,
-                                 GCancellable *cancellable,
-                                 GError      **error);
-gboolean fp_device_resume_sync (FpDevice     *device,
-                                GCancellable *cancellable,
-                                GError      **error);

-/* Deprecated functions */
-G_DEPRECATED_FOR (fp_device_get_features)
-gboolean     fp_device_supports_identify (FpDevice *device);
-G_DEPRECATED_FOR (fp_device_get_features)
-gboolean     fp_device_supports_capture (FpDevice *device);
-G_DEPRECATED_FOR (fp_device_get_features)
-gboolean     fp_device_has_storage (FpDevice *device);

 G_END_DECLS
--- a/libfprint/fp-print.c
+++ b/libfprint/fp-print.c
@ -281,7 +281,7 @@ fp_print_class_init (FpPrintClass *klass)
                       "Type",
                       "Private: The type of the print data",
                       FPI_TYPE_PRINT_TYPE,
-                       FPI_PRINT_UNDEFINED,
+                       FPI_PRINT_RAW,
                       G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);

  /**
--- a/libfprint/fpi-assembling.c
+++ b/libfprint/fpi-assembling.c
@ -210,37 +210,70 @@ aes_blit_stripe (struct fpi_frame_asmbl_ctx *ctx,
                 struct fpi_frame *stripe,
                 int x, int y)
 {
-  unsigned int ix1, iy1;
-  unsigned int fx1, fy1;
-  unsigned int fx, fy, ix, iy;
+  unsigned int ix, iy;
+  unsigned int fx, fy;
+  unsigned int width, height;

-  /* Select starting point inside image and frame */
+  /* Find intersection */
  if (x < 0)
    {
-      ix1 = 0;
-      fx1 = -x;
+      width = ctx->frame_width + x;
+      ix = 0;
+      fx = -x;
    }
  else
    {
-      ix1 = x;
-      fx1 = 0;
+      ix = x;
+      fx = 0;
+      width = ctx->frame_width;
    }
+  if ((ix + width) > img->width)
+    width = img->width - ix;

  if (y < 0)
    {
-      iy1 = 0;
-      fy1 = -y;
+      iy = 0;
+      fy = -y;
+      height = ctx->frame_height + y;
    }
  else
    {
-      iy1 = y;
-      fy1 = 0;
+      iy = y;
+      fy = 0;
+      height = ctx->frame_height;
    }

-  for (fy = fy1, iy = iy1; fy < ctx->frame_height && iy < img->height; fy++, iy++)
-    for (fx = fx1, ix = ix1; fx < ctx->frame_width && ix < img->width; fx++, ix++)
+  if (fx > ctx->frame_width)
+    return;
+
+  if (fy > ctx->frame_height)
+    return;
+
+  if (ix > img->width)
+    return;
+
+  if (iy > img->height)
+    return;
+
+  if ((iy + height) > img->height)
+    height = img->height - iy;
+
+  for (; fy < height; fy++, iy++)
+    {
+      if (x < 0)
+        {
+          ix = 0;
+          fx = -x;
+        }
+      else
+        {
+          ix = x;
+          fx = 0;
+        }
+      for (; fx < width; fx++, ix++)
        img->data[ix + (iy * img->width)] = ctx->get_pixel (ctx, stripe, fx, fy);
    }
+}

 /**
 * fpi_assemble_frames:
@ -265,6 +298,7 @@ fpi_assemble_frames (struct fpi_frame_asmbl_ctx *ctx,

  //FIXME g_return_if_fail
  g_return_val_if_fail (stripes != NULL, NULL);
+  BUG_ON (ctx->image_width < ctx->frame_width);

  /* No offset for 1st image */
  fpi_frame = stripes->data;
@ -297,7 +331,7 @@ fpi_assemble_frames (struct fpi_frame_asmbl_ctx *ctx,

  /* Assemble stripes */
  y = reverse ? (height - ctx->frame_height) : 0;
-  x = ((int) ctx->image_width - (int) ctx->frame_width) / 2;
+  x = (ctx->image_width - ctx->frame_width) / 2;

  for (l = stripes; l != NULL; l = l->next)
    {
--- a/libfprint/fpi-device.c
+++ b/libfprint/fpi-device.c
@ -19,9 +19,6 @@
 */

 #define FP_COMPONENT "device"
-#include <math.h>
-#include <fcntl.h>
-
 #include "fpi-log.h"

 #include "fp-device-private.h"
@ -62,28 +59,25 @@ fpi_device_class_auto_initialize_features (FpDeviceClass *device_class)
  g_return_if_fail (FP_IS_DEVICE_CLASS (device_class));

  if (device_class->capture)
-    device_class->features |= FP_DEVICE_FEATURE_CAPTURE;
+    device_class->features |= FPI_DEVICE_FEATURE_CAPTURE;

  if (device_class->verify)
-    device_class->features |= FP_DEVICE_FEATURE_VERIFY;
+    device_class->features |= FPI_DEVICE_FEATURE_VERIFY;

  if (device_class->identify)
-    device_class->features |= FP_DEVICE_FEATURE_IDENTIFY;
+    device_class->features |= FPI_DEVICE_FEATURE_IDENTIFY;

  if (device_class->list)
-    device_class->features |= FP_DEVICE_FEATURE_STORAGE_LIST;
+    {
+      device_class->features |= FPI_DEVICE_FEATURE_STORAGE;
+      device_class->features |= FPI_DEVICE_FEATURE_STORAGE_LIST;
+    }

  if (device_class->delete)
-    device_class->features |= FP_DEVICE_FEATURE_STORAGE_DELETE;
-
-  if (device_class->clear_storage)
-    device_class->features |= FP_DEVICE_FEATURE_STORAGE_CLEAR;
-
-  if (device_class->delete && (device_class->list || device_class->clear_storage))
-    device_class->features |= FP_DEVICE_FEATURE_STORAGE;
-
-  if (device_class->temp_hot_seconds < 0)
-    device_class->features |= FP_DEVICE_FEATURE_ALWAYS_ON;
+    {
+      device_class->features |= FPI_DEVICE_FEATURE_STORAGE;
+      device_class->features |= FPI_DEVICE_FEATURE_STORAGE_DELETE;
+    }
 }

 /**
@ -183,10 +177,6 @@ fpi_device_error_new (FpDeviceError error)
      msg = "This device has been removed from the system.";
      break;

-    case FP_DEVICE_ERROR_TOO_HOT:
-      msg = "Device disabled to prevent overheating.";
-      break;
-
    default:
      g_warning ("Unsupported error, returning general error instead!");
      error = FP_DEVICE_ERROR_GENERAL;
@ -287,29 +277,6 @@ fpi_device_set_scan_type (FpDevice  *device,
  g_object_notify (G_OBJECT (device), "scan-type");
 }

-/**
- * fpi_device_update_features:
- * @device: The #FpDevice
- * @update: The feature flags to update
- * @value: The value to set the flags to
- *
- * Updates the feature flags for the device. This can be used
- * to runtime detect features that are supported by the device.
- */
-void
-fpi_device_update_features (FpDevice       *device,
-                            FpDeviceFeature update,
-                            FpDeviceFeature value)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  g_return_if_fail (FP_IS_DEVICE (device));
-  g_return_if_fail (priv->current_action == FPI_DEVICE_ACTION_PROBE);
-  g_return_if_fail ((value & update) == value);
-
-  priv->features = (priv->features & ~update) | (value & update);
-}
-
 typedef struct
 {
  GSource   source;
@ -367,18 +334,12 @@ fpi_device_add_timeout (FpDevice      *device,
 {
  FpDevicePrivate *priv = fp_device_get_instance_private (device);
  FpDeviceTimeoutSource *source;
-  GMainContext *context;

  source = (FpDeviceTimeoutSource *) g_source_new (&timeout_funcs,
                                                   sizeof (FpDeviceTimeoutSource));
  source->device = device;

-  if (priv->current_task)
-    context = g_task_get_context (priv->current_task);
-  else
-    context = g_main_context_get_thread_default ();
-
-  g_source_attach (&source->source, context);
+  g_source_attach (&source->source, NULL);
  g_source_set_callback (&source->source, (GSourceFunc) func, user_data, destroy_notify);
  g_source_set_ready_time (&source->source,
                           g_source_get_time (&source->source) + interval * (guint64) 1000);
@ -498,11 +459,14 @@ gboolean
 fpi_device_action_is_cancelled (FpDevice *device)
 {
  FpDevicePrivate *priv = fp_device_get_instance_private (device);
+  GCancellable *cancellable;

  g_return_val_if_fail (FP_IS_DEVICE (device), TRUE);
  g_return_val_if_fail (priv->current_action != FPI_DEVICE_ACTION_NONE, TRUE);

-  return g_cancellable_is_cancelled (priv->current_cancellable);
+  cancellable = g_task_get_cancellable (priv->current_task);
+
+  return g_cancellable_is_cancelled (cancellable);
 }

 /**
@ -680,7 +644,7 @@ fpi_device_get_cancellable (FpDevice *device)
  g_return_val_if_fail (FP_IS_DEVICE (device), NULL);
  g_return_val_if_fail (priv->current_action != FPI_DEVICE_ACTION_NONE, NULL);

-  return priv->current_cancellable;
+  return g_task_get_cancellable (priv->current_task);
 }

 static void
@ -798,10 +762,6 @@ fpi_device_action_error (FpDevice *device,
      fpi_device_list_complete (device, NULL, error);
      break;

-    case FPI_DEVICE_ACTION_CLEAR_STORAGE:
-      fpi_device_clear_storage_complete (device, error);
-      break;
-
    default:
    case FPI_DEVICE_ACTION_NONE:
      g_return_if_reached ();
@ -809,120 +769,6 @@ fpi_device_action_error (FpDevice *device,
    }
 }

-/**
- * fpi_device_critical_enter:
- * @device: The #FpDevice
- *
- * Enter a critical section in the driver code where no outside calls from
- * libfprint should happen. Drivers can already assume that everything
- * happens from the same thread, however, that still allows e.g. the cancel
- * vfunc to be called at any point in time.
- *
- * Using this kind of critical section, the driver can assume that libfprint
- * will not forward any external requests to the driver for the time being.
- * This is for example useful to prevent cancellation while the device is being
- * set up. Or, said differently, using this feature means that the cancel
- * handler is able to make more assumptions about the current state.
- *
- * Please note that the driver is not shielded from all external changes. For
- * example the cancellable as returned by fpi_device_get_cancellable() will
- * still change immediately.
- *
- * The driver may call this function multiple times, but must also ensure that
- * fpi_device_critical_leave() is called an equal amount of times and that all
- * critical sections are left before command completion.
- */
-void
-fpi_device_critical_enter (FpDevice *device)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  g_return_if_fail (priv->current_action != FPI_DEVICE_ACTION_NONE);
-
-  priv->critical_section += 1;
-
-  /* Stop flushing events if that was previously queued. */
-  if (priv->critical_section_flush_source)
-    g_source_destroy (priv->critical_section_flush_source);
-  priv->critical_section_flush_source = NULL;
-}
-
-static gboolean
-fpi_device_critical_section_flush_idle_cb (FpDevice *device)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-  FpDeviceClass *cls = FP_DEVICE_GET_CLASS (device);
-
-  if (priv->cancel_queued)
-    {
-      /* Cancellation must only happen if the driver is busy. */
-      if (priv->current_action != FPI_DEVICE_ACTION_NONE &&
-          priv->current_task_idle_return_source == NULL)
-        cls->cancel (device);
-      priv->cancel_queued = FALSE;
-
-      return G_SOURCE_CONTINUE;
-    }
-
-  if (priv->suspend_queued)
-    {
-      cls->suspend (device);
-      priv->suspend_queued = FALSE;
-
-      return G_SOURCE_CONTINUE;
-    }
-
-  if (priv->resume_queued)
-    {
-      cls->resume (device);
-      priv->resume_queued = FALSE;
-
-      return G_SOURCE_CONTINUE;
-    }
-
-  priv->critical_section_flush_source = NULL;
-
-  return G_SOURCE_REMOVE;
-}
-
-/**
- * fpi_device_critical_leave:
- * @device: The #FpDevice
- *
- * Leave a critical section started by fpi_device_critical_enter().
- *
- * Once all critical sections have been left, libfprint will start flushing
- * out the queued up requests. This is done from the mainloop and the driver
- * is protected from reentrency issues.
- */
-void
-fpi_device_critical_leave (FpDevice *device)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  g_return_if_fail (priv->current_action != FPI_DEVICE_ACTION_NONE);
-  g_return_if_fail (priv->critical_section);
-
-  priv->critical_section -= 1;
-  if (priv->critical_section)
-    return;
-
-  /* We left the critical section, make sure a flush is queued. */
-  if (priv->critical_section_flush_source)
-    return;
-
-  priv->critical_section_flush_source = g_idle_source_new ();
-  g_source_set_callback (priv->critical_section_flush_source,
-                         (GSourceFunc) fpi_device_critical_section_flush_idle_cb,
-                         device,
-                         NULL);
-  g_source_set_name (priv->critical_section_flush_source,
-                     "Flush libfprint driver critical section");
-  g_source_attach (priv->critical_section_flush_source,
-                   g_task_get_context (priv->current_task));
-  g_source_unref (priv->critical_section_flush_source);
-}
-
 static void
 clear_device_cancel_action (FpDevice *device)
 {
@ -932,17 +778,10 @@ clear_device_cancel_action (FpDevice *device)

  if (priv->current_cancellable_id)
    {
-      g_cancellable_disconnect (priv->current_cancellable,
+      g_cancellable_disconnect (g_task_get_cancellable (priv->current_task),
                                priv->current_cancellable_id);
      priv->current_cancellable_id = 0;
    }
-
-  if (priv->current_task_cancellable_id)
-    {
-      g_cancellable_disconnect (g_task_get_cancellable (priv->current_task),
-                                priv->current_task_cancellable_id);
-      priv->current_task_cancellable_id = 0;
-    }
 }

 typedef enum _FpDeviceTaskReturnType {
@ -969,7 +808,6 @@ fp_device_task_return_in_idle_cb (gpointer user_data)
  FpiDeviceAction action;

  g_autoptr(GTask) task = NULL;
-  g_autoptr(GError) cancellation_reason = NULL;


  action_str = g_enum_to_string (FPI_TYPE_DEVICE_ACTION, priv->current_action);
@ -979,10 +817,6 @@ fp_device_task_return_in_idle_cb (gpointer user_data)
  action = priv->current_action;
  priv->current_action = FPI_DEVICE_ACTION_NONE;
  priv->current_task_idle_return_source = NULL;
-  g_clear_object (&priv->current_cancellable);
-  cancellation_reason = g_steal_pointer (&priv->current_cancellation_reason);
-
-  fpi_device_update_temp (data->device, FALSE);

  if (action == FPI_DEVICE_ACTION_OPEN &&
      data->type != FP_DEVICE_TASK_RETURN_ERROR)
@ -999,8 +833,6 @@ fp_device_task_return_in_idle_cb (gpointer user_data)
      g_object_notify (G_OBJECT (data->device), "open");
    }

-  /* TODO: Port/use the cancellation mechanism for device removal! */
-
  /* Return FP_DEVICE_ERROR_REMOVED if the device is removed,
   * with the exception of a successful open, which is an odd corner case. */
  if (priv->is_removed &&
@ -1036,18 +868,7 @@ fp_device_task_return_in_idle_cb (gpointer user_data)
      break;

    case FP_DEVICE_TASK_RETURN_ERROR:
-      /* Return internal cancellation reason instead if we have one.
-       * Note that an external cancellation always returns G_IO_ERROR_CANCELLED
-       */
-      if (cancellation_reason)
-        {
-          g_task_set_task_data (task, NULL, NULL);
-          g_task_return_error (task, g_steal_pointer (&cancellation_reason));
-        }
-      else
-        {
      g_task_return_error (task, g_steal_pointer (&data->result));
-        }
      break;

    default:
@ -1109,8 +930,7 @@ fpi_device_return_task_in_idle (FpDevice              *device,
                         data,
                         (GDestroyNotify) fpi_device_task_return_data_free);

-  g_source_attach (priv->current_task_idle_return_source,
-                   g_task_get_context (priv->current_task));
+  g_source_attach (priv->current_task_idle_return_source, NULL);
  g_source_unref (priv->current_task_idle_return_source);
 }

@ -1550,213 +1370,7 @@ fpi_device_list_complete (FpDevice  *device,
    fpi_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_ERROR, error);
 }

-void
-fpi_device_configure_wakeup (FpDevice *device, gboolean enabled)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  switch (priv->type)
-    {
-    case FP_DEVICE_TYPE_USB:
-      {
-        g_autoptr(GString) ports = NULL;
-        GUsbDevice *dev, *parent;
-        const char *wakeup_command = enabled ? "enabled" : "disabled";
-        guint8 bus, port;
-        g_autofree gchar *sysfs_wakeup = NULL;
-        g_autofree gchar *sysfs_persist = NULL;
-        gssize r;
-        int fd;
-
-        ports = g_string_new (NULL);
-        bus = g_usb_device_get_bus (priv->usb_device);
-
-        /* Walk up, skipping the root hub. */
-        dev = priv->usb_device;
-        while ((parent = g_usb_device_get_parent (dev)))
-          {
-            port = g_usb_device_get_port_number (dev);
-            g_string_prepend (ports, g_strdup_printf ("%d.", port));
-            dev = parent;
-          }
-        g_string_set_size (ports, ports->len - 1);
-
-        sysfs_wakeup = g_strdup_printf ("/sys/bus/usb/devices/%d-%s/power/wakeup", bus, ports->str);
-        fd = open (sysfs_wakeup, O_WRONLY);
-
-        if (fd < 0)
-          {
-            /* Wakeup not existing appears to be relatively normal. */
-            g_debug ("Failed to open %s", sysfs_wakeup);
-          }
-        else
-          {
-            r = write (fd, wakeup_command, strlen (wakeup_command));
-            if (r < 0)
-              g_warning ("Could not configure wakeup to %s by writing %s", wakeup_command, sysfs_wakeup);
-            close (fd);
-          }
-
-        /* Persist means that the kernel tries to keep the USB device open
-         * in case it is "replugged" due to suspend.
-         * This is not helpful, as it will receive a reset and will be in a bad
-         * state. Instead, seeing an unplug and a new device makes more sense.
-         */
-        sysfs_persist = g_strdup_printf ("/sys/bus/usb/devices/%d-%s/power/persist", bus, ports->str);
-        fd = open (sysfs_persist, O_WRONLY);
-
-        if (fd < 0)
-          {
-            g_warning ("Failed to open %s", sysfs_persist);
-            return;
-          }
-        else
-          {
-            r = write (fd, "0", 1);
-            if (r < 0)
-              g_message ("Could not disable USB persist by writing to %s", sysfs_persist);
-            close (fd);
-          }
-
-        break;
-      }
-
-    case FP_DEVICE_TYPE_VIRTUAL:
-    case FP_DEVICE_TYPE_UDEV:
-      break;
-
-    default:
-      g_assert_not_reached ();
-      fpi_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_ERROR,
-                                      fpi_device_error_new (FP_DEVICE_ERROR_GENERAL));
-      return;
-    }
-}
-
-static void
-fpi_device_suspend_completed (FpDevice *device)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  /* We have an ongoing operation, allow the device to wake up the machine. */
-  if (priv->current_action != FPI_DEVICE_ACTION_NONE)
-    fpi_device_configure_wakeup (device, TRUE);
-
-  if (priv->critical_section)
-    g_warning ("Driver was in a critical section at suspend time. It likely deadlocked!");
-
-  if (priv->suspend_error)
-    g_task_return_error (g_steal_pointer (&priv->suspend_resume_task),
-                         g_steal_pointer (&priv->suspend_error));
-  else
-    g_task_return_boolean (g_steal_pointer (&priv->suspend_resume_task), TRUE);
-}
-
 /**
- * fpi_device_suspend_complete:
- * @device: The #FpDevice
- * @error: The #GError or %NULL on success
- *
- * Finish a suspend request. Only return a %NULL error if suspend has been
- * correctly configured and the current action as returned by
- * fpi_device_get_current_action() will continue to run after resume.
- *
- * In all other cases an error must be returned. Should this happen, the
- * current action will be cancelled before the error is forwarded to the
- * application.
- *
- * It is recommended to set @error to #FP_ERROR_NOT_IMPLEMENTED.
- */
-void
-fpi_device_suspend_complete (FpDevice *device,
-                             GError   *error)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  g_return_if_fail (FP_IS_DEVICE (device));
-  g_return_if_fail (priv->suspend_resume_task);
-  g_return_if_fail (priv->suspend_error == NULL);
-
-  priv->suspend_error = error;
-  priv->is_suspended = TRUE;
-
-  /* If there is no error, we have no running task, return immediately. */
-  if (error == NULL || !priv->current_task || g_task_get_completed (priv->current_task))
-    {
-      fpi_device_suspend_completed (device);
-      return;
-    }
-
-  /* Wait for completion of the current task. */
-  g_signal_connect_object (priv->current_task,
-                           "notify::completed",
-                           G_CALLBACK (fpi_device_suspend_completed),
-                           device,
-                           G_CONNECT_SWAPPED);
-
-  /* And cancel any action that might be long-running. */
-  if (!priv->current_cancellation_reason)
-    priv->current_cancellation_reason = fpi_device_error_new_msg (FP_DEVICE_ERROR_BUSY,
-                                                                  "Cannot run while suspended.");
-
-  g_cancellable_cancel (priv->current_cancellable);
-}
-
-/**
- * fpi_device_resume_complete:
- * @device: The #FpDevice
- * @error: The #GError or %NULL on success
- *
- * Finish a resume request.
- */
-void
-fpi_device_resume_complete (FpDevice *device,
-                            GError   *error)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  g_return_if_fail (FP_IS_DEVICE (device));
-  g_return_if_fail (priv->suspend_resume_task);
-
-  priv->is_suspended = FALSE;
-  fpi_device_configure_wakeup (device, FALSE);
-
-  if (error)
-    g_task_return_error (g_steal_pointer (&priv->suspend_resume_task), error);
-  else
-    g_task_return_boolean (g_steal_pointer (&priv->suspend_resume_task), TRUE);
-}
-
-/**
- * fpi_device_clear_storage_complete:
- * @device: The #FpDevice
- * @error: The #GError or %NULL on success
- *
- * Finish an ongoing clear_storage operation.
- */
-void
-fpi_device_clear_storage_complete (FpDevice *device,
-                                   GError   *error)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  g_return_if_fail (FP_IS_DEVICE (device));
-  g_return_if_fail (priv->current_action == FPI_DEVICE_ACTION_CLEAR_STORAGE);
-
-  g_debug ("Device reported deletion completion");
-
-  clear_device_cancel_action (device);
-  fpi_device_report_finger_status (device, FP_FINGER_STATUS_NONE);
-
-  if (!error)
-    fpi_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_BOOL,
-                                    GUINT_TO_POINTER (TRUE));
-  else
-    fpi_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_ERROR, error);
-}
-
-/**
-
 * fpi_device_enroll_progress:
 * @device: The #FpDevice
 * @completed_stages: The number of stages that are completed at this point
@ -2008,128 +1622,3 @@ fpi_device_report_finger_status_changes (FpDevice           *device,

  return fpi_device_report_finger_status (device, finger_status);
 }
-
-static void
-update_temp_timeout (FpDevice *device, gpointer user_data)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  fpi_device_update_temp (device, priv->temp_last_active);
-}
-
-/**
- * fpi_device_update_temp:
- * @device: The #FpDevice
- * @is_active: Whether the device is now active
- *
- * Purely internal function to update the temperature. Also ensure that the
- * state is updated once a threshold is reached.
- */
-void
-fpi_device_update_temp (FpDevice *device, gboolean is_active)
-{
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-  gint64 now = g_get_monotonic_time ();
-  gdouble passed_seconds;
-  gdouble alpha;
-  gdouble next_threshold;
-  gdouble old_ratio;
-  FpTemperature old_temp;
-  g_autofree char *old_temp_str = NULL;
-  g_autofree char *new_temp_str = NULL;
-
-  if (priv->temp_hot_seconds < 0)
-    {
-      g_debug ("Not updating temperature model, device can run continuously!");
-      return;
-    }
-
-  passed_seconds = (now - priv->temp_last_update) / 1e6;
-  old_ratio = priv->temp_current_ratio;
-
-  if (priv->temp_last_active)
-    {
-      alpha = exp (-passed_seconds / priv->temp_hot_seconds);
-      priv->temp_current_ratio = alpha * priv->temp_current_ratio + 1 - alpha;
-    }
-  else
-    {
-      alpha = exp (-passed_seconds / priv->temp_cold_seconds);
-      priv->temp_current_ratio = alpha * priv->temp_current_ratio;
-    }
-
-  priv->temp_last_active = is_active;
-  priv->temp_last_update = now;
-
-  old_temp = priv->temp_current;
-  if (priv->temp_current_ratio < TEMP_COLD_THRESH)
-    {
-      priv->temp_current = FP_TEMPERATURE_COLD;
-      next_threshold = is_active ? TEMP_COLD_THRESH : -1.0;
-    }
-  else if (priv->temp_current_ratio < TEMP_HOT_WARM_THRESH)
-    {
-      priv->temp_current = FP_TEMPERATURE_WARM;
-      next_threshold = is_active ? TEMP_WARM_HOT_THRESH : TEMP_COLD_THRESH;
-    }
-  else if (priv->temp_current_ratio < TEMP_WARM_HOT_THRESH)
-    {
-      /* Keep HOT until we reach TEMP_HOT_WARM_THRESH */
-      if (priv->temp_current != FP_TEMPERATURE_HOT)
-        priv->temp_current = FP_TEMPERATURE_WARM;
-
-      next_threshold = is_active ? TEMP_WARM_HOT_THRESH : TEMP_HOT_WARM_THRESH;
-    }
-  else
-    {
-      priv->temp_current = FP_TEMPERATURE_HOT;
-      next_threshold = is_active ? -1.0 : TEMP_HOT_WARM_THRESH;
-    }
-
-  old_temp_str = g_enum_to_string (FP_TYPE_TEMPERATURE, old_temp);
-  new_temp_str = g_enum_to_string (FP_TYPE_TEMPERATURE, priv->temp_current);
-  g_debug ("Updated temperature model after %0.2f seconds, ratio %0.2f -> %0.2f, active %d -> %d, %s -> %s",
-           passed_seconds,
-           old_ratio,
-           priv->temp_current_ratio,
-           priv->temp_last_active,
-           is_active,
-           old_temp_str,
-           new_temp_str);
-
-  if (priv->temp_current != old_temp)
-    g_object_notify (G_OBJECT (device), "temperature");
-
-  /* If the device is HOT, then do an internal cancellation of long running tasks. */
-  if (priv->temp_current == FP_TEMPERATURE_HOT)
-    {
-      if (priv->current_action == FPI_DEVICE_ACTION_ENROLL ||
-          priv->current_action == FPI_DEVICE_ACTION_VERIFY ||
-          priv->current_action == FPI_DEVICE_ACTION_IDENTIFY ||
-          priv->current_action == FPI_DEVICE_ACTION_CAPTURE)
-        {
-          if (!priv->current_cancellation_reason)
-            priv->current_cancellation_reason = fpi_device_error_new (FP_DEVICE_ERROR_TOO_HOT);
-
-          g_cancellable_cancel (priv->current_cancellable);
-        }
-    }
-
-  g_clear_pointer (&priv->temp_timeout, g_source_destroy);
-
-  if (next_threshold < 0)
-    return;
-
-  /* Set passed_seconds to the time until the next update is needed */
-  if (is_active)
-    passed_seconds = -priv->temp_hot_seconds * log ((next_threshold - 1.0) / (priv->temp_current_ratio - 1.0));
-  else
-    passed_seconds = -priv->temp_cold_seconds * log (next_threshold / priv->temp_current_ratio);
-
-  passed_seconds += TEMP_DELAY_SECONDS;
-
-  priv->temp_timeout = fpi_device_add_timeout (device,
-                                               passed_seconds * 1000,
-                                               update_temp_timeout,
-                                               NULL, NULL);
-}
--- a/libfprint/fpi-device.h
+++ b/libfprint/fpi-device.h
@ -24,6 +24,8 @@
 #include "fp-image.h"
 #include "fpi-print.h"

+#include <config.h>
+
 /**
 * FpiDeviceUdevSubtype:
 * @FPI_DEVICE_UDEV_SUBTYPE_SPIDEV: The device requires an spidev node
@ -67,6 +69,30 @@ struct _FpIdEntry
  guint64 driver_data;
 };

+/**
+ * FpiDeviceFeature:
+ * @FPI_DEVICE_FEATURE_NONE: Device does not support any feature
+ * @FPI_DEVICE_FEATURE_CAPTURE: Supports image capture
+ * @FPI_DEVICE_FEATURE_IDENTIFY: Supports finger identification
+ * @FPI_DEVICE_FEATURE_VERIFY: Supports finger verification
+ * @FPI_DEVICE_FEATURE_STORAGE: Device has a persistent storage
+ * @FPI_DEVICE_FEATURE_STORAGE_LIST: Supports listing the storage templates
+ * @FPI_DEVICE_FEATURE_STORAGE_DELETE: Supports deleting stored templates
+ * @FPI_DEVICE_FEATURE_STORAGE_CLEAR: Supports clearing the whole storage
+ * @FPI_DEVICE_FEATURE_DUPLICATES_CHECK: Natively supports duplicates detection
+ */
+typedef enum /*< flags >*/ {
+  FPI_DEVICE_FEATURE_NONE = 0,
+  FPI_DEVICE_FEATURE_CAPTURE = 1 << 0,
+  FPI_DEVICE_FEATURE_IDENTIFY = 1 << 1,
+  FPI_DEVICE_FEATURE_VERIFY = 1 << 2,
+  FPI_DEVICE_FEATURE_STORAGE = 1 << 3,
+  FPI_DEVICE_FEATURE_STORAGE_LIST = 1 << 4,
+  FPI_DEVICE_FEATURE_STORAGE_DELETE = 1 << 5,
+  FPI_DEVICE_FEATURE_STORAGE_CLEAR = 1 << 6,
+  FPI_DEVICE_FEATURE_DUPLICATES_CHECK = 1 << 7,
+} FpiDeviceFeature;
+
 /**
 * FpDeviceClass:
 * @id: ID string for the driver. Should be a valid C identifier and should
@ -80,10 +106,6 @@ struct _FpIdEntry
 *   fpi_device_set_nr_enroll_stages() from @probe if this is dynamic.
 * @scan_type: The scan type of supported devices; use
 *   fpi_device_set_scan_type() from @probe if this is dynamic.
- * @temp_hot_seconds: Assumed time in seconds for the device to become too hot
- *   after being mostly cold. Set to -1 if the device can be always-on.
- * @temp_cold_seconds: Assumed time in seconds for the device to be mostly cold
- *   after having been too hot to operate.
 * @usb_discover: Class method to check whether a USB device is supported by
 *  the driver. Should return 0 if the device is unsupported and a positive
 *  score otherwise. The default score is 50 and the driver with the highest
@ -103,13 +125,8 @@ struct _FpIdEntry
 * @capture: Start a capture operation
 * @list: List prints stored on the device
 * @delete: Delete a print from the device
- * @clear_storage: Delete all prints from the device
 * @cancel: Called on cancellation, this is a convenience to not need to handle
 *   the #GCancellable directly by using fpi_device_get_cancellable().
- * @suspend: Called when an interactive action is running (ENROLL, VERIFY,
- *    IDENTIFY or CAPTURE) and the system is about to go into suspend.
- * @resume: Called to resume an ongoing interactive action after the system has
- *    resumed from suspend.
 *
 * NOTE: If your driver is image based, then you should subclass #FpImageDevice
 * instead. #FpImageDevice based drivers use a different way of interacting
@ -128,9 +145,6 @@ struct _FpIdEntry
 * operation (i.e. any operation that requires capturing). It is entirely fine
 * to ignore cancellation requests for short operations (e.g. open/close).
 *
- * Note that @cancel, @suspend and @resume will not be called while the device
- * is within a fpi_device_critical_enter()/fpi_device_critical_leave() block.
- *
 * This API is solely intended for drivers. It is purely internal and neither
 * API nor ABI stable.
 */
@ -145,16 +159,12 @@ struct _FpDeviceClass
  const gchar     *full_name;
  FpDeviceType     type;
  const FpIdEntry *id_table;
-  FpDeviceFeature  features;
+  FpiDeviceFeature features;

  /* Defaults for device properties */
  gint       nr_enroll_stages;
  FpScanType scan_type;

-  /* Simple device temperature model constants */
-  gint32 temp_hot_seconds;
-  gint32 temp_cold_seconds;
-
  /* Callbacks */
  gint (*usb_discover) (GUsbDevice *usb_device);
  void (*probe)    (FpDevice *device);
@ -166,11 +176,8 @@ struct _FpDeviceClass
  void (*capture)  (FpDevice *device);
  void (*list)     (FpDevice *device);
  void (*delete)   (FpDevice * device);
-  void (*clear_storage)  (FpDevice * device);

  void (*cancel)   (FpDevice *device);
-  void (*suspend)  (FpDevice *device);
-  void (*resume)   (FpDevice *device);
 };

 void fpi_device_class_auto_initialize_features (FpDeviceClass *device_class);
@ -197,7 +204,6 @@ typedef void (*FpTimeoutFunc) (FpDevice *device,
 * @FPI_DEVICE_ACTION_CAPTURE: Device is currently capturing an image.
 * @FPI_DEVICE_ACTION_LIST: Device stored prints are being queried.
 * @FPI_DEVICE_ACTION_DELETE: Device stored print is being deleted.
- * @FPI_DEVICE_ACTION_CLEAR_STORAGE: Device stored prints are being deleted.
 *
 * Current active action of the device. A driver can retrieve the action.
 */
@ -212,7 +218,6 @@ typedef enum {
  FPI_DEVICE_ACTION_CAPTURE,
  FPI_DEVICE_ACTION_LIST,
  FPI_DEVICE_ACTION_DELETE,
-  FPI_DEVICE_ACTION_CLEAR_STORAGE,
 } FpiDeviceAction;

 GUsbDevice  *fpi_device_get_usb_device (FpDevice *device);
@ -264,16 +269,9 @@ void fpi_device_set_nr_enroll_stages (FpDevice *device,
 void fpi_device_set_scan_type (FpDevice  *device,
                               FpScanType scan_type);

-void fpi_device_update_features (FpDevice       *device,
-                                 FpDeviceFeature update,
-                                 FpDeviceFeature value);
-
 void fpi_device_action_error (FpDevice *device,
                              GError   *error);

-void fpi_device_critical_enter (FpDevice *device);
-void fpi_device_critical_leave (FpDevice *device);
-
 void fpi_device_probe_complete (FpDevice    *device,
                                const gchar *device_id,
                                const gchar *device_name,
@ -297,12 +295,6 @@ void fpi_device_delete_complete (FpDevice *device,
 void fpi_device_list_complete (FpDevice  *device,
                               GPtrArray *prints,
                               GError    *error);
-void fpi_device_clear_storage_complete (FpDevice *device,
-                                        GError   *error);
-void fpi_device_suspend_complete (FpDevice *device,
-                                  GError   *error);
-void fpi_device_resume_complete (FpDevice *device,
-                                 GError   *error);

 void fpi_device_enroll_progress (FpDevice *device,
                                 gint      completed_stages,
--- a/libfprint/fpi-spi-transfer.c
+++ b/libfprint/fpi-spi-transfer.c
@ -22,11 +22,6 @@
 #include <linux/spi/spidev.h>
 #include <errno.h>

-/* spidev can only handle the specified block size, which defaults to 4096. */
-#define SPIDEV_BLOCK_SIZE_PARAM "/sys/module/spidev/parameters/bufsiz"
-#define SPIDEV_BLOCK_SIZE_FALLBACK 4096
-static gsize block_size = 0;
-
 /**
 * SECTION:fpi-spi-transfer
 * @title: SPI transfer helpers
@ -119,28 +114,6 @@ fpi_spi_transfer_new (FpDevice * device, int spidev_fd)

  g_assert (FP_IS_DEVICE (device));

-  if (G_UNLIKELY (block_size == 0))
-    {
-      g_autoptr(GError) error = NULL;
-      g_autofree char *contents = NULL;
-
-      block_size = SPIDEV_BLOCK_SIZE_FALLBACK;
-
-      if (g_file_get_contents (SPIDEV_BLOCK_SIZE_PARAM, &contents, NULL, &error))
-        {
-          block_size = MIN (g_ascii_strtoull (contents, NULL, 0), G_MAXUINT16);
-          if (block_size == 0)
-            {
-              block_size = SPIDEV_BLOCK_SIZE_FALLBACK;
-              g_warning ("spidev blocksize could not be decoded, using %" G_GSIZE_FORMAT, block_size);
-            }
-        }
-      else
-        {
-          g_message ("Failed to read spidev block size, using %" G_GSIZE_FORMAT, block_size);
-        }
-    }
-
  self = g_slice_new0 (FpiSpiTransfer);
  self->ref_count = 1;

@ -310,78 +283,6 @@ transfer_finish_cb (GObject *source_object, GAsyncResult *res, gpointer user_dat
  callback (transfer, transfer->device, transfer->user_data, error);
 }

-static int
-transfer_chunk (FpiSpiTransfer *transfer, gsize full_length, gsize *transferred)
-{
-  struct spi_ioc_transfer xfer[2] = { 0 };
-  gsize skip = *transferred;
-  gsize len = 0;
-  int transfers = 0;
-  int status;
-
-  if (transfer->buffer_wr)
-    {
-      if (skip < transfer->length_wr && len < block_size)
-        {
-          xfer[transfers].tx_buf = (gsize) transfer->buffer_wr + skip;
-          xfer[transfers].len = MIN (block_size, transfer->length_wr - skip);
-
-          len += xfer[transfers].len;
-          skip += xfer[transfers].len;
-
-          transfers += 1;
-        }
-
-      /* How much we need to skip in the next transfer. */
-      skip -= transfer->length_wr;
-    }
-
-  if (transfer->buffer_rd)
-    {
-      if (skip < transfer->length_rd && len < block_size)
-        {
-          xfer[transfers].rx_buf = (gsize) transfer->buffer_rd + skip;
-          xfer[transfers].len = MIN (block_size, transfer->length_rd - skip);
-
-          len += xfer[transfers].len;
-          /* skip += xfer[transfers].len; */
-
-          transfers += 1;
-        }
-
-      /* How much we need to skip in the next transfer. */
-      /* skip -= transfer->length_rd; */
-    }
-
-  g_assert (transfers > 0);
-
-  /* We have not transferred everything; ask driver to not deselect the chip.
-   * Unfortunately, this is inherently racy in case there are further devices
-   * on the same bus. In practice, it is hopefully unlikely to be an issue,
-   * but print a message once to help with debugging.
-   */
-  if (full_length < *transferred + len)
-    {
-      static gboolean warned = FALSE;
-
-      if (!warned)
-        {
-          g_message ("Split SPI transfer. In case of issues, try increasing the spidev buffer size.");
-          warned = TRUE;
-        }
-
-      xfer[transfers - 1].cs_change = TRUE;
-    }
-
-  /* This ioctl cannot be interrupted. */
-  status = ioctl (transfer->spidev_fd, SPI_IOC_MESSAGE (transfers), xfer);
-
-  if (status >= 0)
-    *transferred += len;
-
-  return status;
-}
-
 static void
 transfer_thread_func (GTask        *task,
                      gpointer      source_object,
@ -389,9 +290,9 @@ transfer_thread_func (GTask        *task,
                      GCancellable *cancellable)
 {
  FpiSpiTransfer *transfer = (FpiSpiTransfer *) task_data;
-  gsize full_length;
-  gsize transferred = 0;
-  int status = 0;
+  struct spi_ioc_transfer xfer[2];
+  int transfers = 0;
+  int status;

  if (transfer->buffer_wr == NULL && transfer->buffer_rd == NULL)
    {
@ -402,14 +303,26 @@ transfer_thread_func (GTask        *task,
      return;
    }

-  full_length = 0;
-  if (transfer->buffer_wr)
-    full_length += transfer->length_wr;
-  if (transfer->buffer_rd)
-    full_length += transfer->length_rd;
+  memset (xfer, 0, sizeof (xfer));

-  while (transferred < full_length && status >= 0)
-    status = transfer_chunk (transfer, full_length, &transferred);
+  if (transfer->buffer_wr)
+    {
+      xfer[transfers].tx_buf = (guint64) transfer->buffer_wr;
+      xfer[transfers].len = transfer->length_wr;
+
+      transfers += 1;
+    }
+
+  if (transfer->buffer_rd)
+    {
+      xfer[transfers].rx_buf = (guint64) transfer->buffer_rd;
+      xfer[transfers].len = transfer->length_rd;
+
+      transfers += 1;
+    }
+
+  /* This ioctl cannot be interrupted. */
+  status = ioctl (transfer->spidev_fd, SPI_IOC_MESSAGE (transfers), xfer);

  if (status < 0)
    {
--- a/libfprint/fpi-ssm.c
+++ b/libfprint/fpi-ssm.c
@ -31,24 +31,27 @@
 * @short_description: State machine helpers
 *
 * Asynchronous driver design encourages some kind of state machine behind it.
- * #FpiSsm provides a simple mechanism to implement a state machine, which
- * is often entirely linear. You can however also jump to a specific state
- * or do an early return from the SSM by completing it.
+ * In most cases, the state machine is entirely linear - you only go to the
+ * next state, you never jump or go backwards. The #FpiSsm functions help you
+ * implement such a machine.
 *
- * e.g. `S1` ↦ `S2` ↦ `S3` ↦ `S4` ↦ `C1` ↦ `C2` ↦ `final`
+ * e.g. `S1` ↦ `S2` ↦ `S3` ↦ `S4`
 *
- * Where `S1` is the start state. The `C1` and later states are cleanup states
- * that may be defined. The difference is that these states will never be
- * skipped when marking the SSM as completed.
+ * `S1` is the start state
+ * There is also an implicit error state and an implicit accepting state
+ * (both with implicit edges from every state).
 *
- * Use fpi_ssm_new() to create a new state machine with a defined number of
- * states. Note that the state numbers start at zero, making them match the
- * first value in a C enumeration.
+ * You can also jump to any arbitrary state (while marking completion of the
+ * current state) while the machine is running. In other words there are
+ * implicit edges linking one state to every other state.
+ *
+ * To create an #fpi_ssm, you pass a state handler function and the total number of
+ * states (4 in the above example) to fpi_ssm_new (). Note that the state numbers
+ * start at zero, making them match the first value in a C enumeration.
 *
 * To start a ssm, you pass in a completion callback function to fpi_ssm_start()
- * which gets called when the ssm completes (both on failure and on success).
- * Starting a ssm also takes ownership of it and it will be automatically
- * free'ed after the callback function has been called.
+ * which gets called when the ssm completes (both on error and on failure).
+ * Starting a ssm also takes ownership of it.
 *
 * To iterate to the next state, call fpi_ssm_next_state(). It is legal to
 * attempt to iterate beyond the final state - this is equivalent to marking
@ -56,6 +59,7 @@
 *
 * To mark successful completion of a SSM, either iterate beyond the final
 * state or call fpi_ssm_mark_completed() from any state.
+ * This will also invalidate the machine, freeing it.
 *
 * To mark failed completion of a SSM, call fpi_ssm_mark_failed() from any
 * state. You must pass a non-zero error code.
@ -65,9 +69,13 @@
 * which operations to perform (a switch statement is appropriate).
 *
 * Typically, the state handling function fires off an asynchronous
- * communication with the device (such as a USB transfer), and the
+ * communication with the device (such as a libsub transfer), and the
 * callback function iterates the machine to the next state
 * upon success (or fails).
+ *
+ * Your completion callback should examine the return value of
+ * fpi_ssm_get_error() in order to determine whether the #FpiSsm completed or
+ * failed. An error code of zero indicates successful completion.
 */

 struct _FpiSsm
@ -78,10 +86,11 @@ struct _FpiSsm
  gpointer                ssm_data;
  GDestroyNotify          ssm_data_destroy;
  int                     nr_states;
-  int                     start_cleanup;
  int                     cur_state;
  gboolean                completed;
  GSource                *timeout;
+  GCancellable           *cancellable;
+  gulong                  cancellable_id;
  GError                 *error;
  FpiSsmCompletedCallback callback;
  FpiSsmHandlerCallback   handler;
@ -95,9 +104,8 @@ struct _FpiSsm
 *
 * Allocate a new ssm, with @nr_states states. The @handler callback
 * will be called after each state transition.
- * This is a macro that calls fpi_ssm_new_full() using @nr_states as the
- * cleanup states and using the stringified version of @nr_states. It should
- * be used with an enum value.
+ * This is a macro that calls fpi_ssm_new_full() using the stringified
+ * version of @nr_states, so will work better with named parameters.
 *
 * Returns: a new #FpiSsm state machine
 */
@ -107,7 +115,6 @@ struct _FpiSsm
 * @dev: a #fp_dev fingerprint device
 * @handler: the callback function
 * @nr_states: the number of states
- * @start_cleanup: the first cleanup state
 * @machine_name: the name of the state machine (for debug purposes)
 *
 * Allocate a new ssm, with @nr_states states. The @handler callback
@ -119,21 +126,17 @@ FpiSsm *
 fpi_ssm_new_full (FpDevice             *dev,
                  FpiSsmHandlerCallback handler,
                  int                   nr_states,
-                  int                   start_cleanup,
                  const char           *machine_name)
 {
  FpiSsm *machine;

  BUG_ON (dev == NULL);
  BUG_ON (nr_states < 1);
-  BUG_ON (start_cleanup < 1);
-  BUG_ON (start_cleanup > nr_states);
  BUG_ON (handler == NULL);

  machine = g_new0 (FpiSsm, 1);
  machine->handler = handler;
  machine->nr_states = nr_states;
-  machine->start_cleanup = start_cleanup;
  machine->dev = dev;
  machine->name = g_strdup (machine_name);
  machine->completed = TRUE;
@ -199,13 +202,59 @@ fpi_ssm_clear_delayed_action (FpiSsm *machine)
 {
  g_return_if_fail (machine);

+  if (machine->cancellable_id)
+    {
+      g_cancellable_disconnect (machine->cancellable, machine->cancellable_id);
+      machine->cancellable_id = 0;
+    }
+
+  g_clear_object (&machine->cancellable);
  g_clear_pointer (&machine->timeout, g_source_destroy);
 }

+typedef struct _CancelledActionIdleData
+{
+  gulong        cancellable_id;
+  GCancellable *cancellable;
+} CancelledActionIdleData;
+
+static gboolean
+on_delayed_action_cancelled_idle (gpointer user_data)
+{
+  CancelledActionIdleData *data = user_data;
+
+  g_cancellable_disconnect (data->cancellable, data->cancellable_id);
+  g_object_unref (data->cancellable);
+  g_free (data);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+on_delayed_action_cancelled (GCancellable *cancellable,
+                             FpiSsm       *machine)
+{
+  CancelledActionIdleData *data;
+
+  fp_dbg ("[%s] %s cancelled delayed state change",
+          fp_device_get_driver (machine->dev), machine->name);
+
+  g_clear_pointer (&machine->timeout, g_source_destroy);
+
+  data = g_new0 (CancelledActionIdleData, 1);
+  data->cancellable = g_steal_pointer (&machine->cancellable);
+  data->cancellable_id = machine->cancellable_id;
+  machine->cancellable_id = 0;
+
+  g_idle_add_full (G_PRIORITY_HIGH_IDLE, on_delayed_action_cancelled_idle,
+                   data, NULL);
+}
+
 static void
 fpi_ssm_set_delayed_action_timeout (FpiSsm        *machine,
                                    int            delay,
                                    FpTimeoutFunc  callback,
+                                    GCancellable  *cancellable,
                                    gpointer       user_data,
                                    GDestroyNotify destroy_func)
 {
@ -216,6 +265,16 @@ fpi_ssm_set_delayed_action_timeout (FpiSsm        *machine,

  fpi_ssm_clear_delayed_action (machine);

+  if (cancellable != NULL)
+    {
+      g_set_object (&machine->cancellable, cancellable);
+
+      machine->cancellable_id =
+        g_cancellable_connect (machine->cancellable,
+                               G_CALLBACK (on_delayed_action_cancelled),
+                               machine, NULL);
+    }
+
  machine->timeout = fpi_device_add_timeout (machine->dev, delay, callback,
                                             user_data, destroy_func);
 }
@ -322,14 +381,10 @@ fpi_ssm_start_subsm (FpiSsm *parent, FpiSsm *child)
 *
 * Mark a ssm as completed successfully. The callback set when creating
 * the state machine with fpi_ssm_new () will be called synchronously.
- *
- * Note that any later cleanup state will still be executed.
 */
 void
 fpi_ssm_mark_completed (FpiSsm *machine)
 {
-  int next_state;
-
  g_return_if_fail (machine != NULL);

  BUG_ON (machine->completed);
@ -337,19 +392,6 @@ fpi_ssm_mark_completed (FpiSsm *machine)

  fpi_ssm_clear_delayed_action (machine);

-  /* complete in a cleanup state just moves forward one step */
-  if (machine->cur_state < machine->start_cleanup)
-    next_state = machine->start_cleanup;
-  else
-    next_state = machine->cur_state + 1;
-
-  if (next_state < machine->nr_states)
-    {
-      machine->cur_state = next_state;
-      __ssm_call_handler (machine);
-      return;
-    }
-
  machine->completed = TRUE;

  if (machine->error)
@ -381,21 +423,24 @@ on_device_timeout_complete (FpDevice *dev,
 * fpi_ssm_mark_completed_delayed:
 * @machine: an #FpiSsm state machine
 * @delay: the milliseconds to wait before switching to the next state
+ * @cancellable: (nullable): a #GCancellable to cancel the delayed operation
 *
 * Mark a ssm as completed successfully with a delay of @delay ms.
 * The callback set when creating the state machine with fpi_ssm_new () will be
 * called when the timeout is over.
+ * The request can be cancelled passing a #GCancellable as @cancellable.
 */
 void
 fpi_ssm_mark_completed_delayed (FpiSsm       *machine,
-                                int     delay)
+                                int           delay,
+                                GCancellable *cancellable)
 {
  g_autofree char *source_name = NULL;

  g_return_if_fail (machine != NULL);

  fpi_ssm_set_delayed_action_timeout (machine, delay,
-                                      on_device_timeout_complete,
+                                      on_device_timeout_complete, cancellable,
                                      machine, NULL);

  source_name = g_strdup_printf ("[%s] ssm %s complete %d",
@ -416,9 +461,7 @@ fpi_ssm_mark_failed (FpiSsm *machine, GError *error)
 {
  g_return_if_fail (machine != NULL);
  g_assert (error);
-
-  /* During cleanup it is OK to call fpi_ssm_mark_failed a second time */
-  if (machine->error && machine->cur_state < machine->start_cleanup)
+  if (machine->error)
    {
      fp_warn ("[%s] SSM %s already has an error set, ignoring new error %s",
               fp_device_get_driver (machine->dev), machine->name, error->message);
@ -426,15 +469,10 @@ fpi_ssm_mark_failed (FpiSsm *machine, GError *error)
      return;
    }

-  fp_dbg ("[%s] SSM %s failed in state %d%s with error: %s",
+  fp_dbg ("[%s] SSM %s failed in state %d with error: %s",
          fp_device_get_driver (machine->dev), machine->name,
-          machine->cur_state,
-          machine->cur_state >= machine->start_cleanup ? " (cleanup)" : "",
-          error->message);
-  if (!machine->error)
+          machine->cur_state, error->message);
  machine->error = g_steal_pointer (&error);
-  else
-    g_error_free (error);
  fpi_ssm_mark_completed (machine);
 }

@ -490,21 +528,25 @@ on_device_timeout_next_state (FpDevice *dev,
 * fpi_ssm_next_state_delayed:
 * @machine: an #FpiSsm state machine
 * @delay: the milliseconds to wait before switching to the next state
+ * @cancellable: (nullable): a #GCancellable to cancel the delayed operation
 *
 * Iterate to next state of a state machine with a delay of @delay ms. If the
 * current state is the last state, then the state machine will be marked as
 * completed, as if calling fpi_ssm_mark_completed().
+ * Passing a valid #GCancellable will cause the action to be cancelled when
+ * @cancellable is.
 */
 void
 fpi_ssm_next_state_delayed (FpiSsm       *machine,
-                            int     delay)
+                            int           delay,
+                            GCancellable *cancellable)
 {
  g_autofree char *source_name = NULL;

  g_return_if_fail (machine != NULL);

  fpi_ssm_set_delayed_action_timeout (machine, delay,
-                                      on_device_timeout_next_state,
+                                      on_device_timeout_next_state, cancellable,
                                      machine, NULL);

  source_name = g_strdup_printf ("[%s] ssm %s jump to next state %d",
@ -528,15 +570,12 @@ fpi_ssm_jump_to_state (FpiSsm *machine, int state)
  g_return_if_fail (machine != NULL);

  BUG_ON (machine->completed);
-  BUG_ON (state < 0 || state > machine->nr_states);
+  BUG_ON (state < 0 || state >= machine->nr_states);
  BUG_ON (machine->timeout != NULL);

  fpi_ssm_clear_delayed_action (machine);

  machine->cur_state = state;
-  if (machine->cur_state == machine->nr_states)
-    fpi_ssm_mark_completed (machine);
-  else
  __ssm_call_handler (machine);
 }

@ -561,20 +600,24 @@ on_device_timeout_jump_to_state (FpDevice *dev,
 * @machine: an #FpiSsm state machine
 * @state: the state to jump to
 * @delay: the milliseconds to wait before switching to @state state
+ * @cancellable: (nullable): a #GCancellable to cancel the delayed operation
 *
 * Jump to the @state state with a delay of @delay milliseconds, bypassing
 * intermediary states.
+ * Passing a valid #GCancellable will cause the action to be cancelled when
+ * @cancellable is.
 */
 void
 fpi_ssm_jump_to_state_delayed (FpiSsm       *machine,
                               int           state,
-                               int     delay)
+                               int           delay,
+                               GCancellable *cancellable)
 {
  FpiSsmJumpToStateDelayedData *data;
  g_autofree char *source_name = NULL;

  g_return_if_fail (machine != NULL);
-  BUG_ON (state < 0 || state > machine->nr_states);
+  BUG_ON (state < 0 || state >= machine->nr_states);

  data = g_new0 (FpiSsmJumpToStateDelayedData, 1);
  data->machine = machine;
@ -582,7 +625,7 @@ fpi_ssm_jump_to_state_delayed (FpiSsm *machine,

  fpi_ssm_set_delayed_action_timeout (machine, delay,
                                      on_device_timeout_jump_to_state,
-                                      data, g_free);
+                                      cancellable, data, g_free);

  source_name = g_strdup_printf ("[%s] ssm %s jump to state %d",
                                 fp_device_get_device_id (machine->dev),
--- a/libfprint/fpi-ssm.h
+++ b/libfprint/fpi-ssm.h
@ -60,11 +60,10 @@ typedef void (*FpiSsmHandlerCallback)(FpiSsm   *ssm,

 /* for library and drivers */
 #define fpi_ssm_new(dev, handler, nr_states) \
-  fpi_ssm_new_full (dev, handler, nr_states, nr_states, #nr_states)
+  fpi_ssm_new_full (dev, handler, nr_states, #nr_states)
 FpiSsm *fpi_ssm_new_full (FpDevice             *dev,
                          FpiSsmHandlerCallback handler,
                          int                   nr_states,
-                          int                   start_cleanup,
                          const char           *machine_name);
 void fpi_ssm_free (FpiSsm *machine);
 void fpi_ssm_start (FpiSsm                 *ssm,
@ -77,14 +76,17 @@ void fpi_ssm_next_state (FpiSsm *machine);
 void fpi_ssm_jump_to_state (FpiSsm *machine,
                            int     state);
 void fpi_ssm_next_state_delayed (FpiSsm       *machine,
-                                 int     delay);
+                                 int           delay,
+                                 GCancellable *cancellable);
 void fpi_ssm_jump_to_state_delayed (FpiSsm       *machine,
                                    int           state,
-                                    int     delay);
+                                    int           delay,
+                                    GCancellable *cancellable);
 void fpi_ssm_cancel_delayed_state_change (FpiSsm *machine);
 void fpi_ssm_mark_completed (FpiSsm *machine);
 void fpi_ssm_mark_completed_delayed (FpiSsm       *machine,
-                                     int     delay);
+                                     int           delay,
+                                     GCancellable *cancellable);
 void fpi_ssm_mark_failed (FpiSsm *machine,
                          GError *error);
 void fpi_ssm_set_data (FpiSsm        *machine,
--- a/libfprint/fpi-usb-transfer.c
+++ b/libfprint/fpi-usb-transfer.c
@ -354,10 +354,9 @@ transfer_finish_cb (GObject *source_object, GAsyncResult *res, gpointer user_dat
  fpi_usb_transfer_unref (transfer);
 }

-static void
-transfer_cancel_cb (FpDevice *device, gpointer user_data)
+static gboolean
+transfer_cancel_cb (FpiUsbTransfer *transfer)
 {
-  FpiUsbTransfer *transfer = user_data;
  GError *error;
  FpiUsbTransferCallback callback;

@ -370,6 +369,8 @@ transfer_cancel_cb (FpDevice *device, gpointer user_data)
  callback (transfer, transfer->device, transfer->user_data, error);

  fpi_usb_transfer_unref (transfer);
+
+  return G_SOURCE_REMOVE;
 }

 /**
@ -412,8 +413,7 @@ fpi_usb_transfer_submit (FpiUsbTransfer        *transfer,
   */
  if (cancellable && g_cancellable_is_cancelled (cancellable))
    {
-      fpi_device_add_timeout (transfer->device, 0,
-                              transfer_cancel_cb, transfer, NULL);
+      g_idle_add ((GSourceFunc) transfer_cancel_cb, transfer);
      return;
    }

--- a/libfprint/fprint-list-supported-devices.c
+++ b/libfprint/fprint-list-supported-devices.c
@ -28,8 +28,8 @@

 GHashTable *printed = NULL;

-static void
-insert_drivers (GList **usb_list, GList **spi_list)
+static GList *
+insert_drivers (GList *list)
 {
  g_autoptr(GArray) drivers = fpi_get_driver_types ();
  gint i;
@ -41,9 +41,8 @@ insert_drivers (GList **usb_list, GList **spi_list)
      g_autoptr(FpDeviceClass) cls = g_type_class_ref (driver);
      const FpIdEntry *entry;

-      switch (cls->type)
-        {
-        case FP_DEVICE_TYPE_USB:
+      if (cls->type != FP_DEVICE_TYPE_USB)
+        continue;

      for (entry = cls->id_table; entry->vid; entry++)
        {
@ -59,52 +58,17 @@ insert_drivers (GList **usb_list, GList **spi_list)

          g_hash_table_insert (printed, key, GINT_TO_POINTER (1));

-              *usb_list = g_list_prepend (*usb_list,
-                                          g_strdup_printf ("%s | %s\n", key, cls->full_name));
-            }
-          break;
-
-        case FP_DEVICE_TYPE_UDEV:
-          for (entry = cls->id_table; entry->udev_types; entry++)
-            {
-              char *key;
-
-              /* Need SPI device */
-              if ((entry->udev_types & FPI_DEVICE_UDEV_SUBTYPE_SPIDEV) == 0)
-                continue;
-
-              key = g_strdup_printf ("SPI:%s:%04x:%04x", entry->spi_acpi_id, entry->hid_id.vid, entry->hid_id.pid);
-
-              if (g_hash_table_lookup (printed, key) != NULL)
-                {
-                  g_free (key);
-                  continue;
-                }
-
-              g_hash_table_insert (printed, key, GINT_TO_POINTER (1));
-
-              if (entry->udev_types & FPI_DEVICE_UDEV_SUBTYPE_HIDRAW)
-                *spi_list = g_list_prepend (*spi_list,
-                                            g_strdup_printf ("%s | %04x:%04x | %s\n", entry->spi_acpi_id, entry->hid_id.vid, entry->hid_id.pid, cls->full_name));
-              else
-                *spi_list = g_list_prepend (*spi_list,
-                                            g_strdup_printf ("%s | - | %s\n", entry->spi_acpi_id, cls->full_name));
-            }
-          break;
-
-        case FP_DEVICE_TYPE_VIRTUAL:
-        default:
-          break;
+          list = g_list_prepend (list, g_strdup_printf ("%s | %s\n", key, cls->full_name));
        }
    }
+
+  return list;
 }

 int
 main (int argc, char **argv)
 {
-  GList *usb_list = NULL;
-  GList *spi_list = NULL;
-  GList *l;
+  GList *list, *l;

  setlocale (LC_ALL, "");

@ -119,36 +83,19 @@ main (int argc, char **argv)
  g_print ("\n");
  g_print ("This is a list of supported devices in libfprint's development version. Those drivers might not all be available in the stable, released version. If in doubt, contact your distribution or systems integrator for details.\n");
  g_print ("\n");
-
-  insert_drivers (&usb_list, &spi_list);
-
  g_print ("## USB devices\n");
  g_print ("\n");
  g_print ("USB ID | Driver\n");
  g_print ("------------ | ------------\n");

-  usb_list = g_list_sort (usb_list, (GCompareFunc) g_strcmp0);
-  for (l = usb_list; l != NULL; l = l->next)
+  list = NULL;
+  list = insert_drivers (list);
+
+  list = g_list_sort (list, (GCompareFunc) g_strcmp0);
+  for (l = list; l != NULL; l = l->next)
    g_print ("%s", (char *) l->data);
-  g_print ("\n");
-
-  g_list_free_full (usb_list, g_free);
-
-  g_print ("## SPI devices\n");
-  g_print ("\n");
-  g_print ("The ACPI ID represents the SPI interface. Some sensors are also connected to a HID device (Human Input Device) for side-channel requests such as resets.\n");
-  g_print ("\n");
-  g_print ("ACPI ID | HID ID | Driver\n");
-  g_print ("------------ | ------------ | ------------\n");
-
-  spi_list = g_list_sort (spi_list, (GCompareFunc) g_strcmp0);
-  for (l = spi_list; l != NULL; l = l->next)
-    g_print ("%s", (char *) l->data);
-  g_print ("\n");
-
-  g_list_free_full (usb_list, g_free);
-

+  g_list_free_full (list, g_free);
  g_hash_table_destroy (printed);

  return 0;
--- a/libfprint/fprint-list-udev-hwdb.c
+++ b/libfprint/fprint-list-udev-hwdb.c
@ -33,6 +33,7 @@ static const FpIdEntry whitelist_id_table[] = {
  { .vid = 0x04f3, .pid = 0x0c00 },
  { .vid = 0x04f3, .pid = 0x0c4b },
  { .vid = 0x04f3, .pid = 0x0c4c },
+  { .vid = 0x04f3, .pid = 0x0c4f },
  { .vid = 0x04f3, .pid = 0x0c57 },
  { .vid = 0x04f3, .pid = 0x0c5e },
  { .vid = 0x04f3, .pid = 0x2706 },
@ -49,8 +50,6 @@ static const FpIdEntry whitelist_id_table[] = {
  { .vid = 0x06cb, .pid = 0x00cb },
  { .vid = 0x06cb, .pid = 0x00d8 },
  { .vid = 0x06cb, .pid = 0x00da },
-  { .vid = 0x06cb, .pid = 0x00e7 },
-  { .vid = 0x06cb, .pid = 0x00e9 },
  { .vid = 0x0a5c, .pid = 0x5801 },
  { .vid = 0x0a5c, .pid = 0x5805 },
  { .vid = 0x0a5c, .pid = 0x5834 },
@ -58,7 +57,6 @@ static const FpIdEntry whitelist_id_table[] = {
  { .vid = 0x0a5c, .pid = 0x5841 },
  { .vid = 0x0a5c, .pid = 0x5842 },
  { .vid = 0x0a5c, .pid = 0x5843 },
-  { .vid = 0x0a5c, .pid = 0x5844 },
  { .vid = 0x0a5c, .pid = 0x5845 },
  { .vid = 0x10a5, .pid = 0x0007 },
  { .vid = 0x1188, .pid = 0x9545 },
@ -77,6 +75,7 @@ static const FpIdEntry whitelist_id_table[] = {
  { .vid = 0x1491, .pid = 0x0088 },
  { .vid = 0x16d1, .pid = 0x1027 },
  { .vid = 0x1c7a, .pid = 0x0300 },
+  { .vid = 0x1c7a, .pid = 0x0570 },
  { .vid = 0x1c7a, .pid = 0x0575 },
  { .vid = 0x27c6, .pid = 0x5042 },
  { .vid = 0x27c6, .pid = 0x5110 },
@ -167,10 +166,7 @@ print_driver (const FpDeviceClass *cls)
    }

  if (num_printed > 0)
-    {
    g_print (" ID_AUTOSUSPEND=1\n");
-      g_print (" ID_PERSIST=0\n");
-    }
 }

 static int
--- a/libfprint/fprint-list-udev-rules.c
+++ b/libfprint/fprint-list-udev-rules.c
@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2009 Red Hat <mjg@redhat.com>
- * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
- * Copyright (C) 2008 Timo Hoenig <thoenig@suse.de>, <thoenig@nouse.net>
- * Coypright (C) 2019 Benjamin Berg <bberg@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <config.h>
-
-#include "fpi-context.h"
-#include "fpi-device.h"
-
-GHashTable *printed = NULL;
-
-static void
-print_driver (const FpDeviceClass *cls)
-{
-  const FpIdEntry *entry;
-  gint num_printed = 0;
-
-  if (cls->type != FP_DEVICE_TYPE_UDEV)
-    return;
-
-  for (entry = cls->id_table; entry->udev_types != 0; entry++)
-    {
-      /* We only add rules for spidev right now. */
-      if ((entry->udev_types & FPI_DEVICE_UDEV_SUBTYPE_SPIDEV) == 0)
-        continue;
-
-      if (g_hash_table_lookup (printed, entry->spi_acpi_id) != NULL)
-        continue;
-
-      g_hash_table_insert (printed, g_strdup (entry->spi_acpi_id), GINT_TO_POINTER (1));
-
-      if (num_printed == 0)
-        g_print ("# %s\n", cls->full_name);
-
-      g_print ("ACTION==\"add|change\", SUBSYSTEM==\"spi\", ENV{MODALIAS}==\"acpi:%s:\", RUN{builtin}+=\"kmod load spi:spidev\", RUN+=\"/bin/sh -c 'echo spidev > %%S%%p/driver_override && echo %%k > %%S%%p/subsystem/drivers/spidev/bind'\"\n",
-               entry->spi_acpi_id);
-      num_printed++;
-    }
-
-  if (num_printed > 0)
-    g_print ("\n");
-}
-
-int
-main (int argc, char **argv)
-{
-  g_autoptr(GArray) drivers = fpi_get_driver_types ();
-  guint i;
-
-  printed = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-
-  g_print ("# This file is part of libfprint\n");
-  g_print ("# Do not modify this file, it will get overwritten on updates.\n");
-  g_print ("# To override or extend the rules place a file in /etc/udev/rules.d\n");
-  g_print ("\n");
-
-  for (i = 0; i < drivers->len; i++)
-    {
-      GType driver = g_array_index (drivers, GType, i);
-      FpDeviceClass *cls = FP_DEVICE_CLASS (g_type_class_ref (driver));
-
-      if (cls->type != FP_DEVICE_TYPE_UDEV)
-        {
-          g_type_class_unref (cls);
-          continue;
-        }
-
-      print_driver (cls);
-
-      g_type_class_unref (cls);
-    }
-
-  g_hash_table_destroy (printed);
-
-  return 0;
-}
--- a/libfprint/meson.build
+++ b/libfprint/meson.build
@ -80,91 +80,125 @@ nbis_sources = [
    'nbis/mindtct/xytreps.c',
 ]

-driver_sources = {
-    'upekts' :
-        [ 'drivers/upekts.c', 'drivers/upek_proto.c' ],
-    'upektc' :
-        [ 'drivers/upektc.c' ],
-    'upeksonly' :
-        [ 'drivers/upeksonly.c' ],
-    'uru4000' :
-        [ 'drivers/uru4000.c' ],
-    'aes1610' :
-        [ 'drivers/aes1610.c' ],
-    'aes1660' :
-        [ 'drivers/aes1660.c' ],
-    'aes2501' :
-        [ 'drivers/aes2501.c' ],
-    'aes2550' :
-        [ 'drivers/aes2550.c' ],
-    'aes2660' :
-        [ 'drivers/aes2660.c' ],
-    'aes3500' :
-        [ 'drivers/aes3500.c' ],
-    'aes4000' :
-        [ 'drivers/aes4000.c' ],
-    'vcom5s' :
-        [ 'drivers/vcom5s.c' ],
-    'vfs101' :
-        [ 'drivers/vfs101.c' ],
-    'vfs301' :
-        [ 'drivers/vfs301.c', 'drivers/vfs301_proto.c' ],
-    'vfs5011' :
-        [ 'drivers/vfs5011.c' ],
-    'vfs7552' :
-        [ 'drivers/vfs7552.c' ],
-    'upektc_img' :
-        [ 'drivers/upektc_img.c',  'drivers/upek_proto.c' ],
-    'etes603' :
-        [ 'drivers/etes603.c' ],
-    'egis0570' :
-        [ 'drivers/egis0570.c' ],
-    'vfs0050' :
-        [ 'drivers/vfs0050.c' ],
-    'elan' :
-        [ 'drivers/elan.c' ],
-    'elanmoc' :
-        [ 'drivers/elanmoc/elanmoc.c' ],
-    'elanspi' :
-        [ 'drivers/elanspi.c' ],
-    'nb1010' :
-        [ 'drivers/nb1010.c' ],
-    'virtual_image' :
-        [ 'drivers/virtual-image.c' ],
-    'virtual_device' :
-        [ 'drivers/virtual-device.c' ],
-    'virtual_device_storage' :
-        [ 'drivers/virtual-device-storage.c' ],
-    'synaptics' :
-        [ 'drivers/synaptics/synaptics.c', 'drivers/synaptics/bmkt_message.c' ],
-    'goodixmoc' :
-        [ 'drivers/goodixmoc/goodix.c', 'drivers/goodixmoc/goodix_proto.c' ],
-}
-
-helper_sources = {
-    'aeslib' :
-        [ 'drivers/aeslib.c' ],
-    'aesx660' :
-        [ 'drivers/aesx660.c' ],
-    'aes3k' :
-        [ 'drivers/aes3k.c' ],
-    'nss' :
-        [ ],
-    'udev' :
-        [ ],
-    'virtual' :
-        [ 'drivers/virtual-device-listener.c' ],
-}
-
+aeslib = false
+aesx660 = false
+aes3k = false
 drivers_sources = []
 drivers_cflags = []
 foreach driver: drivers
-    drivers_sources += driver_sources[driver]
-endforeach
-foreach helper : driver_helpers
-    drivers_sources += helper_sources[helper]
+    if driver == 'upekts'
+        drivers_sources += [ 'drivers/upekts.c', 'drivers/upek_proto.c' ]
+    endif
+    if driver == 'upektc'
+        drivers_sources += [ 'drivers/upektc.c' ]
+    endif
+    if driver == 'upeksonly'
+        drivers_sources += [ 'drivers/upeksonly.c' ]
+    endif
+    if driver == 'uru4000'
+        drivers_sources += [ 'drivers/uru4000.c' ]
+    endif
+    if driver == 'aes1610'
+        drivers_sources += [ 'drivers/aes1610.c' ]
+        aeslib = true
+    endif
+    if driver == 'aes1660'
+        drivers_sources += [ 'drivers/aes1660.c' ]
+        aeslib = true
+        aesx660 = true
+    endif
+    if driver == 'aes2501'
+        drivers_sources += [ 'drivers/aes2501.c' ]
+        aeslib = true
+    endif
+    if driver == 'aes2550'
+        drivers_sources += [ 'drivers/aes2550.c' ]
+        aeslib = true
+    endif
+    if driver == 'aes2660'
+        drivers_sources += [ 'drivers/aes2660.c' ]
+        aeslib = true
+        aesx660 = true
+    endif
+    if driver == 'aes3500'
+        drivers_sources += [ 'drivers/aes3500.c' ]
+        aeslib = true
+        aes3k = true
+    endif
+    if driver == 'aes4000'
+        drivers_sources += [ 'drivers/aes4000.c' ]
+        aeslib = true
+        aes3k = true
+    endif
+    if driver == 'vcom5s'
+        drivers_sources += [ 'drivers/vcom5s.c' ]
+    endif
+    if driver == 'vfs101'
+        drivers_sources += [ 'drivers/vfs101.c' ]
+    endif
+    if driver == 'vfs301'
+        drivers_sources += [ 'drivers/vfs301.c', 'drivers/vfs301_proto.c' ]
+    endif
+    if driver == 'vfs5011'
+        drivers_sources += [ 'drivers/vfs5011.c' ]
+    endif
+    if driver == 'vfs7552'
+        drivers_sources += [ 'drivers/vfs7552.c' ]
+    endif
+    if driver == 'upektc_img'
+        drivers_sources += [ 'drivers/upektc_img.c',  'drivers/upek_proto.c' ]
+    endif
+    if driver == 'etes603'
+        drivers_sources += [ 'drivers/etes603.c' ]
+    endif
+    if driver == 'vfs0050'
+        drivers_sources += [ 'drivers/vfs0050.c' ]
+    endif
+    if driver == 'elan'
+        drivers_sources += [ 'drivers/elan.c' ]
+    endif
+    if driver == 'virtual_image'
+        drivers_sources += [ 'drivers/virtual-image.c' ]
+    endif
+    if driver == 'virtual_device'
+        drivers_sources += [ 'drivers/virtual-device.c' ]
+    endif
+    if driver == 'virtual_device_storage'
+        drivers_sources += [ 'drivers/virtual-device-storage.c' ]
+    endif
+    if driver.startswith('virtual_')
+        drivers_sources += [ 'drivers/virtual-device-listener.c' ]
+    endif
+    if driver == 'synaptics'
+    drivers_sources += [
+        'drivers/synaptics/synaptics.c',
+        'drivers/synaptics/bmkt_message.c',
+    ]
+    endif
+    if driver == 'goodixmoc'
+    drivers_sources += [
+        'drivers/goodixmoc/goodix.c',
+        'drivers/goodixmoc/goodix_proto.c',
+    ]
+    endif
+    if driver == 'nb1010'
+    drivers_sources += [
+        'drivers/nb1010.c',
+    ]
+    endif
 endforeach

+if aeslib
+    drivers_sources += [ 'drivers/aeslib.c' ]
+endif
+if aesx660
+    drivers_sources += ['drivers/aesx660.c' ]
+endif
+if aes3k
+    drivers_sources += ['drivers/aes3k.c' ]
+endif
+
+other_sources = []

 fp_enums = gnome.mkenums_simple('fp-enums',
    sources: libfprint_public_headers,
@ -183,28 +217,6 @@ enums_dep = declare_dependency(
    sources: [ fp_enums_h, fpi_enums_h ]
 )

-# Export the drivers' types to the core code
-drivers_type_list = []
-drivers_type_func = []
-drivers_type_list += '#include <glib-object.h>'
-drivers_type_list += '#include "fpi-context.h"'
-drivers_type_list += ''
-drivers_type_func += 'GArray *'
-drivers_type_func += 'fpi_get_driver_types (void)'
-drivers_type_func += '{'
-drivers_type_func += '  GArray *drivers = g_array_new (TRUE, FALSE, sizeof (GType));'
-drivers_type_func += '  GType t;'
-drivers_type_func += ''
-foreach driver: supported_drivers
-    drivers_type_list += 'extern GType (fpi_device_' + driver + '_get_type) (void);'
-    drivers_type_func += '  t = fpi_device_' + driver + '_get_type ();'
-    drivers_type_func += '  g_array_append_val (drivers, t);'
-    drivers_type_func += ''
-endforeach
-drivers_type_list += ''
-drivers_type_func += '  return drivers;'
-drivers_type_func += '}'
-
 drivers_sources += configure_file(input: 'empty_file',
    output: 'fpi-drivers.c',
    capture: true,
@ -219,8 +231,11 @@ deps = [
    glib_dep,
    gobject_dep,
    gusb_dep,
+    gudev_dep,
+    imaging_dep,
    mathlib_dep,
-] + optional_deps
+    nss_dep,
+]

 # These are empty and only exist so that the include directories are created
 # in the build tree. This silences a build time warning.
@ -267,6 +282,7 @@ libfprint = shared_library(versioned_libname.split('lib')[1],
    sources: [
        fp_enums,
        libfprint_sources,
+        other_sources,
    ],
    soversion: soversion,
    version: libversion,
@ -313,23 +329,6 @@ udev_hwdb_generator = custom_target('udev-hwdb',
    install: false,
 )

-if install_udev_rules
-    udev_rules = executable('fprint-list-udev-rules',
-        'fprint-list-udev-rules.c',
-        dependencies: libfprint_private_dep,
-        link_with: libfprint_drivers,
-        install: false)
-
-    custom_target('udev-rules',
-        output: '70-@0@.rules'.format(versioned_libname),
-        depend_files: drivers_sources,
-        capture: true,
-        command: [ udev_rules ],
-        install: true,
-        install_dir: udev_rules_dir,
-    )
-endif
-
 custom_target('sync-udev-hwdb',
    depends: udev_hwdb_generator,
    output: 'sync-udev-hwdb',
--- a/meson.build
+++ b/meson.build
@ -1,5 +1,5 @@
 project('libfprint', [ 'c', 'cpp' ],
-    version: '1.94.0',
+    version: '1.90.7',
    license: 'LGPLv2.1+',
    default_options: [
        'buildtype=debugoptimized',
@ -33,7 +33,6 @@ common_cflags = cc.get_supported_arguments([
    '-Wmissing-noreturn',
    '-Wpointer-arith',
    '-Wshadow',
-    '-Wswitch-enum',
    '-Wtype-limits',
    '-Wundef',
    '-Wunused',
@ -87,9 +86,6 @@ mathlib_dep = cc.find_library('m', required: false)
 # The following dependencies are only used for tests
 cairo_dep = dependency('cairo', required: false)

-# introspection scanning and Gio-2.0.gir
-gobject_introspection = dependency('gobject-introspection-1.0', required: get_option('introspection'))
-
 # Drivers
 drivers = get_option('drivers').split(',')
 virtual_drivers = [
@ -98,6 +94,9 @@ virtual_drivers = [
    'virtual_device_storage',
 ]

+udev_drivers = [
+]
+
 default_drivers = [
    'upektc_img',
    'vfs5011',
@ -113,20 +112,15 @@ default_drivers = [
    'vfs301',
    'vfs0050',
    'etes603',
-    'egis0570',
    'vcom5s',
    'synaptics',
    'elan',
-    'elanmoc',
    'uru4000',
    'upektc',
    'upeksonly',
    'upekts',
    'goodixmoc',
-    'nb1010',
-
-    # SPI
-    'elanspi',
+    'nb1010'
 ]

 # FIXME: All the drivers should be fixed by adjusting the byte order.
@ -136,7 +130,7 @@ endian_independent_drivers = virtual_drivers + [
    'synaptics',
 ]

-all_drivers = default_drivers + virtual_drivers
+all_drivers = default_drivers + virtual_drivers + udev_drivers

 if drivers == [ 'all' ]
    drivers = all_drivers
@ -146,33 +140,6 @@ if drivers == [ 'default' ]
    drivers = default_drivers
 endif

-driver_helper_mapping = {
-    'aes1610' : [ 'aeslib' ],
-    'aes1660' : [ 'aeslib', 'aesx660' ],
-    'aes2501' : [ 'aeslib' ],
-    'aes2550' : [ 'aeslib' ],
-    'aes2660' : [ 'aeslib', 'aesx660' ],
-    'aes3500' : [ 'aeslib', 'aes3k' ],
-    'aes4000' : [ 'aeslib', 'aes3k' ],
-    'uru4000' : [ 'nss' ],
-    'elanspi' : [ 'udev' ],
-    'virtual_image'          : [ 'virtual' ],
-    'virtual_device'         : [ 'virtual' ],
-    'virtual_device_storage' : [ 'virtual' ],
-}
-
-driver_helpers = []
-foreach driver : drivers
-    if driver in driver_helper_mapping
-        foreach helper : driver_helper_mapping[driver]
-            if helper not in driver_helpers
-                driver_helpers += helper
-            endif
-        endforeach
-    endif
-endforeach
-
-
 if drivers.length() == 0 or drivers[0] == ''
    error('Cannot build libfprint without drivers, please specify a valid value for the drivers option')
 endif
@ -189,61 +156,38 @@ else
    endforeach
 endif

-udev_rules = get_option('udev_rules')
-install_udev_rules = udev_rules.enabled()
-
-optional_deps = []
-
-# Resolve extra dependencies
-foreach i : driver_helpers
-    foreach d, helpers : driver_helper_mapping
-        if i in helpers
-            driver = d
-            break
+nss_dep = dependency('', required: false)
+imaging_dep = dependency('', required: false)
+gudev_dep = dependency('', required: false)
+libfprint_conf.set10('HAVE_PIXMAN', false)
+foreach driver: drivers
+    if driver == 'uru4000'
+        nss_dep = dependency('nss', required: false)
+        if not nss_dep.found()
+            error('NSS is required for the URU4000/URU4500 driver')
        endif
-    endforeach
-
-    if i == 'aes3k'
+    endif
+    if driver == 'aes3500' or driver == 'aes4000'
        imaging_dep = dependency('pixman-1', required: false)
        if not imaging_dep.found()
-            error('pixman is required for @0@ and possibly others'.format(driver))
+            error('pixman is required for imaging support')
        endif

        libfprint_conf.set10('HAVE_PIXMAN', true)
-        optional_deps += imaging_dep
-    elif i == 'nss'
-        nss_dep = dependency('nss', required: false)
-        if not nss_dep.found()
-            error('nss is required for @0@ and possibly others'.format(driver))
    endif
-
-        optional_deps += nss_dep
-    elif i == 'udev'
-        install_udev_rules = true
-
+	if udev_drivers.contains(driver)
 		gudev_dep = dependency('gudev-1.0', required: false)
 		if not gudev_dep.found()
 			error('udev is required for SPI support')
 		endif

 		libfprint_conf.set10('HAVE_UDEV', true)
-
-        optional_deps += gudev_dep
+	endif
+    if not all_drivers.contains(driver)
+        error('Invalid driver \'' + driver + '\'')
    endif
 endforeach

-if udev_rules.disabled()
-    install_udev_rules = false
-endif
-
-if install_udev_rules
-    udev_rules_dir = get_option('udev_rules_dir')
-    if udev_rules_dir == 'auto'
-        udev_dep = dependency('udev')
-        udev_rules_dir = udev_dep.get_pkgconfig_variable('udevdir') + '/rules.d'
-    endif
-endif
-
 supported_drivers = []
 foreach driver: drivers
    if build_machine.endian() == 'little' or driver in endian_independent_drivers
@ -258,6 +202,28 @@ if default_drivers_are_enabled and supported_drivers != drivers
    default_drivers_are_enabled = false
 endif

+# Export the drivers' types to the core code
+drivers_type_list = []
+drivers_type_func = []
+drivers_type_list += '#include <glib-object.h>'
+drivers_type_list += '#include "fpi-context.h"'
+drivers_type_list += ''
+drivers_type_func += 'GArray *'
+drivers_type_func += 'fpi_get_driver_types (void)'
+drivers_type_func += '{'
+drivers_type_func += '  GArray *drivers = g_array_new (TRUE, FALSE, sizeof (GType));'
+drivers_type_func += '  GType t;'
+drivers_type_func += ''
+foreach driver: supported_drivers
+    drivers_type_list += 'extern GType (fpi_device_' + driver + '_get_type) (void);'
+    drivers_type_func += '  t = fpi_device_' + driver + '_get_type ();'
+    drivers_type_func += '  g_array_append_val (drivers, t);'
+    drivers_type_func += ''
+endforeach
+drivers_type_list += ''
+drivers_type_func += '  return drivers;'
+drivers_type_func += '}'
+
 root_inc = include_directories('.')

 udev_hwdb = get_option('udev_hwdb')
@ -292,11 +258,9 @@ if get_option('gtk-examples')
    endif
 endif

-# Some dependency resolving happens inside here
-subdir('libfprint')
-
 configure_file(output: 'config.h', configuration: libfprint_conf)

+subdir('libfprint')
 subdir('examples')
 if get_option('doc')
    gnome = import('gnome')
--- a/meson_options.txt
+++ b/meson_options.txt
@ -6,16 +6,8 @@ option('introspection',
       description: 'Build GObject Introspection repository',
       type: 'boolean',
       value: true)
-option('udev_rules',
-       description: 'Whether to create and install udev rules (auto: turn on when needed by a driver)',
-       type: 'feature',
-       value: 'auto')
-option('udev_rules_dir',
-       description: 'Installation path for udev rules',
-       type: 'string',
-       value: 'auto')
 option('udev_hwdb',
-       description: 'Whether to create a udev hwdb for autosuspend (included in systemd v248 and later)',
+       description: 'Whether to create a udev hwdb',
       type: 'feature',
       value: 'auto')
 option('udev_hwdb_dir',
--- a/scripts/uncrustify.cfg
+++ b/scripts/uncrustify.cfg
@ -137,7 +137,3 @@ pos_conditional                 Trail

 # custom keywords
 set FOR udev_list_entry_foreach
-
-# macros
-macro-open G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-macro-close G_GNUC_END_IGNORE_DEPRECATIONS
--- a/scripts/uncrustify.sh
+++ b/scripts/uncrustify.sh
@ -12,11 +12,8 @@ case "$1" in
        ;;
 esac

-ARGS=4
-JOBS=4
-
 pushd "$SRCROOT"
-git ls-tree --name-only -r HEAD | grep -E '.*\.[ch]$' | grep -v nbis | grep -v fpi-byte | grep -v build/ | xargs -n$ARGS -P $JOBS uncrustify -c "$CFG" $OPTS
+uncrustify -c "$CFG" $OPTS `git ls-tree --name-only -r HEAD | grep -E '.*\.[ch]$' | grep -v nbis | grep -v fpi-byte | grep -v build/`
 RES=$?
 popd
 exit $RES
--- a/tests/README.md
+++ b/tests/README.md
@ -7,31 +7,58 @@ This document describes how to create a 'capture' test: a test that
 captures a picture of a fingerprint from the device (mocked by
 `umockdev`) and compares it with the standard one.

-Other kinds of `umockdev` tests can be created in a similar manner. For
-match-on-chip devices you would instead create a test specific `custom.py`
-script, capture it and store the capture to `custom.pcapng`.
+Other kinds of `umockdev` tests could be created in a similar manner.
+

 'Capture' Test Creation
 -----------------------
 A new 'capture' test is created by means of `capture.py` script:

-1. Make sure that libfprint is built with support for the device driver
-   that you want to capture a test case for.
+1. Create (if needed) a directory for the driver under `tests`
+   directory:

-2. From the build directory, run tests/create-driver-test.py as root. Note
-   that if you're capturing data for a driver which already has a test case
-   but the hardware is slightly different, you might want to pass a variant
-   name as a command-line options, for example:
-```sh
-$ sudo tests/create-driver-test.py driver [variant]
-```
+   `mkdir DRIVER`

-3. If the capture is not successful, run the tool again to start another capture.
+2. Prepare your execution environment.

-4. Add driver test name to `drivers_tests` in the `meson.build`, as instructed,
-   and change the ownership of the just-created test directory in the source.
+   In the next step a working and up to date libfprint is needed. This can be
+   achieved by installing it into your system. Alternatively, you can set
+   the following environment variables to run a local build:
+   - `export LD_PRELOAD=<meson-build-dir>/libfprint/libfprint-2.so`
+   - `export GI_TYPELIB_PATH=<meson-build-dir>/libfprint`

-5. Check whether `meson test` passes with this new test.
+   Also, sometimes the driver must be adapted to the emulated environment
+   (mainly if it uses random numbers, see `synaptics.c` for an example).
+   Set the following environment variable to enable this adaptation:
+   - `export FP_DEVICE_EMULATION=1`
+
+   Run the next steps in the same terminal.
+
+3. Find the real USB fingerprint device with `lsusb`, e.g.:
+
+   `Bus 001 Device 005: ID 138a:0090 Validity Sensors, Inc. VFS7500 Touch Fingerprint Sensor`
+
+   The following USB device is used in the example above:
+   `/dev/bus/usb/001/005`.
+
+   For the following commands, it is assumed that the user that's
+   running the commands has full access to the device node, whether
+   by running the commands as `root`, or changing the permissions for
+   that device node.
+
+4. Record information about this device:
+
+   `umockdev-record /dev/bus/usb/001/005 > DRIVER/device`
+
+5. Record interaction of `capture.py` (or other test) with the device:
+
+   `umockdev-record -i /dev/bus/usb/001/005=DRIVER/capture.ioctl -- python3 ./capture.py DRIVER/capture.png`
+
+   Files `capture.ioctl` and `capture.png` will be created as the
+   result of this command.
+
+6. Add driver's name to `drivers_tests` in the `meson.build`.
+7. Check whether everything works as expected.

 **Note.** To avoid submitting a real fingerprint, the side of finger,
 arm, or anything else producing an image with the device can be used.
@ -39,6 +66,28 @@ arm, or anything else producing an image with the device can be used.

 Possible Issues
 ---------------
+`umockdev-record` aggressively groups URBs. In most cases, manual
+intervention is unfortunately required. Often, drivers do a chain of
+commands like: A then B each with a different reply. However,
+`umockdev-record` could create a file like this:
+
+    A
+     reply 1
+     reply 2
+    B
+     reply 1
+     reply 2
+
+In that case, records must be re-ordered:
+
+    A
+     reply 1
+    B
+     reply 1
+    A
+     reply 2
+    B
+     reply 2

 Other changes may be needed to get everything working. For example the
 `elan` driver relies on a timeout that is not reported correctly. In
--- a/tests/aes2501/capture.pcapng
+++ b/tests/aes2501/capture.pcapng
--- a/tests/aes2501/capture.png
+++ b/tests/aes2501/capture.png
--- a/tests/aes2501/device
+++ b/tests/aes2501/device
@ -1,223 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-10
-N: bus/usb/001/044=12011001FFFFFF08FF08802523060001000109022000010100A0320904000002FFFFFF000705810220000007050202080000
-E: DEVNAME=/dev/bus/usb/001/044
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=8ff/2580/623
-E: TYPE=255/255/255
-E: BUSNUM=001
-E: DEVNUM=044
-E: MAJOR=189
-E: MINOR=43
-E: SUBSYSTEM=usb
-E: ID_VENDOR=08ff
-E: ID_VENDOR_ENC=08ff
-E: ID_VENDOR_ID=08ff
-E: ID_MODEL=Fingerprint_Sensor
-E: ID_MODEL_ENC=Fingerprint\x20Sensor
-E: ID_MODEL_ID=2580
-E: ID_REVISION=0623
-E: ID_SERIAL=08ff_Fingerprint_Sensor
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ffffff:
-E: ID_VENDOR_FROM_DATABASE=AuthenTec, Inc.
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=AES2501 Fingerprint Sensor
-E: ID_PATH=pci-0000:00:14.0-usb-0:10
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_10
-E: LIBFPRINT_DRIVER=AuthenTec AES2501
-A: authorized=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=ff\n
-A: bDeviceProtocol=ff\n
-A: bDeviceSubClass=ff\n
-A: bMaxPacketSize0=8\n
-A: bMaxPower=100mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0623\n
-A: bmAttributes=a0\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12011001FFFFFF08FF08802523060001000109022000010100A0320904000002FFFFFF000705810220000007050202080000
-A: dev=189:43\n
-A: devnum=44\n
-A: devpath=10\n
-L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d/device:57
-A: idProduct=2580\n
-A: idVendor=08ff\n
-A: ltm_capable=no\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port10
-A: power/active_duration=10573\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=23441\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=0\n
-A: power/runtime_active_time=10430\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=12771\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: product=Fingerprint Sensor\n
-A: quirks=0x0\n
-A: removable=removable\n
-A: rx_lanes=1\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=13241\n
-A: version= 1.10\n
-
-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1d6b/2/513
-E: TYPE=9/0/1
-E: BUSNUM=001
-E: DEVNUM=001
-E: MAJOR=189
-E: MINOR=0
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.13.12-200.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.13.12-200.fc34.x86_64\x20xhci-hcd
-E: ID_VENDOR_ID=1d6b
-E: ID_MODEL=xHCI_Host_Controller
-E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
-E: ID_MODEL_ID=0002
-E: ID_REVISION=0513
-E: ID_SERIAL=Linux_5.13.12-200.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
-E: ID_SERIAL_SHORT=0000:00:14.0
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:090000:
-E: ID_VENDOR_FROM_DATABASE=Linux Foundation
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=2.0 root hub
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: authorized_default=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=09\n
-A: bDeviceProtocol=01\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=0mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0513\n
-A: bmAttributes=e0\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0\n
-A: devnum=1\n
-A: devpath=0\n
-L: driver=../../../../bus/usb/drivers/usb
-L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d
-A: idProduct=0002\n
-A: idVendor=1d6b\n
-A: interface_authorized_default=1\n
-A: ltm_capable=no\n
-A: manufacturer=Linux 5.13.12-200.fc34.x86_64 xhci-hcd\n
-A: maxchild=16\n
-A: power/active_duration=767293591\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=767293591\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=767293588\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: product=xHCI Host Controller\n
-A: quirks=0x0\n
-A: removable=unknown\n
-A: rx_lanes=1\n
-A: serial=0000:00:14.0\n
-A: speed=480\n
-A: tx_lanes=1\n
-A: urbnum=1086\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0
-E: DRIVER=xhci_hcd
-E: PCI_CLASS=C0330
-E: PCI_ID=8086:A36D
-E: PCI_SUBSYS_ID=17AA:312A
-E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
-E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Cannon Lake PCH USB 3.1 xHCI Host Controller
-A: ari_enabled=0\n
-A: broken_parity_status=0\n
-A: class=0x0c0330\n
-H: config=86806DA3060490021030030C00008000040032B1000000000000000000000000000000000000000000000000AA172A31000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000560BBD0700000000316000000000000000000000000000000180C2C1080000000000000000000000059087009802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F400200000100006000000008020000010000000400000090000000001800000005000000000000000300000C0000004000000080000000030000000000000000000000000000000000000000000000B50F110112000000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: dbc=disabled\n
-A: device=0xa36d\n
-A: dma_mask_bits=64\n
-L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)\n
-A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c
-A: index=3\n
-A: irq=125\n
-A: label=Onboard - Other\n
-A: local_cpulist=0-5\n
-A: local_cpus=3f\n
-A: modalias=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30\n
-A: msi_bus=1\n
-A: msi_irqs/125=msi\n
-A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   15   20 2112 20\nxHCI ring segments   46   76 4096 76\nbuffer-2048         0   32 2048 16\nbuffer-512          0   32  512  4\nbuffer-128          3   32  128  1\nbuffer-32           0  128   32  1\n
-A: power/control=on\n
-A: power/runtime_active_time=767293736\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=enabled\n
-A: power/wakeup_abort_count=0\n
-A: power/wakeup_active=0\n
-A: power/wakeup_active_count=59\n
-A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=59\n
-A: power/wakeup_last_time_ms=763021754\n
-A: power/wakeup_max_time_ms=108\n
-A: power/wakeup_total_time_ms=6149\n
-A: power_state=D0\n
-A: resource=0x00000000b1320000 0x00000000b132ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x10\n
-A: subsystem_device=0x312a\n
-A: subsystem_vendor=0x17aa\n
-A: vendor=0x8086\n
-
--- a/tests/capture.py
+++ b/tests/capture.py
@ -17,14 +17,6 @@ c.enumerate()
 devices = c.get_devices()

 d = devices[0]
-assert d.has_feature(FPrint.DeviceFeature.CAPTURE)
-assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
-assert d.has_feature(FPrint.DeviceFeature.VERIFY)
-assert not d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
-assert not d.has_feature(FPrint.DeviceFeature.STORAGE)
-assert not d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
-assert not d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
-assert not d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
 del devices

 d.open_sync()
--- a/tests/create-driver-test.py.in
+++ b/tests/create-driver-test.py.in
@ -1,162 +0,0 @@
-#!/usr/bin/python3
-
-BUILDDIR='@BUILDDIR@'
-SRCDIR='@SRCDIR@'
-
-import os
-import sys
-import signal
-library_path = BUILDDIR + '/libfprint/'
-
-# Relaunch ourselves with a changed environment so
-# that we're loading the development version of libfprint
-if 'LD_LIBRARY_PATH' not in os.environ or not library_path in os.environ['LD_LIBRARY_PATH']:
-    os.environ['LD_LIBRARY_PATH'] = library_path
-    os.environ['GI_TYPELIB_PATH'] = f'{BUILDDIR}/libfprint/'
-    os.environ['FP_DEVICE_EMULATION'] = '1'
-    try:
-        os.execv(sys.argv[0], sys.argv)
-    except Exception as e:
-        print('Could not run script with new library path')
-        sys.exit(1)
-
-import gi
-gi.require_version('FPrint', '2.0')
-from gi.repository import FPrint
-
-gi.require_version('GUsb', '1.0')
-from gi.repository import GUsb
-
-import re
-import shutil
-import subprocess
-import tempfile
-import time
-
-def print_usage():
-    print(f'Usage: {sys.argv[0]} driver [test-variant-name]')
-    print('A test variant name is optional, and must be all lower case letters, or dashes, with no spaces')
-    print(f'The captured data will be stored in {SRCDIR}/tests/[driver name]-[test variant name]')
-
-if len(sys.argv) > 3:
-    print_usage()
-    sys.exit(1)
-
-driver_name = sys.argv[1]
-os.environ['FP_DRIVERS_WHITELIST'] = driver_name
-
-test_variant = None
-if len(sys.argv) == 3:
-    valid_re = re.compile('[a-z-]*')
-    test_variant = sys.argv[2]
-    if (not valid_re.match(test_variant) or
-        test_variant.startswith('-') or
-        test_variant.endswith('-')):
-        print(f'Invalid variant name {test_variant}\n')
-        print_usage()
-        sys.exit(1)
-
-# Check that running as root
-
-if os.geteuid() != 0:
-    print(f'{sys.argv[0]} is expected to be run as root')
-    sys.exit(1)
-
-# Check that tshark is available
-
-tshark = shutil.which('tshark')
-if not tshark:
-    print("The 'tshark' WireShark command-line tool must be installed to capture USB traffic")
-    sys.exit(1)
-
-# Find the fingerprint reader
-ctx = FPrint.Context()
-ctx.enumerate()
-devices = ctx.get_devices()
-if len(devices) == 0:
-    print('Could not find a supported fingerprint reader')
-    sys.exit(1)
-elif len(devices) > 1:
-    print('Capture requires a single supported fingerprint reader to be plugged in')
-    sys.exit(1)
-
-test_name = driver_name
-if test_variant:
-    test_name = driver_name + '-' + test_variant
-usb_device = devices[0].get_property('fpi-usb-device')
-bus_num = usb_device.get_bus()
-device_num = usb_device.get_address()
-
-print(f'### Detected USB device /dev/bus/usb/{bus_num:03d}/{device_num:03d}')
-
-# Make directory
-
-test_dir = SRCDIR + '/tests/' + test_name
-os.makedirs(test_dir, mode=0o775, exist_ok=True)
-
-# Capture device info
-
-args = ['umockdev-record', f'/dev/bus/usb/{bus_num:03d}/{device_num:03d}']
-device_out = open(test_dir + '/device', 'w')
-process = subprocess.Popen(args, stdout=device_out)
-process.wait()
-
-# Run capture
-# https://osqa-ask.wireshark.org/questions/53919/how-can-i-precisely-specify-a-usb-device-to-capture-with-tshark/
-
-print(f'### Starting USB capture on usbmon{bus_num}')
-capture_pid = os.fork()
-assert(capture_pid >= 0)
-
-unfiltered_cap_path = os.path.join(tempfile.gettempdir(), 'capture-unfiltered.pcapng')
-if capture_pid == 0:
-    os.setpgrp()
-    args = ['tshark', '-q', '-i', f'usbmon{bus_num}', '-w', unfiltered_cap_path]
-    os.execv(tshark, args)
-
-# Wait 1 sec to settle (we can assume setpgrp happened)
-time.sleep(1)
-
-print('### Capturing fingerprint, please swipe or press your finger on the reader')
-with subprocess.Popen(['python3', SRCDIR + '/tests/capture.py', test_dir + '/capture.png']) as capture_process:
-    capture_process.wait()
-    if capture_process.returncode != 0:
-        print('Failed to capture fingerprint')
-        os.killpg(capture_pid, signal.SIGKILL)
-        sys.exit(1)
-
-def t_waitpid(pid, timeout):
-    timeout = time.time() + timeout
-    r = os.waitpid(pid, os.WNOHANG)
-    while timeout > time.time() and r[0] == 0:
-        time.sleep(0.1)
-        r = os.waitpid(pid, os.WNOHANG)
-
-    return r
-
-os.kill(capture_pid, signal.SIGTERM)
-try:
-    r = t_waitpid(capture_pid, 2)
-    # Kill if nothing died
-    if r[0] == 0:
-        os.kill(capture_pid, signal.SIGKILL)
-except ChildProcessError:
-    pass
-
-try:
-    while True:
-        r = t_waitpid(-capture_pid, timeout=2)
-        # Kill the process group, if nothing died (and there are children)
-        if r[0] == 0:
-            os.killpg(capture_pid, signal.SIGKILL)
-except ChildProcessError:
-    pass
-
-# Filter the capture
-print(f'\n### Saving USB capture as test case {test_name}')
-args = ['tshark', '-r', unfiltered_cap_path, '-Y', f'usb.bus_id == {bus_num} and usb.device_address == {device_num}',
-        '-w', test_dir + '/capture.pcapng']
-with subprocess.Popen(args, stderr=subprocess.DEVNULL) as filter_process:
-    filter_process.wait()
-
-print(f"\nDone! Don't forget to add {test_name} to tests/meson.build")
--- a/tests/egis0570/capture.pcapng
+++ b/tests/egis0570/capture.pcapng
--- a/tests/egis0570/capture.png
+++ b/tests/egis0570/capture.png
--- a/tests/egis0570/device
+++ b/tests/egis0570/device
@ -1,228 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-9
-N: bus/usb/001/005=12011001000000087A1C700541100102030109022000010100A0320904000002FF0000000705830240000007050402400003
-E: DEVNAME=/dev/bus/usb/001/005
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1c7a/570/1041
-E: TYPE=0/0/0
-E: BUSNUM=001
-E: DEVNUM=005
-E: MAJOR=189
-E: MINOR=4
-E: SUBSYSTEM=usb
-E: ID_VENDOR=EgisTec
-E: ID_VENDOR_ENC=EgisTec
-E: ID_VENDOR_ID=1c7a
-E: ID_MODEL=EgisTec_Touch_Fingerprint_Sensor
-E: ID_MODEL_ENC=EgisTec\x20Touch\x20Fingerprint\x20Sensor
-E: ID_MODEL_ID=0570
-E: ID_REVISION=1041
-E: ID_SERIAL=EgisTec_EgisTec_Touch_Fingerprint_Sensor_W700B41B
-E: ID_SERIAL_SHORT=W700B41B
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ff0000:
-E: ID_VENDOR_FROM_DATABASE=LighTuning Technology Inc.
-E: ID_PATH=pci-0000:00:14.0-usb-0:9
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_9
-E: LIBFPRINT_DRIVER=Hardcoded whitelist
-A: authorized=1
-A: avoid_reset_quirk=0
-A: bConfigurationValue=1
-A: bDeviceClass=00
-A: bDeviceProtocol=00
-A: bDeviceSubClass=00
-A: bMaxPacketSize0=8
-A: bMaxPower=100mA
-A: bNumConfigurations=1
-A: bNumInterfaces= 1
-A: bcdDevice=1041
-A: bmAttributes=a0
-A: busnum=1
-A: configuration=
-H: descriptors=12011001000000087A1C700541100102030109022000010100A0320904000002FF0000000705830240000007050402400003
-A: dev=189:4
-A: devnum=5
-A: devpath=9
-L: driver=../../../../../bus/usb/drivers/usb
-A: idProduct=0570
-A: idVendor=1c7a
-A: ltm_capable=no
-A: manufacturer=EgisTec
-A: maxchild=0
-L: port=../1-0:1.0/usb1-port9
-A: power/active_duration=362352
-A: power/async=enabled
-A: power/autosuspend=2
-A: power/autosuspend_delay_ms=2000
-A: power/connected_duration=5526124
-A: power/control=auto
-A: power/level=auto
-A: power/persist=1
-A: power/runtime_active_kids=0
-A: power/runtime_active_time=365097
-A: power/runtime_enabled=enabled
-A: power/runtime_status=active
-A: power/runtime_suspended_time=5160752
-A: power/runtime_usage=0
-A: power/wakeup=disabled
-A: power/wakeup_abort_count=
-A: power/wakeup_active=
-A: power/wakeup_active_count=
-A: power/wakeup_count=
-A: power/wakeup_expire_count=
-A: power/wakeup_last_time_ms=
-A: power/wakeup_max_time_ms=
-A: power/wakeup_total_time_ms=
-A: product=EgisTec Touch Fingerprint Sensor
-A: quirks=0x0
-A: removable=fixed
-A: rx_lanes=1
-A: serial=W700B41B
-A: speed=12
-A: tx_lanes=1
-A: urbnum=8040
-A: version= 1.10
-
-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020008050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1d6b/2/508
-E: TYPE=9/0/1
-E: BUSNUM=001
-E: DEVNUM=001
-E: MAJOR=189
-E: MINOR=0
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.8.0-59-generic_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.8.0-59-generic\x20xhci-hcd
-E: ID_VENDOR_ID=1d6b
-E: ID_MODEL=xHCI_Host_Controller
-E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
-E: ID_MODEL_ID=0002
-E: ID_REVISION=0508
-E: ID_SERIAL=Linux_5.8.0-59-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
-E: ID_SERIAL_SHORT=0000:00:14.0
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:090000:
-E: ID_VENDOR_FROM_DATABASE=Linux Foundation
-E: ID_MODEL_FROM_DATABASE=2.0 root hub
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0
-E: TAGS=:seat:
-A: authorized=1
-A: authorized_default=1
-A: avoid_reset_quirk=0
-A: bConfigurationValue=1
-A: bDeviceClass=09
-A: bDeviceProtocol=01
-A: bDeviceSubClass=00
-A: bMaxPacketSize0=64
-A: bMaxPower=0mA
-A: bNumConfigurations=1
-A: bNumInterfaces= 1
-A: bcdDevice=0508
-A: bmAttributes=e0
-A: busnum=1
-A: configuration=
-H: descriptors=12010002090001406B1D020008050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0
-A: devnum=1
-A: devpath=0
-L: driver=../../../../bus/usb/drivers/usb
-A: idProduct=0002
-A: idVendor=1d6b
-A: interface_authorized_default=1
-A: ltm_capable=no
-A: manufacturer=Linux 5.8.0-59-generic xhci-hcd
-A: maxchild=12
-A: power/active_duration=378024
-A: power/async=enabled
-A: power/autosuspend=0
-A: power/autosuspend_delay_ms=0
-A: power/connected_duration=5527220
-A: power/control=auto
-A: power/level=auto
-A: power/runtime_active_kids=1
-A: power/runtime_active_time=377962
-A: power/runtime_enabled=enabled
-A: power/runtime_status=active
-A: power/runtime_suspended_time=5149253
-A: power/runtime_usage=0
-A: power/wakeup=disabled
-A: power/wakeup_abort_count=
-A: power/wakeup_active=
-A: power/wakeup_active_count=
-A: power/wakeup_count=
-A: power/wakeup_expire_count=
-A: power/wakeup_last_time_ms=
-A: power/wakeup_max_time_ms=
-A: power/wakeup_total_time_ms=
-A: product=xHCI Host Controller
-A: quirks=0x0
-A: removable=unknown
-A: rx_lanes=1
-A: serial=0000:00:14.0
-A: speed=480
-A: tx_lanes=1
-A: urbnum=956
-A: version= 2.00
-
-P: /devices/pci0000:00/0000:00:14.0
-E: DRIVER=xhci_hcd
-E: PCI_CLASS=C0330
-E: PCI_ID=8086:9D2F
-E: PCI_SUBSYS_ID=1025:118E
-E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d00009D2Fsv00001025sd0000118Ebc0Csc03i30
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
-E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Sunrise Point-LP USB 3.0 xHCI Controller
-A: ari_enabled=0
-A: broken_parity_status=0
-A: class=0x0c0330
-H: config=86802F9D060490022130030C00008000040021A400000000000000000000000000000000000000000000000025108E11000000007000000000000000FF010000
-A: consistent_dma_mask_bits=64
-A: d3cold_allowed=1
-A: dbc=disabled
-A: device=0x9d2f
-A: dma_mask_bits=64
-L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)
-A: enable=1
-A: irq=127
-A: local_cpulist=0-7
-A: local_cpus=ff
-A: modalias=pci:v00008086d00009D2Fsv00001025sd0000118Ebc0Csc03i30
-A: msi_bus=1
-A: msi_irqs/127=msi
-A: numa_node=-1
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts    9   10 2112 10\nxHCI ring segments   32   36 4096 36\nbuffer-2048         1    2 2048  1\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0
-A: power/async=enabled
-A: power/control=on
-A: power/runtime_active_kids=1
-A: power/runtime_active_time=5524703
-A: power/runtime_enabled=forbidden
-A: power/runtime_status=active
-A: power/runtime_suspended_time=3373
-A: power/runtime_usage=1
-A: power/wakeup=enabled
-A: power/wakeup_abort_count=0
-A: power/wakeup_active=0
-A: power/wakeup_active_count=0
-A: power/wakeup_count=0
-A: power/wakeup_expire_count=0
-A: power/wakeup_last_time_ms=0
-A: power/wakeup_max_time_ms=0
-A: power/wakeup_total_time_ms=0
-A: resource=0x00000000a4210000 0x00000000a421ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000
-A: revision=0x21
-A: subsystem_device=0x118e
-A: subsystem_vendor=0x1025
-A: vendor=0x8086
-
--- a/tests/elan-cobo/capture.pcapng
+++ b/tests/elan-cobo/capture.pcapng
--- a/tests/elan-cobo/capture.png
+++ b/tests/elan-cobo/capture.png
--- a/tests/elan-cobo/device
+++ b/tests/elan-cobo/device
@ -1,217 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-10
-N: bus/usb/001/045=1201000200000008F304260C40010102000109023E0001010080320904000005FF0000000921100100012215000705810240000107050102400001070582024000010705830240000107050302400001
-E: DEVNAME=/dev/bus/usb/001/045
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=4f3/c26/140
-E: TYPE=0/0/0
-E: BUSNUM=001
-E: DEVNUM=045
-E: MAJOR=189
-E: MINOR=44
-E: SUBSYSTEM=usb
-E: ID_VENDOR=ELAN
-E: ID_VENDOR_ENC=ELAN
-E: ID_VENDOR_ID=04f3
-E: ID_MODEL=ELAN:Fingerprint
-E: ID_MODEL_ENC=ELAN:Fingerprint
-E: ID_MODEL_ID=0c26
-E: ID_REVISION=0140
-E: ID_SERIAL=ELAN_ELAN:Fingerprint
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ff0000:
-E: ID_VENDOR_FROM_DATABASE=Elan Microelectronics Corp.
-E: ID_AUTOSUSPEND=1
-E: ID_PATH=pci-0000:00:14.0-usb-0:10
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_10
-E: LIBFPRINT_DRIVER=ElanTech Fingerprint Sensor
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_10
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=00\n
-A: bDeviceProtocol=00\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=8\n
-A: bMaxPower=100mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0140\n
-A: bmAttributes=80\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=1201000200000008F304260C40010102000109023E0001010080320904000005FF0000000921100100012215000705810240000107050102400001070582024000010705830240000107050302400001
-A: dev=189:44\n
-A: devnum=45\n
-A: devpath=10\n
-L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d/device:57
-A: idProduct=0c26\n
-A: idVendor=04f3\n
-A: ltm_capable=no\n
-A: manufacturer=ELAN\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port10
-A: power/active_duration=21526\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=96442\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=0\n
-A: power/runtime_active_time=21572\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=74628\n
-A: product=ELAN:Fingerprint\n
-A: quirks=0x0\n
-A: removable=removable\n
-A: rx_lanes=1\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=103\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1d6b/2/513
-E: TYPE=9/0/1
-E: BUSNUM=001
-E: DEVNUM=001
-E: MAJOR=189
-E: MINOR=0
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.13.12-200.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.13.12-200.fc34.x86_64\x20xhci-hcd
-E: ID_VENDOR_ID=1d6b
-E: ID_MODEL=xHCI_Host_Controller
-E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
-E: ID_MODEL_ID=0002
-E: ID_REVISION=0513
-E: ID_SERIAL=Linux_5.13.12-200.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
-E: ID_SERIAL_SHORT=0000:00:14.0
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:090000:
-E: ID_VENDOR_FROM_DATABASE=Linux Foundation
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=2.0 root hub
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: authorized_default=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=09\n
-A: bDeviceProtocol=01\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=0mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0513\n
-A: bmAttributes=e0\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0\n
-A: devnum=1\n
-A: devpath=0\n
-L: driver=../../../../bus/usb/drivers/usb
-L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d
-A: idProduct=0002\n
-A: idVendor=1d6b\n
-A: interface_authorized_default=1\n
-A: ltm_capable=no\n
-A: manufacturer=Linux 5.13.12-200.fc34.x86_64 xhci-hcd\n
-A: maxchild=16\n
-A: power/active_duration=767973436\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=767973436\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=767973433\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: product=xHCI Host Controller\n
-A: quirks=0x0\n
-A: removable=unknown\n
-A: rx_lanes=1\n
-A: serial=0000:00:14.0\n
-A: speed=480\n
-A: tx_lanes=1\n
-A: urbnum=1174\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0
-E: DRIVER=xhci_hcd
-E: PCI_CLASS=C0330
-E: PCI_ID=8086:A36D
-E: PCI_SUBSYS_ID=17AA:312A
-E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
-E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Cannon Lake PCH USB 3.1 xHCI Host Controller
-A: ari_enabled=0\n
-A: broken_parity_status=0\n
-A: class=0x0c0330\n
-H: config=86806DA3060490021030030C00008000040032B1000000000000000000000000000000000000000000000000AA172A31000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000420DD90700000000316000000000000000000000000000000180C2C1080000000000000000000000059087009802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F400200000100006000000008020000010000000400000090000000001800000005000000000000000300000C0000004000000080000000030000000000000000000000000000000000000000000000B50F110112000000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: dbc=disabled\n
-A: device=0xa36d\n
-A: dma_mask_bits=64\n
-L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)\n
-A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c
-A: index=3\n
-A: irq=125\n
-A: label=Onboard - Other\n
-A: local_cpulist=0-5\n
-A: local_cpus=3f\n
-A: modalias=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30\n
-A: msi_bus=1\n
-A: msi_irqs/125=msi\n
-A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   15   20 2112 20\nxHCI ring segments   52   76 4096 76\nbuffer-2048         0   32 2048 16\nbuffer-512          0   32  512  4\nbuffer-128          3   32  128  1\nbuffer-32           0  128   32  1\n
-A: power/control=on\n
-A: power/runtime_active_time=767973582\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=enabled\n
-A: power/wakeup_abort_count=0\n
-A: power/wakeup_active=0\n
-A: power/wakeup_active_count=59\n
-A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=59\n
-A: power/wakeup_last_time_ms=763021754\n
-A: power/wakeup_max_time_ms=108\n
-A: power/wakeup_total_time_ms=6149\n
-A: power_state=D0\n
-A: resource=0x00000000b1320000 0x00000000b132ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x10\n
-A: subsystem_device=0x312a\n
-A: subsystem_vendor=0x17aa\n
-A: vendor=0x8086\n
-
--- a/tests/elanmoc/custom.pcapng
+++ b/tests/elanmoc/custom.pcapng
--- a/tests/elanmoc/custom.py
+++ b/tests/elanmoc/custom.py
@ -1,83 +0,0 @@
-#!/usr/bin/python3
-
-import gi
-gi.require_version('FPrint', '2.0')
-from gi.repository import FPrint, GLib
-
-ctx = GLib.main_context_default()
-
-c = FPrint.Context()
-c.enumerate()
-devices = c.get_devices()
-
-d = devices[0]
-del devices
-
-assert d.get_driver() == "elanmoc"
-assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
-assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
-assert d.has_feature(FPrint.DeviceFeature.VERIFY)
-assert not d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
-assert d.has_feature(FPrint.DeviceFeature.STORAGE)
-assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
-assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
-assert not d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
-
-d.open_sync()
-
-template = FPrint.Print.new(d)
-
-def enroll_progress(*args):
-    #assert d.get_finger_status() == FPrint.FingerStatusFlags.NEEDED
-    print("finger status: ", d.get_finger_status())
-    print('enroll progress: ' + str(args))
-
-def identify_done(dev, res):
-    global identified
-    identified = True
-    identify_match, identify_print = dev.identify_finish(res)
-    print('indentification_done: ', identify_match, identify_print)
-    assert identify_match.equal(identify_print)
-
-# List, enroll, list, verify, identify, delete
-print("enrolling")
-assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
-p = d.enroll_sync(template, None, enroll_progress, None)
-assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
-print("enroll done")
-
-print("listing")
-stored = d.list_prints_sync()
-print("listing done")
-assert len(stored) == 1
-assert stored[0].equal(p)
-print("verifying")
-assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
-verify_res, verify_print = d.verify_sync(p)
-assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
-print("verify done")
-del p
-assert verify_res == True
-
-identified = False
-deserialized_prints = []
-for p in stored:
-    deserialized_prints.append(FPrint.Print.deserialize(p.serialize()))
-    assert deserialized_prints[-1].equal(p)
-del stored
-
-print('async identifying')
-d.identify(deserialized_prints, callback=identify_done)
-del deserialized_prints
-
-while not identified:
-    ctx.iteration(True)
-
-print("deleting")
-d.delete_print_sync(p)
-print("delete done")
-
-d.close_sync()
-
-del d
-del c
--- a/tests/elanmoc/device
+++ b/tests/elanmoc/device
@ -1,225 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-1
-N: bus/usb/001/010=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-E: DEVNAME=/dev/bus/usb/001/010
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=4f3/c7e/305
-E: TYPE=0/0/0
-E: BUSNUM=001
-E: DEVNUM=010
-E: MAJOR=189
-E: MINOR=9
-E: SUBSYSTEM=usb
-E: ID_VENDOR=ELAN
-E: ID_VENDOR_ENC=ELAN
-E: ID_VENDOR_ID=04f3
-E: ID_MODEL=ELAN:ARM-M4
-E: ID_MODEL_ENC=ELAN:ARM-M4
-E: ID_MODEL_ID=0c7e
-E: ID_REVISION=0305
-E: ID_SERIAL=ELAN_ELAN:ARM-M4
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ff0000:
-E: ID_VENDOR_FROM_DATABASE=Elan Microelectronics Corp.
-E: ID_PATH=pci-0000:00:14.0-usb-0:1
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_1
-A: authorized=1
-A: avoid_reset_quirk=0
-A: bConfigurationValue=1
-A: bDeviceClass=00
-A: bDeviceProtocol=00
-A: bDeviceSubClass=00
-A: bMaxPacketSize0=64
-A: bMaxPower=100mA
-A: bNumConfigurations=1
-A: bNumInterfaces= 1
-A: bcdDevice=0305
-A: bmAttributes=a0
-A: busnum=1
-A: configuration=add909c9-e67e-4126-a6f7-1e31179e27d9
-H: descriptors=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-A: dev=189:9
-A: devnum=10
-A: devpath=1
-L: driver=../../../../../bus/usb/drivers/usb
-A: idProduct=0c7e
-A: idVendor=04f3
-A: ltm_capable=no
-A: manufacturer=ELAN
-A: maxchild=0
-L: port=../1-0:1.0/usb1-port1
-A: power/active_duration=94712
-A: power/async=enabled
-A: power/autosuspend=2
-A: power/autosuspend_delay_ms=2000
-A: power/connected_duration=94712
-A: power/control=on
-A: power/level=on
-A: power/persist=1
-A: power/runtime_active_kids=0
-A: power/runtime_active_time=94436
-A: power/runtime_enabled=forbidden
-A: power/runtime_status=active
-A: power/runtime_suspended_time=0
-A: power/runtime_usage=1
-A: power/wakeup=disabled
-A: power/wakeup_abort_count=
-A: power/wakeup_active=
-A: power/wakeup_active_count=
-A: power/wakeup_count=
-A: power/wakeup_expire_count=
-A: power/wakeup_last_time_ms=
-A: power/wakeup_max_time_ms=
-A: power/wakeup_total_time_ms=
-A: product=ELAN:ARM-M4
-A: quirks=0x0
-A: removable=removable
-A: rx_lanes=1
-A: speed=12
-A: tx_lanes=1
-A: urbnum=12
-A: version= 2.00
-
-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1d6b/2/504
-E: TYPE=9/0/1
-E: BUSNUM=001
-E: DEVNUM=001
-E: MAJOR=189
-E: MINOR=0
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.4.0-42-generic_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.4.0-42-generic\x20xhci-hcd
-E: ID_VENDOR_ID=1d6b
-E: ID_MODEL=xHCI_Host_Controller
-E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
-E: ID_MODEL_ID=0002
-E: ID_REVISION=0504
-E: ID_SERIAL=Linux_5.4.0-42-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
-E: ID_SERIAL_SHORT=0000:00:14.0
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:090000:
-E: ID_VENDOR_FROM_DATABASE=Linux Foundation
-E: ID_MODEL_FROM_DATABASE=2.0 root hub
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0
-E: TAGS=:seat:
-A: authorized=1
-A: authorized_default=1
-A: avoid_reset_quirk=0
-A: bConfigurationValue=1
-A: bDeviceClass=09
-A: bDeviceProtocol=01
-A: bDeviceSubClass=00
-A: bMaxPacketSize0=64
-A: bMaxPower=0mA
-A: bNumConfigurations=1
-A: bNumInterfaces= 1
-A: bcdDevice=0504
-A: bmAttributes=e0
-A: busnum=1
-A: configuration=
-H: descriptors=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0
-A: devnum=1
-A: devpath=0
-L: driver=../../../../bus/usb/drivers/usb
-A: idProduct=0002
-A: idVendor=1d6b
-A: interface_authorized_default=1
-A: ltm_capable=no
-A: manufacturer=Linux 5.4.0-42-generic xhci-hcd
-A: maxchild=12
-A: power/active_duration=74604360
-A: power/async=enabled
-A: power/autosuspend=0
-A: power/autosuspend_delay_ms=0
-A: power/connected_duration=74606456
-A: power/control=auto
-A: power/level=auto
-A: power/runtime_active_kids=4
-A: power/runtime_active_time=74605838
-A: power/runtime_enabled=enabled
-A: power/runtime_status=active
-A: power/runtime_suspended_time=0
-A: power/runtime_usage=0
-A: power/wakeup=disabled
-A: power/wakeup_abort_count=
-A: power/wakeup_active=
-A: power/wakeup_active_count=
-A: power/wakeup_count=
-A: power/wakeup_expire_count=
-A: power/wakeup_last_time_ms=
-A: power/wakeup_max_time_ms=
-A: power/wakeup_total_time_ms=
-A: product=xHCI Host Controller
-A: quirks=0x0
-A: removable=unknown
-A: rx_lanes=1
-A: serial=0000:00:14.0
-A: speed=480
-A: tx_lanes=1
-A: urbnum=490
-A: version= 2.00
-
-P: /devices/pci0000:00/0000:00:14.0
-E: DRIVER=xhci_hcd
-E: PCI_CLASS=C0330
-E: PCI_ID=8086:9DED
-E: PCI_SUBSYS_ID=103C:85EF
-E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
-E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Cannon Point-LP USB 3.1 xHCI Controller
-A: ari_enabled=0
-A: broken_parity_status=0
-A: class=0x0c0330
-H: config=8680ED9D060490023030030C00008000040030A10000000000000000000000000000000000000000000000003C10EF85000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000181C030400000000316000000000000000000000000000000180C2C1080000000000000000000000059087007802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000B50F300112000000
-A: consistent_dma_mask_bits=64
-A: d3cold_allowed=1
-A: dbc=disabled
-A: device=0x9ded
-A: dma_mask_bits=64
-L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)
-A: enable=1
-A: irq=124
-A: local_cpulist=0-3
-A: local_cpus=f
-A: modalias=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30
-A: msi_bus=1
-A: msi_irqs/124=msi
-A: numa_node=-1
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0   32  128  1\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   11   12 2112 12\nxHCI ring segments   54   54 4096 54\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          9   32  128  1\nbuffer-32           0    0   32  0
-A: power/async=enabled
-A: power/control=auto
-A: power/runtime_active_kids=1
-A: power/runtime_active_time=74606194
-A: power/runtime_enabled=enabled
-A: power/runtime_status=active
-A: power/runtime_suspended_time=0
-A: power/runtime_usage=0
-A: power/wakeup=enabled
-A: power/wakeup_abort_count=0
-A: power/wakeup_active=0
-A: power/wakeup_active_count=0
-A: power/wakeup_count=0
-A: power/wakeup_expire_count=0
-A: power/wakeup_last_time_ms=0
-A: power/wakeup_max_time_ms=0
-A: power/wakeup_total_time_ms=0
-A: resource=0x00000000a1300000 0x00000000a130ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000
-A: revision=0x30
-A: subsystem_device=0x85ef
-A: subsystem_vendor=0x103c
-A: vendor=0x8086
-
--- a/tests/elanspi/capture.ioctl
+++ b/tests/elanspi/capture.ioctl
--- a/tests/elanspi/capture.png
+++ b/tests/elanspi/capture.png
--- a/tests/elanspi/device-hidraw
+++ b/tests/elanspi/device-hidraw
@ -1,136 +0,0 @@
-P: /devices/pci0000:00/0000:00:15.1/i2c_designware.1/i2c-1/i2c-ELAN1300:00/0018:04F3:3057.0001/hidraw/hidraw0
-N: hidraw0
-E: DEVNAME=/dev/hidraw0
-E: MAJOR=241
-E: MINOR=0
-E: SUBSYSTEM=hidraw
-A: dev=241:0\n
-L: device=../../../0018:04F3:3057.0001
-A: power/async=disabled\n
-A: power/control=auto\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=0\n
-A: power/runtime_enabled=disabled\n
-A: power/runtime_status=unsupported\n
-A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=0\n
-
-P: /devices/pci0000:00/0000:00:15.1/i2c_designware.1/i2c-1/i2c-ELAN1300:00/0018:04F3:3057.0001
-E: DRIVER=hid-multitouch
-E: HID_ID=0018:000004F3:00003057
-E: HID_NAME=ELAN1300:00 04F3:3057
-E: HID_PHYS=i2c-ELAN1300:00
-E: HID_UNIQ=
-E: MODALIAS=hid:b0018g0004v000004F3p00003057
-E: SUBSYSTEM=hid
-A: country=00\n
-L: driver=../../../../../../../bus/hid/drivers/hid-multitouch
-A: modalias=hid:b0018g0004v000004F3p00003057\n
-A: power/async=enabled\n
-A: power/control=auto\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=0\n
-A: power/runtime_enabled=disabled\n
-A: power/runtime_status=unsupported\n
-A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=0\n
-A: quirks=334864\n
-H: report_descriptor=05010902A10185010901A100050919012902150025017501950281029506810305010930093109381581257F750895038106050C0A380295018106750895038103C0C0050D0905A10185040922A102150025010947094295027501810275019502810395017504250F095181020501150026880C7510550E6513093035004691019501810246140126A20826A20809318102050D150025649503C0550C66011047FFFF000027FFFF000075109501095681020954257F9501750881020509090125017501950181029507810309C5750895048103050D85020955095975049502250FB102850709607501950115002501B102950FB1030600FF0600FF850609C5150026FF007508960001B102850D09C4150026FF0075089504B102850C09C696E0027508B102850B09C795427508B102C0050D090EA10185030922A10009521500250A75089502B102C00922A1008505095709581500750195022503B102950EB103C0C00600FF0901A101850E09C5150026FF0026FF0075089504B102C0
-
-P: /devices/pci0000:00/0000:00:15.1/i2c_designware.1/i2c-1/i2c-ELAN1300:00
-E: DRIVER=i2c_hid
-E: MODALIAS=acpi:ELAN1300:PNP0C50:
-E: SUBSYSTEM=i2c
-E: ID_VENDOR_FROM_DATABASE=ELAD srl
-L: driver=../../../../../../bus/i2c/drivers/i2c_hid
-L: firmware_node=../../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:72/ELAN1300:00
-A: modalias=acpi:ELAN1300:PNP0C50:\n
-A: name=ELAN1300:00\n
-A: power/async=enabled\n
-A: power/control=auto\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=0\n
-A: power/runtime_enabled=disabled\n
-A: power/runtime_status=unsupported\n
-A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=0\n
-
-P: /devices/pci0000:00/0000:00:15.1/i2c_designware.1/i2c-1
-E: SUBSYSTEM=i2c
-L: device=../../i2c_designware.1
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:72
-A: name=Synopsys DesignWare I2C adapter\n
-A: power/async=disabled\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_enabled=enabled\n
-A: power/runtime_status=suspended\n
-A: power/runtime_usage=0\n
-L: software_node=../../../../../kernel/software_nodes/node1
-
-P: /devices/pci0000:00/0000:00:15.1/i2c_designware.1
-E: DEVTYPE=mfd_device
-E: DRIVER=i2c_designware
-E: MODALIAS=platform:i2c_designware
-E: SUBSYSTEM=platform
-E: ID_PATH=pci-0000:00:15.1-platform-i2c_designware.1
-E: ID_PATH_TAG=pci-0000_00_15_1-platform-i2c_designware_1
-L: driver=../../../../bus/platform/drivers/i2c_designware
-A: driver_override=(null)\n
-L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:72
-A: modalias=platform:i2c_designware\n
-A: power/async=disabled\n
-A: power/autosuspend_delay_ms=1000\n
-A: power/control=auto\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=1507234\n
-A: power/runtime_enabled=enabled\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=12722220\n
-A: power/runtime_usage=0\n
-L: software_node=../../../../kernel/software_nodes/node1
-
-P: /devices/pci0000:00/0000:00:15.1
-E: DRIVER=intel-lpss
-E: PCI_CLASS=118000
-E: PCI_ID=8086:9D61
-E: PCI_SUBSYS_ID=1043:1D30
-E: PCI_SLOT_NAME=0000:00:15.1
-E: MODALIAS=pci:v00008086d00009D61sv00001043sd00001D30bc11sc80i00
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Signal processing controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=Signal processing controller
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Sunrise Point-LP Serial IO I2C Controller
-A: ari_enabled=0\n
-A: broken_parity_status=0\n
-A: class=0x118000\n
-H: config=8680619D060010002100801110008000048013EF0000000000000000000000000000000000000000000000004310301D000000008000000000000000FF020000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: device=0x9d61\n
-A: dma_mask_bits=32\n
-L: driver=../../../bus/pci/drivers/intel-lpss
-A: driver_override=(null)\n
-A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:72
-A: irq=17\n
-A: local_cpulist=0-7\n
-A: local_cpus=ff\n
-A: modalias=pci:v00008086d00009D61sv00001043sd00001D30bc11sc80i00\n
-A: msi_bus=1\n
-A: numa_node=-1\n
-A: power/async=enabled\n
-A: power/control=on\n
-A: power/pm_qos_latency_tolerance_us=auto\n
-A: power/runtime_active_kids=1\n
-A: power/runtime_active_time=9614317\n
-A: power/runtime_enabled=forbidden\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=4616038\n
-A: power/runtime_usage=1\n
-A: resource=0x00000000ef138000 0x00000000ef138fff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x21\n
-A: subsystem_device=0x1d30\n
-A: subsystem_vendor=0x1043\n
-A: vendor=0x8086\n
-
--- a/tests/elanspi/device-spi
+++ b/tests/elanspi/device-spi
@ -1,170 +0,0 @@
-P: /devices/pci0000:00/0000:00:1e.2/pxa2xx-spi.3/spi_master/spi0/spi-ELAN7001:00/spidev/spidev0.0
-N: spidev0.0
-E: DEVNAME=/dev/spidev0.0
-E: MAJOR=153
-E: MINOR=0
-E: SUBSYSTEM=spidev
-A: dev=153:0\n
-L: device=../../../spi-ELAN7001:00
-A: power/async=disabled\n
-A: power/control=auto\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=0\n
-A: power/runtime_enabled=disabled\n
-A: power/runtime_status=unsupported\n
-A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=0\n
-
-P: /devices/pci0000:00/0000:00:1e.2/pxa2xx-spi.3/spi_master/spi0/spi-ELAN7001:00
-E: DRIVER=spidev
-E: MODALIAS=acpi:ELAN7001:
-E: SUBSYSTEM=spi
-E: ID_VENDOR_FROM_DATABASE=ELAD srl
-L: driver=../../../../../../../bus/spi/drivers/spidev
-A: driver_override=spidev\n
-L: firmware_node=../../../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:73/ELAN7001:00
-A: modalias=acpi:ELAN7001:\n
-A: power/async=disabled\n
-A: power/control=auto\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=0\n
-A: power/runtime_enabled=disabled\n
-A: power/runtime_status=unsupported\n
-A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=0\n
-A: statistics/bytes=23208391
-A: statistics/bytes_rx=22185696
-A: statistics/bytes_tx=1191980
-A: statistics/errors=0
-A: statistics/messages=519673
-A: statistics/spi_async=0
-A: statistics/spi_sync=519673
-A: statistics/spi_sync_immediate=519673
-A: statistics/timedout=0
-A: statistics/transfer_bytes_histo_0-1=398920
-A: statistics/transfer_bytes_histo_1024-2047=0
-A: statistics/transfer_bytes_histo_128-255=113366
-A: statistics/transfer_bytes_histo_16-31=0
-A: statistics/transfer_bytes_histo_16384-32767=0
-A: statistics/transfer_bytes_histo_2-3=517580
-A: statistics/transfer_bytes_histo_2048-4095=0
-A: statistics/transfer_bytes_histo_256-511=0
-A: statistics/transfer_bytes_histo_32-63=0
-A: statistics/transfer_bytes_histo_32768-65535=0
-A: statistics/transfer_bytes_histo_4-7=0
-A: statistics/transfer_bytes_histo_4096-8191=0
-A: statistics/transfer_bytes_histo_512-1023=0
-A: statistics/transfer_bytes_histo_64-127=0
-A: statistics/transfer_bytes_histo_65536+=0
-A: statistics/transfer_bytes_histo_8-15=0
-A: statistics/transfer_bytes_histo_8192-16383=0
-A: statistics/transfers=1029866
-A: statistics/transfers_split_maxsize=0
-
-P: /devices/pci0000:00/0000:00:1e.2/pxa2xx-spi.3/spi_master/spi0
-E: SUBSYSTEM=spi_master
-L: device=../../../pxa2xx-spi.3
-A: power/async=disabled\n
-A: power/control=auto\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=0\n
-A: power/runtime_enabled=disabled\n
-A: power/runtime_status=unsupported\n
-A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=0\n
-A: statistics/bytes=23208391
-A: statistics/bytes_rx=22185696
-A: statistics/bytes_tx=1191980
-A: statistics/errors=0
-A: statistics/messages=519673
-A: statistics/spi_async=0
-A: statistics/spi_sync=519673
-A: statistics/spi_sync_immediate=519673
-A: statistics/timedout=0
-A: statistics/transfer_bytes_histo_0-1=398920
-A: statistics/transfer_bytes_histo_1024-2047=0
-A: statistics/transfer_bytes_histo_128-255=113366
-A: statistics/transfer_bytes_histo_16-31=0
-A: statistics/transfer_bytes_histo_16384-32767=0
-A: statistics/transfer_bytes_histo_2-3=517580
-A: statistics/transfer_bytes_histo_2048-4095=0
-A: statistics/transfer_bytes_histo_256-511=0
-A: statistics/transfer_bytes_histo_32-63=0
-A: statistics/transfer_bytes_histo_32768-65535=0
-A: statistics/transfer_bytes_histo_4-7=0
-A: statistics/transfer_bytes_histo_4096-8191=0
-A: statistics/transfer_bytes_histo_512-1023=0
-A: statistics/transfer_bytes_histo_64-127=0
-A: statistics/transfer_bytes_histo_65536+=0
-A: statistics/transfer_bytes_histo_8-15=0
-A: statistics/transfer_bytes_histo_8192-16383=0
-A: statistics/transfers=1029866
-A: statistics/transfers_split_maxsize=0
-
-P: /devices/pci0000:00/0000:00:1e.2/pxa2xx-spi.3
-E: DEVTYPE=mfd_device
-E: DRIVER=pxa2xx-spi
-E: MODALIAS=platform:pxa2xx-spi
-E: SUBSYSTEM=platform
-E: ID_PATH=pci-0000:00:1e.2-platform-pxa2xx-spi.3
-E: ID_PATH_TAG=pci-0000_00_1e_2-platform-pxa2xx-spi_3
-L: driver=../../../../bus/platform/drivers/pxa2xx-spi
-A: driver_override=(null)\n
-L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:73
-A: modalias=platform:pxa2xx-spi\n
-A: power/async=disabled\n
-A: power/autosuspend_delay_ms=50\n
-A: power/control=auto\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=65446\n
-A: power/runtime_enabled=enabled\n
-A: power/runtime_status=suspended\n
-A: power/runtime_suspended_time=14155204\n
-A: power/runtime_usage=0\n
-
-P: /devices/pci0000:00/0000:00:1e.2
-E: DRIVER=intel-lpss
-E: PCI_CLASS=118000
-E: PCI_ID=8086:9D29
-E: PCI_SUBSYS_ID=1043:1D2D
-E: PCI_SLOT_NAME=0000:00:1e.2
-E: MODALIAS=pci:v00008086d00009D29sv00001043sd00001D2Dbc11sc80i00
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Signal processing controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=Signal processing controller
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Sunrise Point-LP Serial IO SPI Controller
-A: ari_enabled=0\n
-A: broken_parity_status=0\n
-A: class=0x118000\n
-H: config=8680299D060010002100801110008000043013EF00000000000000000000000000000000000000000000000043102D1D000000008000000000000000FF030000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: device=0x9d29\n
-A: dma_mask_bits=32\n
-L: driver=../../../bus/pci/drivers/intel-lpss
-A: driver_override=(null)\n
-A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:73
-A: irq=22\n
-A: local_cpulist=0-7\n
-A: local_cpus=ff\n
-A: modalias=pci:v00008086d00009D29sv00001043sd00001D2Dbc11sc80i00\n
-A: msi_bus=1\n
-A: numa_node=-1\n
-A: pools=poolinfo - 0.1\ndma3chan1           0  102   40  1\ndma3chan0           0  102   40  1\n
-A: power/async=enabled\n
-A: power/control=on\n
-A: power/pm_qos_latency_tolerance_us=auto\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=9330720\n
-A: power/runtime_enabled=forbidden\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=4891014\n
-A: power/runtime_usage=1\n
-A: resource=0x00000000ef133000 0x00000000ef133fff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x21\n
-A: subsystem_device=0x1d2d\n
-A: subsystem_vendor=0x1043\n
-A: vendor=0x8086\n
-
--- a/tests/goodixmoc/custom.py
+++ b/tests/goodixmoc/custom.py
@ -14,14 +14,6 @@ d = devices[0]
 del devices

 assert d.get_driver() == "goodixmoc"
-assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
-assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
-assert d.has_feature(FPrint.DeviceFeature.VERIFY)
-assert d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
-assert d.has_feature(FPrint.DeviceFeature.STORAGE)
-assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
-assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
-assert not d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)

 d.open_sync()

--- a/tests/meson.build
+++ b/tests/meson.build
@ -22,34 +22,17 @@ envs.set('FP_DRIVERS_WHITELIST', ':'.join([
 envs.set('NO_AT_BRIDGE', '1')

 drivers_tests = [
-    'aes2501',
    'aes3500',
    'elan',
-    'elan-cobo',
-    'elanmoc',
-    'elanspi',
    'synaptics',
-    'upektc_img',
-    'uru4000-msv2',
-    'uru4000-4500',
    'vfs0050',
    'vfs301',
    'vfs5011',
    'vfs7552',
    'goodixmoc',
    'nb1010',
-    'egis0570',
 ]

-if get_option('introspection')
-  conf = configuration_data()
-  conf.set('SRCDIR', meson.source_root())
-  conf.set('BUILDDIR', meson.build_root())
-  configure_file(configuration: conf,
-      input: 'create-driver-test.py.in',
-      output: 'create-driver-test.py')
-endif
-
 if get_option('introspection')
    envs.prepend('GI_TYPELIB_PATH', join_paths(meson.build_root(), 'libfprint'))
    virtual_devices_tests = [
@ -99,18 +82,17 @@ if get_option('introspection')
    endforeach

    foreach driver_test: drivers_tests
-        driver_name = driver_test.split('-')[0]
        driver_envs = envs
-        driver_envs.set('FP_DRIVERS_WHITELIST', driver_name)
+        driver_envs.set('FP_DRIVERS_WHITELIST', driver_test)

-        if (driver_name in supported_drivers and
+        if (driver_test in supported_drivers and
            gusb_dep.version().version_compare('>= 0.3.0'))
            test(driver_test,
                find_program('umockdev-test.py'),
                args: join_paths(meson.current_source_dir(), driver_test),
                env: driver_envs,
                suite: ['drivers'],
-                timeout: 15,
+                timeout: 10,
                depends: libfprint_typelib,
            )
        else
@ -195,8 +177,9 @@ foreach test_name: unit_tests
        link_with: test_utils,
    )
    test(test_name,
-        test_exe,
+        find_program('test-runner.sh'),
        suite: ['unit-tests'],
+        args: [test_exe],
        env: envs,
    )
 endforeach
@ -210,17 +193,11 @@ test('udev-hwdb',

 gdb = find_program('gdb', required: false)
 if gdb.found()
-    libfprint_wrapper = [
-        gdb.path(),
-        '-batch',
-        '-ex', 'run',
-        '--args',
-    ]
    add_test_setup('gdb',
        timeout_multiplier: 1000,
-        exe_wrapper: libfprint_wrapper,
        env: [
-            'LIBFPRINT_TEST_WRAPPER=' + ' '.join(libfprint_wrapper),
+            'LIBFPRINT_TEST_WRAPPER=@0@ --args'.format(
+                gdb.path())
        ])
 endif

@ -230,19 +207,13 @@ if valgrind.found()
    glib_suppressions = glib_share + '/valgrind/glib.supp'
    python_suppressions = '@0@/@1@'.format(meson.source_root(),
        files('valgrind-python.supp')[0])
-    libfprint_wrapper = [
-        valgrind.path(),
-        '--tool=memcheck',
-        '--leak-check=full',
-        '--suppressions=' + glib_suppressions,
-        '--suppressions=' + python_suppressions,
-    ]
    add_test_setup('valgrind',
        timeout_multiplier: 10,
-        exe_wrapper: libfprint_wrapper,
        env: [
            'G_SLICE=always-malloc',
            'UNDER_VALGRIND=1',
-            'LIBFPRINT_TEST_WRAPPER=' + ' '.join(libfprint_wrapper),
+            ('LIBFPRINT_TEST_WRAPPER=@0@ --tool=memcheck --leak-check=full ' +
+             '--suppressions=@1@ --suppressions=@2@').format(
+                valgrind.path(), glib_suppressions, python_suppressions)
        ])
 endif
--- a/tests/synaptics/custom-recorded.ioctl
+++ b/tests/synaptics/custom-recorded.ioctl
@ -0,0 +1,129 @@
+@DEV /dev/bus/usb/001/070
+USBDEVFS_GET_CAPABILITIES 0 7D000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 01
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 40 38 0 00009C37FE5C669C2D000A01014101C10000D11BB7134A090FA1000000000100000000000003
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 5 5 0 A7FE011100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE01130100
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 37 37 0 A7FE02512000014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE025400
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE0255010C
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE02550119
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE02550125
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE02550125
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE02550132
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE0255013E
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE0255013E
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE0255014B
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE02550157
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE026000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE02550164
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 37 0 0000FE02591F014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE046000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 39 0 0000FE0468214F2B014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 5 5 0 A7FE037100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 41 0 0000FE03752301012007014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 5 5 0 A7FE037200
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE037600
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 35 35 0 A7FE04651E4650312D30303030303030302D302D30303030303030302D6E6F626F6479
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE046600
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 36 36 0 A7FE05811F014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 37 0 0000FE05831F014650312D30303030303030302D302D30303030303030302D6E6F626F6479
--- a/tests/synaptics/custom.ioctl
+++ b/tests/synaptics/custom.ioctl
@ -0,0 +1,188 @@
+@DEV /dev/bus/usb/001/070
+USBDEVFS_GET_CAPABILITIES 0 7D000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 01
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 40 38 0 00009C37FE5C669C2D000A01014101C10000D11BB7134A090FA1000000000100000000000003
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 5 5 0 A7FE011100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE01130100
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 5 5 0 A7FE021100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE02130100 
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 37 37 0 A7FE03512000014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE035400
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE0355010C
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE03550119
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE03550125
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE03550125
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE03550132
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE0355013E
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE0355013E
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE0355014B
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE03550157
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE036000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE03550164
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 37 0 0000FE03591F014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 5 5 0 A7FE047100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 41 0 0000FE04752301012007014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 5 5 0 A7FE047200
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE047600
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 35 35 0 A7FE05651E4650312D30303030303030302D302D30303030303030302D6E6F626F6479
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE056600
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000000
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE056000
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 06000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910101
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 7 0 0000FE00910100
+  USBDEVFS_REAPURBNDELAY 0 1 131 0 0 7 7 0 05000000000100
+ USBDEVFS_REAPURBNDELAY 0 3 1 0 0 1 1 0 A8
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 39 0 0000FE0568214F2B014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 36 36 0 A7FE06811F014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 37 0 0000FE06831F014650312D30303030303030302D302D30303030303030302D6E6F626F6479
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 5 5 0 A7FE07A100
+ USBDEVFS_REAPURBNDELAY 0 3 129 0 0 266 6 0 0000FE07A200
+
--- a/tests/synaptics/custom.pcapng
+++ b/tests/synaptics/custom.pcapng
--- a/tests/synaptics/custom.py
+++ b/tests/synaptics/custom.py
@ -14,18 +14,9 @@ d = devices[0]
 del devices

 assert d.get_driver() == "synaptics"
-assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
-assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
-assert d.has_feature(FPrint.DeviceFeature.VERIFY)
-assert not d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
-assert d.has_feature(FPrint.DeviceFeature.STORAGE)
-assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
-assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)

 d.open_sync()

-d.clear_storage_sync()
-
 template = FPrint.Print.new(d)

 def enroll_progress(*args):
@ -39,6 +30,11 @@ p = d.enroll_sync(template, None, enroll_progress, None)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("enroll done")

+print("listing")
+stored = d.list_prints_sync()
+print("listing done")
+assert len(stored) == 1
+assert stored[0].equal(p)
 print("verifying")
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 verify_res, verify_print = d.verify_sync(p)
--- a/tests/synaptics/device
+++ b/tests/synaptics/device
@ -1,14 +1,14 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-9
-N: bus/usb/001/005
-E: DEVNAME=/dev/bus/usb/001/005
+P: /devices/pci0000:00/0000:00:14.0/usb1/1-1
+N: bus/usb/001/070=12010002FF10FF08CB06BD0000000000010109022700010100A0320904000003FF000000070501024000000705810240000007058303080004
+E: DEVNAME=/dev/bus/usb/001/070
 E: DEVTYPE=usb_device
 E: DRIVER=usb
 E: PRODUCT=6cb/bd/0
 E: TYPE=255/16/255
 E: BUSNUM=001
-E: DEVNUM=005
+E: DEVNUM=070
 E: MAJOR=189
-E: MINOR=4
+E: MINOR=69
 E: SUBSYSTEM=usb
 E: ID_VENDOR=06cb
 E: ID_VENDOR_ENC=06cb
@ -17,207 +17,59 @@ E: ID_MODEL=00bd
 E: ID_MODEL_ENC=00bd
 E: ID_MODEL_ID=00bd
 E: ID_REVISION=0000
-E: ID_SERIAL=06cb_00bd_c087f7d72126
-E: ID_SERIAL_SHORT=c087f7d72126
+E: ID_SERIAL=06cb_00bd_317bb11d90a4
+E: ID_SERIAL_SHORT=317bb11d90a4
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:ff0000:
 E: ID_VENDOR_FROM_DATABASE=Synaptics, Inc.
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=Prometheus MIS Touch Fingerprint Reader
-E: ID_PATH=pci-0000:00:14.0-usb-0:9
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_9
-E: LIBFPRINT_DRIVER=Synaptics Sensors
-A: authorized=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=ff\n
-A: bDeviceProtocol=ff\n
-A: bDeviceSubClass=10\n
-A: bMaxPacketSize0=8\n
-A: bMaxPower=100mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0000\n
-A: bmAttributes=a0\n
+A: authorized=1
+A: avoid_reset_quirk=0
+A: bConfigurationValue=1
+A: bDeviceClass=ff
+A: bDeviceProtocol=ff
+A: bDeviceSubClass=10
+A: bMaxPacketSize0=8
+A: bMaxPower=100mA
+A: bNumConfigurations=1
+A: bNumInterfaces= 1
+A: bcdDevice=0000
+A: bmAttributes=a0
 A: busnum=1\n
 A: configuration=
 H: descriptors=12010002FF10FF08CB06BD0000000000010109022700010100A0320904000003FF000000070501024000000705810240000007058303080004
-A: dev=189:4\n
-A: devnum=5\n
-A: devpath=9\n
+A: dev=189:69
+A: devnum=70\n
+A: devpath=1
 L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d/device:28
-A: idProduct=00bd\n
-A: idVendor=06cb\n
-A: ltm_capable=no\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port9
-A: power/active_duration=82065\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=4271349\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=1\n
-A: power/runtime_active_time=82975\n
-A: power/runtime_status=suspended\n
-A: power/runtime_suspended_time=4186597\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: quirks=0x0\n
-A: removable=fixed\n
-A: rx_lanes=1\n
-A: serial=c087f7d72126\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=618\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020012050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1d6b/2/512
-E: TYPE=9/0/1
-E: BUSNUM=001
-E: DEVNUM=001
-E: MAJOR=189
-E: MINOR=0
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.12.9-300.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.12.9-300.fc34.x86_64\x20xhci-hcd
-E: ID_VENDOR_ID=1d6b
-E: ID_MODEL=xHCI_Host_Controller
-E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
-E: ID_MODEL_ID=0002
-E: ID_REVISION=0512
-E: ID_SERIAL=Linux_5.12.9-300.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
-E: ID_SERIAL_SHORT=0000:00:14.0
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:090000:
-E: ID_VENDOR_FROM_DATABASE=Linux Foundation
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=2.0 root hub
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: authorized_default=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=09\n
-A: bDeviceProtocol=01\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=0mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0512\n
-A: bmAttributes=e0\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12010002090001406B1D020012050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0\n
-A: devnum=1\n
-A: devpath=0\n
-L: driver=../../../../bus/usb/drivers/usb
-L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d
-A: idProduct=0002\n
-A: idVendor=1d6b\n
-A: interface_authorized_default=1\n
-A: ltm_capable=no\n
-A: manufacturer=Linux 5.12.9-300.fc34.x86_64 xhci-hcd\n
-A: maxchild=12\n
-A: power/active_duration=4270585\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=4272308\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=4270770\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: product=xHCI Host Controller\n
-A: quirks=0x0\n
-A: removable=unknown\n
-A: rx_lanes=1\n
-A: serial=0000:00:14.0\n
-A: speed=480\n
-A: tx_lanes=1\n
-A: urbnum=463\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0
-E: DRIVER=xhci_hcd
-E: PCI_CLASS=C0330
-E: PCI_ID=8086:9DED
-E: PCI_SUBSYS_ID=17AA:2292
-E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d00009DEDsv000017AAsd00002292bc0Csc03i30
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
-E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=Cannon Point-LP USB 3.1 xHCI Controller
-A: ari_enabled=0\n
-A: broken_parity_status=0\n
-A: class=0x0c0330\n
-H: config=8680ED9D060490021130030C00008000040022EA000000000000000000000000000000000000000000000000AA179222000000007000000000000000FF010000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: dbc=disabled\n
-A: device=0x9ded\n
-A: dma_mask_bits=64\n
-L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)\n
-A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c
-A: irq=128\n
-A: local_cpulist=0-7\n
-A: local_cpus=ff\n
-A: modalias=pci:v00008086d00009DEDsv000017AAsd00002292bc0Csc03i30\n
-A: msi_bus=1\n
-A: msi_irqs/128=msi\n
-A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts    9   12 2112 12\nxHCI ring segments   40   50 4096 50\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          6   32  128  1\nbuffer-32           0    0   32  0\n
-A: power/control=auto\n
-A: power/runtime_active_time=4271635\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=enabled\n
-A: power/wakeup_abort_count=0\n
-A: power/wakeup_active=0\n
-A: power/wakeup_active_count=0\n
-A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=0\n
-A: power/wakeup_last_time_ms=0\n
-A: power/wakeup_max_time_ms=0\n
-A: power/wakeup_total_time_ms=0\n
-A: power_state=D0\n
-A: resource=0x00000000ea220000 0x00000000ea22ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x11\n
-A: subsystem_device=0x2292\n
-A: subsystem_vendor=0x17aa\n
-A: vendor=0x8086\n
-
+A: idProduct=00bd
+A: idVendor=06cb
+A: ltm_capable=no
+A: maxchild=0
+L: port=../1-0:1.0/usb1-port1
+A: power/active_duration=33942
+A: power/autosuspend=2
+A: power/autosuspend_delay_ms=2000
+A: power/connected_duration=33942
+A: power/control=on
+A: power/level=on
+A: power/persist=1
+A: power/runtime_active_time=33702
+A: power/runtime_status=active
+A: power/runtime_suspended_time=0
+A: power/wakeup=disabled
+A: power/wakeup_abort_count=
+A: power/wakeup_active=
+A: power/wakeup_active_count=
+A: power/wakeup_count=
+A: power/wakeup_expire_count=
+A: power/wakeup_last_time_ms=
+A: power/wakeup_max_time_ms=
+A: power/wakeup_total_time_ms=
+A: quirks=0x0
+A: removable=removable
+A: rx_lanes=1
+A: serial=317bb11d90a4
+A: speed=12
+A: tx_lanes=1
+A: urbnum=12
+A: version= 2.00
--- a/tests/test-device-fake.c
+++ b/tests/test-device-fake.c
@ -38,8 +38,6 @@ fpi_device_fake_probe (FpDevice *device)
  fake_dev->last_called_function = fpi_device_fake_probe;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_PROBE);

-  fpi_device_update_features (device, fake_dev->probe_features_update, fake_dev->probe_features_value);
-
  if (fake_dev->return_action_error)
    {
      fpi_device_action_error (device, fake_dev->ret_error);
@ -245,23 +243,6 @@ fpi_device_fake_delete (FpDevice *device)
  fpi_device_delete_complete (device, fake_dev->ret_error);
 }

-static void
-fpi_device_fake_clear_storage (FpDevice *device)
-{
-  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
-
-  fake_dev->last_called_function = fpi_device_fake_clear_storage;
-  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CLEAR_STORAGE);
-
-  if (fake_dev->return_action_error)
-    {
-      fpi_device_action_error (device, fake_dev->ret_error);
-      return;
-    }
-
-  fpi_device_clear_storage_complete (device, fake_dev->ret_error);
-}
-
 static void
 fpi_device_fake_cancel (FpDevice *device)
 {
@ -271,26 +252,6 @@ fpi_device_fake_cancel (FpDevice *device)
  g_assert_cmpuint (fpi_device_get_current_action (device), !=, FPI_DEVICE_ACTION_NONE);
 }

-static void
-fpi_device_fake_suspend (FpDevice *device)
-{
-  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
-
-  fake_dev->last_called_function = fpi_device_fake_suspend;
-
-  fpi_device_suspend_complete (device, g_steal_pointer (&fake_dev->ret_suspend));
-}
-
-static void
-fpi_device_fake_resume (FpDevice *device)
-{
-  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
-
-  fake_dev->last_called_function = fpi_device_fake_resume;
-
-  fpi_device_resume_complete (device, g_steal_pointer (&fake_dev->ret_resume));
-}
-
 static void
 fpi_device_fake_init (FpiDeviceFake *self)
 {
@ -318,9 +279,6 @@ fpi_device_fake_class_init (FpiDeviceFakeClass *klass)
  dev_class->list = fpi_device_fake_list;
  dev_class->delete = fpi_device_fake_delete;
  dev_class->cancel = fpi_device_fake_cancel;
-  dev_class->clear_storage = fpi_device_fake_clear_storage;
-  dev_class->suspend = fpi_device_fake_suspend;
-  dev_class->resume = fpi_device_fake_resume;

  fpi_device_class_auto_initialize_features (dev_class);
 }
--- a/tests/test-device-fake.h
+++ b/tests/test-device-fake.h
@ -32,8 +32,6 @@ struct _FpiDeviceFake
  gpointer       last_called_function;
  gboolean       return_action_error;

-  GCancellable   *ext_cancellable;
-
  GError        *ret_error;
  FpPrint       *ret_print;
  FpPrint       *ret_match;
@ -41,12 +39,6 @@ struct _FpiDeviceFake
  FpImage       *ret_image;
  GPtrArray     *ret_list;

-  GError         *ret_suspend;
-  GError         *ret_resume;
-
  gpointer       action_data;
  gpointer       user_data;
-
-  FpDeviceFeature probe_features_update;
-  FpDeviceFeature probe_features_value;
 };
--- a/tests/test-fp-device.c
+++ b/tests/test-fp-device.c
@ -202,10 +202,7 @@ test_device_supports_identify (void)
  g_autoptr(FptContext) tctx = fpt_context_new_with_virtual_device (FPT_VIRTUAL_DEVICE_IMAGE);

  fp_device_open_sync (tctx->device, NULL, NULL);
-  g_assert_true (fp_device_has_feature (tctx->device, FP_DEVICE_FEATURE_IDENTIFY));
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  g_assert_true (fp_device_supports_identify (tctx->device));
-  G_GNUC_END_IGNORE_DEPRECATIONS
 }

 static void
@ -214,10 +211,7 @@ test_device_supports_capture (void)
  g_autoptr(FptContext) tctx = fpt_context_new_with_virtual_device (FPT_VIRTUAL_DEVICE_IMAGE);

  fp_device_open_sync (tctx->device, NULL, NULL);
-  g_assert_true (fp_device_has_feature (tctx->device, FP_DEVICE_FEATURE_CAPTURE));
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  g_assert_true (fp_device_supports_capture (tctx->device));
-  G_GNUC_END_IGNORE_DEPRECATIONS
 }

 static void
@ -226,10 +220,7 @@ test_device_has_storage (void)
  g_autoptr(FptContext) tctx = fpt_context_new_with_virtual_device (FPT_VIRTUAL_DEVICE_IMAGE);

  fp_device_open_sync (tctx->device, NULL, NULL);
-  g_assert_false (fp_device_has_feature (tctx->device, FP_DEVICE_FEATURE_STORAGE));
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  g_assert_false (fp_device_has_storage (tctx->device));
-  G_GNUC_END_IGNORE_DEPRECATIONS
 }

 int
--- a/tests/test-fpi-assembling.c
+++ b/tests/test-fpi-assembling.c
@ -62,7 +62,6 @@ test_frame_assembling (void)
  int test_height;
  guchar *data;
  struct fpi_frame_asmbl_ctx ctx = { 0, };
-  gint xborder = 5;

  g_autoptr(FpImage) fp_img = NULL;
  GSList *frames = NULL;
@ -80,7 +79,7 @@ test_frame_assembling (void)
  ctx.get_pixel = cairo_get_pixel;
  ctx.frame_width = width;
  ctx.frame_height = 20;
-  ctx.image_width = width - 2 * xborder;
+  ctx.image_width = width;

  g_assert (height > ctx.frame_height);

@ -119,8 +118,8 @@ test_frame_assembling (void)

  /* The FpImage and cairo surface need to be identical in the test area */
  for (int y = 0; y < test_height; y++)
-    for (int x = 0; x < ctx.image_width; x++)
-      g_assert_cmpint (data[(x + xborder) * 4 + y * stride + 1], ==, fp_img->data[x + y * ctx.image_width]);
+    for (int x = 0; x < width; x++)
+      g_assert_cmpint (data[x * 4 + y * stride + 1], ==, fp_img->data[x + y * width]);

  g_slist_free_full (frames, g_free);
  cairo_surface_destroy (img);
--- a/tests/test-fpi-device.c
+++ b/tests/test-fpi-device.c
--- a/tests/test-fpi-ssm.c
+++ b/tests/test-fpi-ssm.c
@ -129,12 +129,12 @@ test_ssm_completed_callback (FpiSsm   *ssm,
 }

 static FpiSsm *
-ssm_test_new_full (int nr_states, int cleanup_state, const char *name)
+ssm_test_new_full (int nr_states, const char *name)
 {
  FpiSsm *ssm;
  FpiSsmTestData *data;

-  ssm = fpi_ssm_new_full (fake_device, test_ssm_handler, nr_states, cleanup_state, name);
+  ssm = fpi_ssm_new_full (fake_device, test_ssm_handler, nr_states, name);
  data = fpi_ssm_test_data_new ();
  data->expected_last_state = nr_states;
  fpi_ssm_set_data (ssm, data, (GDestroyNotify) fpi_ssm_test_data_unref_by_ssm);
@ -145,7 +145,7 @@ ssm_test_new_full (int nr_states, int cleanup_state, const char *name)
 static FpiSsm *
 ssm_test_new (void)
 {
-  return ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SSM");
+  return ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SSM");
 }

 static gboolean
@ -158,6 +158,14 @@ test_ssm_cancel_delayed_action_delayed (gpointer data)
  return G_SOURCE_REMOVE;
 }

+static gboolean
+test_ssm_cancel_cancellable_delayed (gpointer data)
+{
+  g_cancellable_cancel (G_CANCELLABLE (data));
+
+  return G_SOURCE_REMOVE;
+}
+
 /* Tests */

 static void
@ -180,8 +188,7 @@ test_ssm_new_full (void)
  FpiSsm *ssm;

  ssm = fpi_ssm_new_full (fake_device, test_ssm_handler,
-                          FPI_TEST_SSM_STATE_NUM, FPI_TEST_SSM_STATE_NUM,
-                          "Test SSM Name");
+                          FPI_TEST_SSM_STATE_NUM, "Test SSM Name");

  g_assert_null (fpi_ssm_get_data (ssm));
  g_assert_no_error (fpi_ssm_get_error (ssm));
@ -208,8 +215,6 @@ test_ssm_new_wrong_states (void)

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
                         "*BUG:*nr_states*");
-  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
-                         "*BUG:*start_cleanup*");
  ssm = fpi_ssm_new (fake_device, test_ssm_handler, -1);
  g_test_assert_expected_messages ();
 }
@ -266,7 +271,7 @@ test_ssm_start_single (void)
  g_autoptr(FpiSsmTestData) data = NULL;
  FpiSsm *ssm;

-  ssm = ssm_test_new_full (1, 1, "FPI_TEST_SSM_SINGLE_STATE");
+  ssm = ssm_test_new_full (1, "FPI_TEST_SSM_SINGLE_STATE");
  data = fpi_ssm_test_data_ref (fpi_ssm_get_data (ssm));

  fpi_ssm_start (ssm, test_ssm_completed_callback);
@ -331,7 +336,7 @@ test_ssm_next_with_delayed (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_next_state_delayed (ssm, 10);
+  fpi_ssm_next_state_delayed (ssm, 10, NULL);

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*timeout*");
  fpi_ssm_next_state (ssm);
@ -439,7 +444,7 @@ test_ssm_jump_to_state_with_delayed (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_2, 10);
+  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_2, 10, NULL);

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*timeout*");
  fpi_ssm_jump_to_state (ssm, FPI_TEST_SSM_STATE_2);
@ -556,7 +561,7 @@ test_ssm_mark_completed_with_delayed (void)
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

  data->expected_last_state = FPI_TEST_SSM_STATE_0;
-  fpi_ssm_mark_completed_delayed (ssm, 10);
+  fpi_ssm_mark_completed_delayed (ssm, 10, NULL);

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*timeout*");
  fpi_ssm_mark_completed (g_steal_pointer (&ssm));
@ -618,7 +623,7 @@ test_ssm_mark_failed_with_delayed (void)
  fpi_ssm_start (ssm, test_ssm_completed_callback);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_mark_completed_delayed (ssm, 10);
+  fpi_ssm_mark_completed_delayed (ssm, 10, NULL);

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*timeout*");
  data->expected_last_state = FPI_TEST_SSM_STATE_0;
@ -649,7 +654,7 @@ test_ssm_delayed_next (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_next_state_delayed (ssm, 10);
+  fpi_ssm_next_state_delayed (ssm, 10, NULL);
  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
@ -677,7 +682,7 @@ test_ssm_delayed_next_cancel (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_next_state_delayed (ssm, 10);
+  fpi_ssm_next_state_delayed (ssm, 10, NULL);
  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
@ -696,6 +701,40 @@ test_ssm_delayed_next_cancel (void)
  g_assert_no_error (data->error);
 }

+static void
+test_ssm_delayed_next_cancellable (void)
+{
+  g_autoptr(FpiSsm) ssm = ssm_test_new ();
+  g_autoptr(GCancellable) cancellable = g_cancellable_new ();
+  FpiSsmTestData *data = fpi_ssm_get_data (ssm);
+
+  fpi_ssm_start (ssm, test_ssm_completed_callback);
+  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
+
+  fpi_ssm_next_state_delayed (ssm, 10, cancellable);
+  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
+
+  g_idle_add_full (G_PRIORITY_HIGH, test_ssm_cancel_cancellable_delayed, cancellable, NULL);
+
+  while (!g_cancellable_is_cancelled (cancellable))
+    g_main_context_iteration (NULL, TRUE);
+
+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*timeout*");
+  fpi_ssm_cancel_delayed_state_change (ssm);
+  g_test_assert_expected_messages ();
+
+  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
+
+  g_assert_false (data->completed);
+  g_assert_no_error (data->error);
+}
+
 static void
 test_ssm_delayed_next_not_started (void)
 {
@ -703,7 +742,7 @@ test_ssm_delayed_next_not_started (void)
  FpiSsmTestData *data = fpi_ssm_get_data (ssm);

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*completed*");
-  fpi_ssm_next_state_delayed (ssm, 10);
+  fpi_ssm_next_state_delayed (ssm, 10, NULL);
  g_test_assert_expected_messages ();

  g_assert_cmpint (data->handler_state, ==, -1);
@ -734,7 +773,7 @@ test_ssm_delayed_next_complete (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_next_state_delayed (ssm, 10);
+  fpi_ssm_next_state_delayed (ssm, 10, NULL);
  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
@ -746,7 +785,7 @@ test_ssm_delayed_next_complete (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_1);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 2);

-  fpi_ssm_next_state_delayed (ssm, 10);
+  fpi_ssm_next_state_delayed (ssm, 10, NULL);
  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_1);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_1);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 2);
@ -758,7 +797,7 @@ test_ssm_delayed_next_complete (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_2);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 3);

-  fpi_ssm_next_state_delayed (ssm, 10);
+  fpi_ssm_next_state_delayed (ssm, 10, NULL);
  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_2);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_2);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 3);
@ -770,7 +809,7 @@ test_ssm_delayed_next_complete (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_3);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 4);

-  fpi_ssm_next_state_delayed (ssm, 10);
+  fpi_ssm_next_state_delayed (ssm, 10, NULL);
  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_3);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_3);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 4);
@ -796,7 +835,7 @@ test_ssm_delayed_jump_to_state (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_2, 10);
+  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_2, 10, NULL);

  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
@ -809,7 +848,7 @@ test_ssm_delayed_jump_to_state (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_2);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 2);

-  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_1, 10);
+  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_1, 10, NULL);

  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_2);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_2);
@ -838,7 +877,7 @@ test_ssm_delayed_jump_to_state_cancel (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_2, 10);
+  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_2, 10, NULL);
  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
@ -857,6 +896,40 @@ test_ssm_delayed_jump_to_state_cancel (void)
  g_assert_no_error (data->error);
 }

+static void
+test_ssm_delayed_jump_to_state_cancellable (void)
+{
+  g_autoptr(FpiSsm) ssm = ssm_test_new ();
+  g_autoptr(GCancellable) cancellable = g_cancellable_new ();
+  FpiSsmTestData *data = fpi_ssm_get_data (ssm);
+
+  fpi_ssm_start (ssm, test_ssm_completed_callback);
+  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
+
+  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_2, 10, cancellable);
+  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
+
+  g_idle_add_full (G_PRIORITY_HIGH, test_ssm_cancel_cancellable_delayed, cancellable, NULL);
+
+  while (!g_cancellable_is_cancelled (cancellable))
+    g_main_context_iteration (NULL, TRUE);
+
+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*timeout*");
+  fpi_ssm_cancel_delayed_state_change (ssm);
+  g_test_assert_expected_messages ();
+
+  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
+
+  g_assert_false (data->completed);
+  g_assert_no_error (data->error);
+}
+
 static void
 test_ssm_delayed_jump_to_state_not_started (void)
 {
@ -864,7 +937,7 @@ test_ssm_delayed_jump_to_state_not_started (void)
  FpiSsmTestData *data = fpi_ssm_get_data (ssm);

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*completed*");
-  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_2, 10);
+  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_2, 10, NULL);
  g_test_assert_expected_messages ();

  g_assert_cmpint (data->handler_state, ==, -1);
@ -894,7 +967,7 @@ test_ssm_delayed_jump_to_state_last (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_3, 10);
+  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_3, 10, NULL);

  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
@ -923,7 +996,7 @@ test_ssm_delayed_jump_to_state_wrong (void)
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*nr_states*");
-  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_NUM + 10, 10);
+  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_NUM + 10, 10, NULL);
  g_test_assert_expected_messages ();

  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
@ -940,7 +1013,7 @@ test_ssm_delayed_jump_to_state_wrong (void)
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 2);

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*state*");
-  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_0 - 10, 10);
+  fpi_ssm_jump_to_state_delayed (ssm, FPI_TEST_SSM_STATE_0 - 10, 10, NULL);
  g_test_assert_expected_messages ();

  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_NUM + 10);
@ -970,7 +1043,7 @@ test_ssm_delayed_mark_completed (void)
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

  data->expected_last_state = FPI_TEST_SSM_STATE_0;
-  fpi_ssm_mark_completed_delayed (g_steal_pointer (&ssm), 10);
+  fpi_ssm_mark_completed_delayed (g_steal_pointer (&ssm), 10, NULL);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

  while (g_slist_length (data->handlers_chain) == 1)
@ -990,7 +1063,7 @@ test_ssm_delayed_mark_completed_not_started (void)
  g_autoptr(FpiSsmTestData) data = fpi_ssm_test_data_ref (fpi_ssm_get_data (ssm));

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*completed*");
-  fpi_ssm_mark_completed_delayed (ssm, 10);
+  fpi_ssm_mark_completed_delayed (ssm, 10, NULL);
  g_test_assert_expected_messages ();

  g_timeout_add (100, G_SOURCE_FUNC (fpi_ssm_test_nullify_pointer), &ssm);
@ -1017,7 +1090,7 @@ test_ssm_delayed_mark_completed_cancel (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_mark_completed_delayed (ssm, 10);
+  fpi_ssm_mark_completed_delayed (ssm, 10, NULL);
  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
@ -1037,6 +1110,40 @@ test_ssm_delayed_mark_completed_cancel (void)
  g_assert_false (data->ssm_destroyed);
 }

+static void
+test_ssm_delayed_mark_completed_cancellable (void)
+{
+  g_autoptr(FpiSsm) ssm = ssm_test_new ();
+  g_autoptr(GCancellable) cancellable = g_cancellable_new ();
+  FpiSsmTestData *data = fpi_ssm_get_data (ssm);
+
+  fpi_ssm_start (ssm, test_ssm_completed_callback);
+  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
+
+  fpi_ssm_mark_completed_delayed (ssm, 10, cancellable);
+  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
+
+  g_idle_add_full (G_PRIORITY_HIGH, test_ssm_cancel_cancellable_delayed, cancellable, NULL);
+
+  while (!g_cancellable_is_cancelled (cancellable))
+    g_main_context_iteration (NULL, TRUE);
+
+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*timeout*");
+  fpi_ssm_cancel_delayed_state_change (ssm);
+  g_test_assert_expected_messages ();
+
+  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
+  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
+
+  g_assert_false (data->completed);
+  g_assert_no_error (data->error);
+}
+
 static void
 test_ssm_delayed_cancel_error (void)
 {
@ -1063,7 +1170,7 @@ test_ssm_subssm_start (void)
 {
  g_autoptr(FpiSsm) ssm = ssm_test_new ();
  g_autoptr(FpiSsm) subssm =
-    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
+    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
  FpiSsmTestData *data = fpi_ssm_get_data (ssm);

  g_autoptr(FpiSsmTestData) subdata =
@ -1115,7 +1222,7 @@ test_ssm_subssm_mark_failed (void)
 {
  g_autoptr(FpiSsm) ssm = ssm_test_new ();
  g_autoptr(FpiSsm) subssm =
-    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
+    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
  g_autoptr(FpiSsmTestData) data =
    fpi_ssm_test_data_ref (fpi_ssm_get_data (ssm));
  g_autoptr(FpiSsmTestData) subdata =
@ -1154,7 +1261,7 @@ test_ssm_subssm_start_with_started (void)
 {
  g_autoptr(FpiSsm) ssm = ssm_test_new ();
  g_autoptr(FpiSsm) subssm =
-    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
+    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
  FpiSsmTestData *data = fpi_ssm_get_data (ssm);

  g_autoptr(FpiSsmTestData) subdata =
@ -1198,7 +1305,7 @@ test_ssm_subssm_start_with_delayed (void)
 {
  g_autoptr(FpiSsm) ssm = ssm_test_new ();
  g_autoptr(FpiSsm) subssm =
-    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
+    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
  FpiSsmTestData *data = fpi_ssm_get_data (ssm);

  g_autoptr(FpiSsmTestData) subdata =
@ -1210,7 +1317,7 @@ test_ssm_subssm_start_with_delayed (void)
  g_assert_cmpint (fpi_ssm_get_cur_state (ssm), ==, FPI_TEST_SSM_STATE_0);
  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);

-  fpi_ssm_next_state_delayed (ssm, 10);
+  fpi_ssm_next_state_delayed (ssm, 10, NULL);

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*BUG:*timeout*");
  fpi_ssm_start_subsm (ssm, subssm);
@ -1241,76 +1348,6 @@ test_ssm_subssm_start_with_delayed (void)
  g_assert_no_error (data->error);
 }

-static void
-test_ssm_cleanup_complete (void)
-{
-  FpiSsm *ssm = ssm_test_new_full (4, FPI_TEST_SSM_STATE_2, "FPI_TEST_SSM");
-
-  g_autoptr(FpiSsmTestData) data = fpi_ssm_test_data_ref (fpi_ssm_get_data (ssm));
-
-  fpi_ssm_start (ssm, test_ssm_completed_callback);
-  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
-
-  data->expected_last_state = FPI_TEST_SSM_STATE_3;
-
-  /* Completing jumps to the cleanup state */
-  fpi_ssm_mark_completed (ssm);
-  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_2);
-  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 2);
-  g_assert_false (data->completed);
-  g_assert_false (data->ssm_destroyed);
-
-  /* Completing again jumps to the next cleanup state */
-  fpi_ssm_mark_completed (ssm);
-  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_3);
-  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 3);
-  g_assert_false (data->completed);
-  g_assert_false (data->ssm_destroyed);
-
-  /* Completing again finalizes everything */
-  fpi_ssm_mark_completed (ssm);
-  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_3);
-  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 4);
-  g_assert_true (data->completed);
-  g_assert_no_error (data->error);
-  g_assert_true (data->ssm_destroyed);
-}
-
-static void
-test_ssm_cleanup_fail (void)
-{
-  FpiSsm *ssm = ssm_test_new_full (4, FPI_TEST_SSM_STATE_2, "FPI_TEST_SSM");
-
-  g_autoptr(FpiSsmTestData) data = fpi_ssm_test_data_ref (fpi_ssm_get_data (ssm));
-
-  fpi_ssm_start (ssm, test_ssm_completed_callback);
-  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 1);
-
-  data->expected_last_state = FPI_TEST_SSM_STATE_3;
-
-  /* Failing jumps to the cleanup state */
-  fpi_ssm_mark_failed (ssm, g_error_new (G_IO_ERROR, G_IO_ERROR_CANCELLED, "non-cleanup"));
-  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_2);
-  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 2);
-  g_assert_false (data->completed);
-  g_assert_false (data->ssm_destroyed);
-
-  /* Failing again jumps to the next cleanup state */
-  fpi_ssm_mark_failed (ssm, g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "cleanup 1"));
-  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_3);
-  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 3);
-  g_assert_false (data->completed);
-  g_assert_false (data->ssm_destroyed);
-
-  /* Failing again finalizes everything */
-  fpi_ssm_mark_failed (ssm, g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "cleanup 2"));
-  g_assert_cmpint (data->handler_state, ==, FPI_TEST_SSM_STATE_3);
-  g_assert_cmpuint (g_slist_length (data->handlers_chain), ==, 4);
-  g_assert_true (data->completed);
-  g_assert_error (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
-  g_assert_true (data->ssm_destroyed);
-}
-
 int
 main (int argc, char *argv[])
 {
@ -1347,23 +1384,24 @@ main (int argc, char *argv[])
  g_test_add_func ("/ssm/mark_failed/with_delayed", test_ssm_mark_failed_with_delayed);
  g_test_add_func ("/ssm/delayed/next", test_ssm_delayed_next);
  g_test_add_func ("/ssm/delayed/next/cancel", test_ssm_delayed_next_cancel);
+  g_test_add_func ("/ssm/delayed/next/cancellable", test_ssm_delayed_next_cancellable);
  g_test_add_func ("/ssm/delayed/next/not_started", test_ssm_delayed_next_not_started);
  g_test_add_func ("/ssm/delayed/next/complete", test_ssm_delayed_next_complete);
  g_test_add_func ("/ssm/delayed/jump_to_state", test_ssm_delayed_jump_to_state);
  g_test_add_func ("/ssm/delayed/jump_to_state/cancel", test_ssm_delayed_jump_to_state_cancel);
+  g_test_add_func ("/ssm/delayed/jump_to_state/cancellable", test_ssm_delayed_jump_to_state_cancellable);
  g_test_add_func ("/ssm/delayed/jump_to_state/not_started", test_ssm_delayed_jump_to_state_not_started);
  g_test_add_func ("/ssm/delayed/jump_to_state/last", test_ssm_delayed_jump_to_state_last);
  g_test_add_func ("/ssm/delayed/jump_to_state/wrong", test_ssm_delayed_jump_to_state_wrong);
  g_test_add_func ("/ssm/delayed/mark_completed", test_ssm_delayed_mark_completed);
  g_test_add_func ("/ssm/delayed/mark_completed/cancel", test_ssm_delayed_mark_completed_cancel);
+  g_test_add_func ("/ssm/delayed/mark_completed/cancellable", test_ssm_delayed_mark_completed_cancellable);
  g_test_add_func ("/ssm/delayed/mark_completed/not_started", test_ssm_delayed_mark_completed_not_started);
  g_test_add_func ("/ssm/delayed/cancel/error", test_ssm_delayed_cancel_error);
  g_test_add_func ("/ssm/subssm/start", test_ssm_subssm_start);
  g_test_add_func ("/ssm/subssm/start/with_started", test_ssm_subssm_start_with_started);
  g_test_add_func ("/ssm/subssm/start/with_delayed", test_ssm_subssm_start_with_delayed);
  g_test_add_func ("/ssm/subssm/mark_failed", test_ssm_subssm_mark_failed);
-  g_test_add_func ("/ssm/cleanup/complete", test_ssm_cleanup_complete);
-  g_test_add_func ("/ssm/cleanup/fail", test_ssm_cleanup_fail);

  return g_test_run ();
 }
--- a/tests/test-runner.sh
+++ b/tests/test-runner.sh
@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec $LIBFPRINT_TEST_WRAPPER $@
--- a/Show more
+++ b/Show more