Load executable pages into anonymous memory

The idea is that this prevents side-channel attacks on the image analysis algorithm as it prevents other executables on the same system that have libfprint loaded to cache-evict the pages. Unfortunately, this kind of work around requires extra privileges for the process. As such, it might not be a desirable solution.
2025-11-15 07:38:12 +00:00 · 2021-08-10 13:32:14 +02:00
53 changed files with 927 additions and 2103 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:
@@ -160,7 +159,6 @@ 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
--- a/.gitlab-ci/libfprint-templates.yaml
+++ b/.gitlab-ci/libfprint-templates.yaml
@@ -26,4 +26,3 @@
    uncrustify
    valgrind
    clang-analyzer
-    diffutils
--- a/29
+++ b/29
@@ -1,35 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.

-2021-11-02: v1.94.2 release
-
-Highlights:
- * goodixmoc: Fix protocol error with certain username lengths
- * elanmoc: New PID 0x0c7d
- * goodixmoc: New PID 0x63cc
-
-2021-09-24: v1.94.1 release
-
-Highlights:
- * Ship a simple script to create new CI tests using tshark
- * Added CI tests for elan, uru4000, aes2501
- * goodixmoc: Remove duplicate checking during enroll and let fprintd handle it
- * uru4000: Fix USB transfer type
- * synaptics: Support for new PIDs
- * goodixmoc: Support for new PIDs
-
-2021-08-20: 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:
--- 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,19 @@ 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*
@@ -139,18 +131,14 @@ usb:v04F3p0C63*
 usb:v04F3p0C6E*
 usb:v04F3p0C58*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver elanmoc
-usb:v04F3p0C7D*
 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*
@@ -158,8 +146,6 @@ usb:v27C6p609C*
 usb:v27C6p60A2*
 usb:v27C6p639C*
 usb:v27C6p63AC*
-usb:v27C6p63BC*
-usb:v27C6p63CC*
 usb:v27C6p6496*
 usb:v27C6p6584*
 usb:v27C6p658C*
@@ -168,12 +154,10 @@ 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*
@@ -185,29 +169,22 @@ 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*
@@ -217,28 +194,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*
@@ -247,12 +219,10 @@ 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*
@@ -275,7 +245,6 @@ usb:v06CBp00C4*
 usb:v06CBp00CB*
 usb:v06CBp00D8*
 usb:v06CBp00DA*
-usb:v06CBp00E7*
 usb:v06CBp00E9*
 usb:v0A5Cp5801*
 usb:v0A5Cp5805*
@@ -284,9 +253,7 @@ usb:v0A5Cp5840*
 usb:v0A5Cp5841*
 usb:v0A5Cp5842*
 usb:v0A5Cp5843*
-usb:v0A5Cp5844*
 usb:v0A5Cp5845*
-usb:v0BDAp5812*
 usb:v10A5p0007*
 usb:v1188p9545*
 usb:v138Ap0007*
@@ -328,4 +295,3 @@ usb:v2808p9338*
 usb:v298Dp2033*
 usb:v3538p0930*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0
--- a/doc/libfprint-2-sections.txt
+++ b/doc/libfprint-2-sections.txt
@@ -50,8 +50,6 @@ 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
@@ -61,8 +59,6 @@ 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
@@ -72,8 +68,6 @@ 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>

@@ -166,8 +160,6 @@ 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
@@ -179,14 +171,11 @@ fpi_device_enroll_complete
 fpi_device_verify_complete
 fpi_device_identify_complete
 fpi_device_capture_complete
-fpi_device_clear_storage_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>

@@ -247,7 +236,6 @@ fpi_ssm_new_full
 fpi_ssm_free
 fpi_ssm_start
 fpi_ssm_start_subsm
-fpi_ssm_set_critical
 fpi_ssm_next_state
 fpi_ssm_next_state_delayed
 fpi_ssm_jump_to_state
@@ -261,11 +249,7 @@ fpi_ssm_get_device
 fpi_ssm_get_error
 fpi_ssm_dup_error
 fpi_ssm_get_cur_state
-fpi_ssm_silence_debug
-fpi_ssm_spi_transfer_cb
-fpi_ssm_spi_transfer_with_weak_pointer_cb
 fpi_ssm_usb_transfer_cb
-fpi_ssm_usb_transfer_with_weak_pointer_cb
 FpiSsm
 </SECTION>

@@ -292,20 +276,3 @@ FPI_TYPE_USB_TRANSFER
 fpi_usb_transfer_get_type
 </SECTION>

-<SECTION>
-<FILE>fpi-spi-transfer</FILE>
-FpiSpiTransferCallback
-FpiSpiTransfer
-fpi_spi_transfer_new
-fpi_spi_transfer_ref
-fpi_spi_transfer_unref
-fpi_spi_transfer_write
-fpi_spi_transfer_write_full
-fpi_spi_transfer_read
-fpi_spi_transfer_read_full
-fpi_spi_transfer_submit
-fpi_spi_transfer_submit_sync
-<SUBSECTION Standard>
-FPI_TYPE_SPI_TRANSFER
-fpi_spi_transfer_get_type
-</SECTION>
--- a/doc/libfprint-docs.xml
+++ b/doc/libfprint-docs.xml
@@ -41,8 +41,7 @@
    </chapter>

    <chapter id="driver-helpers">
-      <title>USB, SPI and State Machine helpers</title>
-      <xi:include href="xml/fpi-spi-transfer.xml"/>
+      <title>USB and State Machine helpers</title>
      <xi:include href="xml/fpi-usb-transfer.xml"/>
      <xi:include href="xml/fpi-ssm.xml"/>
      <xi:include href="xml/fpi-log.xml"/>
--- a/examples/enroll.c
+++ b/examples/enroll.c
@@ -35,7 +35,6 @@ typedef struct _EnrollData
  unsigned int  sigint_handler;
  FpFinger      finger;
  int           ret_value;
-  gboolean      update_fingerprint;
 } EnrollData;

 static void
@@ -85,8 +84,7 @@ on_enroll_completed (FpDevice *dev, GAsyncResult *res, void *user_data)
      /* Even if the device has storage, it may not be able to save all the
       * metadata that the print contains, so we can always save a local copy
       * containing the handle to the device print */
-      int r = print_data_save (print, enroll_data->finger,
-                               enroll_data->update_fingerprint);
+      int r = print_data_save (print, enroll_data->finger);
      if (r < 0)
        {
          g_warning ("Data save failed, code %d", r);
@@ -126,40 +124,6 @@ on_enroll_progress (FpDevice *device,
          fp_device_get_nr_enroll_stages (device));
 }

-static gboolean
-should_update_fingerprint (void)
-{
-  int update_choice;
-  gboolean update_fingerprint = FALSE;
-
-  printf ("Should an existing fingerprint be updated instead of being replaced (if present)? "
-          "Enter Y/y or N/n to make a choice.\n");
-  update_choice = getchar ();
-  if (update_choice == EOF)
-    {
-      g_warning ("EOF encountered while reading a character");
-      return EXIT_FAILURE;
-    }
-
-  switch (update_choice)
-    {
-    case 'y':
-    case 'Y':
-      update_fingerprint = TRUE;
-      break;
-
-    case 'n':
-    case 'N':
-      update_fingerprint = FALSE;
-      break;
-
-    default:
-      g_warning ("Invalid choice %c, should be Y/y or N/n.", update_choice);
-      return EXIT_FAILURE;
-    }
-  return update_fingerprint;
-}
-
 static void
 on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
 {
@@ -175,26 +139,13 @@ on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
      return;
    }

-  printf ("Opened device.\n");
-
-  if (fp_device_has_feature (dev, FP_DEVICE_FEATURE_UPDATE_PRINT))
-    {
-      printf ("The device supports fingerprint updates.\n");
-      enroll_data->update_fingerprint = should_update_fingerprint ();
-    }
-  else
-    {
-      printf ("The device doesn't support fingerprint updates. Old prints will be erased.\n");
-      enroll_data->update_fingerprint = FALSE;
-    }
-
-  printf ("It's now time to enroll your finger.\n\n");
+  printf ("Opened device. It's now time to enroll your finger.\n\n");
  printf ("You will need to successfully scan your %s finger %d times to "
          "complete the process.\n\n", finger_to_string (enroll_data->finger),
          fp_device_get_nr_enroll_stages (dev));
  printf ("Scan your finger now.\n");

-  print_template = print_create_template (dev, enroll_data->finger, enroll_data->update_fingerprint);
+  print_template = print_create_template (dev, enroll_data->finger);
  fp_device_enroll (dev, print_template, enroll_data->cancellable,
                    on_enroll_progress, NULL, NULL,
                    (GAsyncReadyCallback) on_enroll_completed,
@@ -220,9 +171,11 @@ main (void)
  FpDevice *dev;
  FpFinger finger;

-  g_print ("This program will enroll the selected finger overwriting any print for the same"
-           " finger that was enrolled previously. Fingerprint updates without erasing old data"
-           " are possible on devices supporting that. Ctrl+C interrupts program execution.\n");
+  g_print ("This program will enroll the selected finger, unconditionally "
+           "overwriting any print for the same finger that was enrolled "
+           "previously. If you want to continue, press enter, otherwise hit "
+           "Ctrl+C\n");
+  getchar ();

  g_print ("Choose the finger to enroll:\n");
  finger = finger_chooser ();
--- a/examples/storage.c
+++ b/examples/storage.c
@@ -102,23 +102,8 @@ save_data (GVariant *data)
  return 0;
 }

-static FpPrint *
-load_print_from_data (GVariant *data)
-{
-  const guchar *stored_data = NULL;
-  gsize stored_len;
-  FpPrint *print;
-
-  g_autoptr(GError) error = NULL;
-  stored_data = (const guchar *) g_variant_get_fixed_array (data, &stored_len, 1);
-  print = fp_print_deserialize (stored_data, stored_len, &error);
-  if (error)
-    g_warning ("Error deserializing data: %s", error->message);
-  return print;
-}
-
 int
-print_data_save (FpPrint *print, FpFinger finger, gboolean update_fingerprint)
+print_data_save (FpPrint *print, FpFinger finger)
 {
  g_autofree gchar *descr = get_print_data_descriptor (print, NULL, finger);

@@ -152,12 +137,25 @@ print_data_load (FpDevice *dev, FpFinger finger)

  g_autoptr(GVariant) val = NULL;
  g_autoptr(GVariantDict) dict = NULL;
+  const guchar *stored_data = NULL;
+  gsize stored_len;

  dict = load_data ();
  val = g_variant_dict_lookup_value (dict, descr, G_VARIANT_TYPE ("ay"));

  if (val)
-    return load_print_from_data (val);
+    {
+      FpPrint *print;
+      g_autoptr(GError) error = NULL;
+
+      stored_data = (const guchar *) g_variant_get_fixed_array (val, &stored_len, 1);
+      print = fp_print_deserialize (stored_data, stored_len, &error);
+
+      if (error)
+        g_warning ("Error deserializing data: %s", error->message);
+
+      return print;
+    }

  return NULL;
 }
@@ -209,30 +207,16 @@ gallery_data_load (FpDevice *dev)
 }

 FpPrint *
-print_create_template (FpDevice *dev, FpFinger finger, gboolean load_existing)
+print_create_template (FpDevice *dev, FpFinger finger)
 {
-  g_autoptr(GVariantDict) dict = NULL;
  g_autoptr(GDateTime) datetime = NULL;
  g_autoptr(GDate) date = NULL;
-  g_autoptr(GVariant) existing_val = NULL;
-  g_autofree gchar *descr = get_print_data_descriptor (NULL, dev, finger);
  FpPrint *template = NULL;
  gint year, month, day;

-  if (load_existing)
-    {
-      dict = load_data ();
-      existing_val = g_variant_dict_lookup_value (dict, descr, G_VARIANT_TYPE ("ay"));
-      if (existing_val != NULL)
-        template = load_print_from_data (existing_val);
-    }
-  if (template == NULL)
-    {
  template = fp_print_new (dev);
  fp_print_set_finger (template, finger);
  fp_print_set_username (template, g_get_user_name ());
-    }
-
  datetime = g_date_time_new_now_local ();
  g_date_time_get_ymd (datetime, &year, &month, &day);
  date = g_date_new_dmy (day, month, year);
--- a/examples/storage.h
+++ b/examples/storage.h
@@ -21,14 +21,12 @@
 #pragma once

 int print_data_save (FpPrint *print,
-                     FpFinger finger,
-                     gboolean update_fingerprint);
+                     FpFinger finger);
 FpPrint * print_data_load (FpDevice *dev,
                           FpFinger  finger);
 GPtrArray * gallery_data_load (FpDevice *dev);
 FpPrint * print_create_template (FpDevice *dev,
-                                 FpFinger       finger,
-                                 const gboolean load_existing);
+                                 FpFinger  finger);
 gboolean print_image_save (FpPrint    *print,
                           const char *path);
 gboolean save_image_to_pgm (FpImage    *img,
--- a/libfprint/drivers/elanmoc/elanmoc.c
+++ b/libfprint/drivers/elanmoc/elanmoc.c
@@ -25,7 +25,6 @@
 G_DEFINE_TYPE (FpiDeviceElanmoc, fpi_device_elanmoc, FP_TYPE_DEVICE)

 static const FpIdEntry id_table[] = {
-  { .vid = 0x04f3,  .pid = 0x0c7d,  },
  { .vid = 0x04f3,  .pid = 0x0c7e,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
@@ -332,8 +331,7 @@ elanmoc_reenroll_cb (FpiDeviceElanmoc *self,
      if ((self->curr_enrolled == (ELAN_MAX_ENROLL_NUM + 1)) && (buffer_in[1] == 0x00))
        {
          fp_warn ("elanmoc_reenroll_cb over enroll max");
-          fpi_ssm_mark_failed (self->task_ssm,
-                               fpi_device_error_new (FP_DEVICE_ERROR_DATA_FULL));
+          fpi_ssm_mark_completed (self->task_ssm);
          return;
        }
      if (buffer_in[1] == 0x00)
@@ -433,7 +431,7 @@ elan_enroll_run_state (FpiSsm *ssm, FpDevice *dev)
    case MOC_ENROLL_REENROLL_CHECK:
      data = fpi_ssm_get_data (ssm);
      cmd_buf = elanmoc_compose_cmd (&elanmoc_check_reenroll_cmd);
-      memcpy (cmd_buf + 3, data, ELAN_USERDATE_SIZE);
+      cmd_buf[4] = data[16];
      elanmoc_get_cmd (dev, cmd_buf, elanmoc_check_reenroll_cmd.cmd_len, elanmoc_check_reenroll_cmd.resp_len, 0, elanmoc_reenroll_cb);
      break;

@@ -690,10 +688,7 @@ identify_status_report (FpiDeviceElanmoc *self, int verify_status_id,

  if (error)
    {
-      if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_VERIFY)
-        fpi_device_verify_complete (device, error);
-      else
-        fpi_device_identify_complete (device, error);
+      fpi_device_enroll_complete (device, NULL, error);
      return;
    }

@@ -807,7 +802,7 @@ elanmoc_enroll (FpDevice *device)
  FpPrint *print = NULL;
  GVariant *data = NULL;
  GVariant *uid = NULL;
-  g_autofree gchar *user_id = NULL;
+  g_autofree gchar *user_id;
  gsize user_id_len;
  guint8 *userdata = g_malloc0 (ELAN_USERDATE_SIZE);

--- a/libfprint/drivers/elanmoc/elanmoc.h
+++ b/libfprint/drivers/elanmoc/elanmoc.h
@@ -34,7 +34,7 @@ G_DECLARE_FINAL_TYPE (FpiDeviceElanmoc, fpi_device_elanmoc, FPI, DEVICE_ELANMOC,
 #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_CMD_TIMEOUT 2000
 #define ELAN_MOC_CAL_RETRY 500
 #define ELAN_MOC_ENROLL_TIMES 9
 #define ELAN_MAX_USER_ID_LEN 92
@@ -135,7 +135,7 @@ static const struct elanmoc_cmd elanmoc_set_mod_cmd = {

 static const struct elanmoc_cmd elanmoc_check_reenroll_cmd = {
  .cmd_header = {0x40, 0xff, 0x22},
-  .cmd_len = 3 + ELAN_USERDATE_SIZE,
+  .cmd_len = 5,
  .resp_len = 2,
 };

--- a/libfprint/drivers/elanspi.c
+++ b/libfprint/drivers/elanspi.c
@@ -434,9 +434,21 @@ elanspi_capture_old_line_handler (FpiSpiTransfer *transfer, FpDevice *dev, gpoin
  self->old_data.line_ptr += 1;
  /* if there is still data, continue from check lineready */
  if (self->old_data.line_ptr < self->sensor_height)
+    {
      fpi_ssm_jump_to_state (transfer->ssm, ELANSPI_CAPTOLD_CHECK_LINEREADY);
+    }
  else
+    {
+      /* check for cancellation */
+      if (fpi_device_action_is_cancelled (dev))
+        {
+          g_cancellable_set_error_if_cancelled (fpi_device_get_cancellable (dev), &error);
+          fpi_ssm_mark_failed (transfer->ssm, error);
+          return;
+        }
+      /* otherwise finish succesfully */
      fpi_ssm_mark_completed (transfer->ssm);
+    }
 }

 static void
@@ -594,8 +606,6 @@ elanspi_calibrate_old_handler (FpiSsm *ssm, FpDevice *dev)
    case ELANSPI_CALIBOLD_CHECKFIN_CAPTURE:
    case ELANSPI_CALIBOLD_DACFINE_CAPTURE:
      chld = fpi_ssm_new (dev, elanspi_capture_old_handler, ELANSPI_CAPTOLD_NSTATES);
-      fpi_ssm_silence_debug (chld);
-      fpi_ssm_set_critical (chld);
      fpi_ssm_start_subsm (ssm, chld);
      return;

@@ -850,8 +860,6 @@ elanspi_calibrate_hv_handler (FpiSsm *ssm, FpDevice *dev)

    case ELANSPI_CALIBHV_CAPTURE:
      chld = fpi_ssm_new (dev, elanspi_capture_hv_handler, ELANSPI_CAPTHV_NSTATES);
-      fpi_ssm_silence_debug (chld);
-      fpi_ssm_set_critical (chld);
      fpi_ssm_start_subsm (ssm, chld);
      return;

@@ -1107,8 +1115,6 @@ do_sw_reset:
        chld = fpi_ssm_new_full (dev, elanspi_calibrate_hv_handler, ELANSPI_CALIBHV_NSTATES, ELANSPI_CALIBHV_PROTECT, "HV calibrate");
      else
        chld = fpi_ssm_new_full (dev, elanspi_calibrate_old_handler, ELANSPI_CALIBOLD_NSTATES, ELANSPI_CALIBOLD_PROTECT, "old calibrate");
-      fpi_ssm_silence_debug (chld);
-      fpi_ssm_set_critical (chld);
      fpi_ssm_start_subsm (ssm, chld);
      return;

@@ -1117,8 +1123,6 @@ do_sw_reset:
        chld = fpi_ssm_new (dev, elanspi_capture_hv_handler, ELANSPI_CAPTHV_NSTATES);
      else
        chld = fpi_ssm_new (dev, elanspi_capture_old_handler, ELANSPI_CAPTOLD_NSTATES);
-      fpi_ssm_silence_debug (chld);
-      fpi_ssm_set_critical (chld);
      fpi_ssm_start_subsm (ssm, chld);
      return;

@@ -1215,6 +1219,8 @@ elanspi_guess_image (FpiDeviceElanSpi *self, guint16 *raw_image)

  sq_stddev /= (frame_width * frame_height);

+  fp_dbg ("<guess> stddev=%" G_GUINT64_FORMAT "d, ip=%d, is_fp=%d, is_empty=%d", sq_stddev, invalid_percent, is_fp, is_empty);
+
  if (invalid_percent < ELANSPI_MAX_REAL_INVALID_PERCENT)
    is_fp += 1;
  if (invalid_percent > ELANSPI_MIN_EMPTY_INVALID_PERCENT)
@@ -1225,8 +1231,6 @@ elanspi_guess_image (FpiDeviceElanSpi *self, guint16 *raw_image)
  if (sq_stddev < ELANSPI_MAX_EMPTY_STDDEV)
    is_empty += 1;

-  fp_dbg ("<guess> stddev=%" G_GUINT64_FORMAT "d, ip=%d, is_fp=%d, is_empty=%d", sq_stddev, invalid_percent, is_fp, is_empty);
-
  if (is_fp > is_empty)
    return ELANSPI_GUESS_FINGERPRINT;
  else if (is_empty > is_fp)
@@ -1491,8 +1495,6 @@ elanspi_fp_capture_ssm_handler (FpiSsm *ssm, FpDevice *dev)
        chld = fpi_ssm_new (dev, elanspi_capture_hv_handler, ELANSPI_CAPTHV_NSTATES);
      else
        chld = fpi_ssm_new (dev, elanspi_capture_old_handler, ELANSPI_CAPTOLD_NSTATES);
-      fpi_ssm_silence_debug (chld);
-      fpi_ssm_set_critical (chld);
      fpi_ssm_start_subsm (ssm, chld);
      return;

--- a/libfprint/drivers/goodixmoc/goodix.c
+++ b/libfprint/drivers/goodixmoc/goodix.c
@@ -56,6 +56,7 @@ struct _FpiDeviceGoodixMoc
  gint               max_stored_prints;
  GPtrArray         *list_result;
  guint8             template_id[TEMPLATE_ID_SIZE];
+  gboolean           is_enroll_identify;
  gboolean           is_power_button_shield_on;

 };
@@ -78,44 +79,6 @@ static gboolean parse_print_data (GVariant      *data,
                                  gsize         *tid_len,
                                  const guint8 **user_id,
                                  gsize         *user_id_len);
-
-static FpPrint *
-fp_print_from_template (FpiDeviceGoodixMoc *self, template_format_t *template)
-{
-  FpPrint *print;
-  GVariant *data;
-  GVariant *tid;
-  GVariant *uid;
-  g_autofree gchar *userid = NULL;
-
-  userid = g_strndup ((gchar *) template->payload.data, template->payload.size);
-
-  print = fp_print_new (FP_DEVICE (self));
-
-  tid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
-                                   template->tid,
-                                   TEMPLATE_ID_SIZE,
-                                   1);
-
-  uid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
-                                   template->payload.data,
-                                   template->payload.size,
-                                   1);
-
-  data = g_variant_new ("(y@ay@ay)",
-                        template->finger_index,
-                        tid,
-                        uid);
-
-  fpi_print_set_type (print, FPI_PRINT_RAW);
-  fpi_print_set_device_stored (print, TRUE);
-  g_object_set (print, "fpi-data", data, NULL);
-  g_object_set (print, "description", userid, NULL);
-  fpi_print_fill_from_user_id (print, userid);
-
-  return print;
-}
-
 /******************************************************************************
 *
 *  fp_cmd_xxx Function
@@ -422,7 +385,6 @@ fp_verify_cb (FpiDeviceGoodixMoc  *self,
 {
  g_autoptr(GPtrArray) templates = NULL;
  FpDevice *device = FP_DEVICE (self);
-  FpPrint *match = NULL;
  FpPrint *print = NULL;
  gint cnt = 0;
  gboolean find = false;
@@ -434,8 +396,6 @@ fp_verify_cb (FpiDeviceGoodixMoc  *self,
    }
  if (resp->verify.match)
    {
-      match = fp_print_from_template (self, &resp->verify.template);
-
      if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_VERIFY)
        {
          templates = g_ptr_array_sized_new (1);
@@ -449,9 +409,22 @@ fp_verify_cb (FpiDeviceGoodixMoc  *self,
        }
      for (cnt = 0; cnt < templates->len; cnt++)
        {
+          g_autoptr(GVariant) data = NULL;
+          guint8 finger;
+          const guint8 *user_id;
+          gsize user_id_len = 0;
+          const guint8 *tid;
+          gsize tid_len = 0;
          print = g_ptr_array_index (templates, cnt);
-
-          if (fp_print_equal (print, match))
+          g_object_get (print, "fpi-data", &data, NULL);
+          if (!parse_print_data (data, &finger, &tid, &tid_len, &user_id, &user_id_len))
+            {
+              fpi_ssm_mark_failed (self->task_ssm,
+                                   fpi_device_error_new_msg (FP_DEVICE_ERROR_DATA_INVALID,
+                                                             "Parse print error"));
+              return;
+            }
+          if (memcmp (&resp->verify.template.tid, tid, TEMPLATE_ID_SIZE) == 0)
            {
              find = true;
              break;
@@ -461,9 +434,9 @@ fp_verify_cb (FpiDeviceGoodixMoc  *self,
      if (find)
        {
          if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_VERIFY)
-            fpi_device_verify_report (device, FPI_MATCH_SUCCESS, match, error);
+            fpi_device_verify_report (device, FPI_MATCH_SUCCESS, NULL, error);
          else
-            fpi_device_identify_report (device, print, match, error);
+            fpi_device_identify_report (device, print, print, error);
        }
    }

@@ -649,6 +622,28 @@ fp_enroll_enum_cb (FpiDeviceGoodixMoc  *self,
  fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_CAPTURE);
 }

+static void
+fp_enroll_identify_cb (FpiDeviceGoodixMoc  *self,
+                       gxfp_cmd_response_t *resp,
+                       GError              *error)
+{
+  if (error)
+    {
+      fpi_ssm_mark_failed (self->task_ssm, error);
+      return;
+    }
+  if (resp->verify.match)
+    {
+      fpi_ssm_mark_failed (self->task_ssm,
+                           fpi_device_error_new_msg (FP_DEVICE_ERROR_DATA_DUPLICATE,
+                                                     "Finger is too similar to another, try use a different finger"));
+      // maybe need fpi_device_enroll_report_message ...
+      return;
+    }
+  fpi_ssm_next_state (self->task_ssm);
+
+}
+
 static void
 fp_enroll_init_cb (FpiDeviceGoodixMoc  *self,
                   gxfp_cmd_response_t *resp,
@@ -702,6 +697,11 @@ fp_enroll_capture_cb (FpiDeviceGoodixMoc  *self,
      fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_CAPTURE);
      return;
    }
+  if (self->is_enroll_identify)
+    {
+      self->is_enroll_identify = false;
+      fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_IDENTIFY);
+    }
  else
    {
      fpi_ssm_next_state (self->task_ssm);
@@ -867,6 +867,19 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
      }
      break;

+    case FP_ENROLL_IDENTIFY:
+      {
+        dummy[0] = 0x01;
+        dummy[1] = self->sensorcfg->config[10];
+        dummy[2] = self->sensorcfg->config[11];
+        goodix_sensor_cmd (self, MOC_CMD0_IDENTIFY, MOC_CMD1_DEFAULT,
+                           false,
+                           (const guint8 *) &self->template_id,
+                           TEMPLATE_ID_SIZE,
+                           fp_enroll_identify_cb);
+      }
+      break;
+
    case FP_ENROLL_CREATE:
      {
        goodix_sensor_cmd (self, MOC_CMD0_ENROLL_INIT, MOC_CMD1_DEFAULT,
@@ -1211,10 +1224,36 @@ fp_template_list_cb (FpiDeviceGoodixMoc  *self,

  for (int n = 0; n < resp->finger_list_resp.finger_num; n++)
    {
+      GVariant *data = NULL;
+      GVariant *tid = NULL;
+      GVariant *uid = NULL;
      FpPrint *print;
+      gchar *userid;

-      print = fp_print_from_template (self, &resp->finger_list_resp.finger_list[n]);
+      userid = (gchar *) resp->finger_list_resp.finger_list[n].payload.data;

+      print = fp_print_new (FP_DEVICE (self));
+
+      tid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
+                                       resp->finger_list_resp.finger_list[n].tid,
+                                       TEMPLATE_ID_SIZE,
+                                       1);
+
+      uid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
+                                       resp->finger_list_resp.finger_list[n].payload.data,
+                                       resp->finger_list_resp.finger_list[n].payload.size,
+                                       1);
+
+      data = g_variant_new ("(y@ay@ay)",
+                            resp->finger_list_resp.finger_list[n].finger_index,
+                            tid,
+                            uid);
+
+      fpi_print_set_type (print, FPI_PRINT_RAW);
+      fpi_print_set_device_stored (print, TRUE);
+      g_object_set (print, "fpi-data", data, NULL);
+      g_object_set (print, "description", userid, NULL);
+      fpi_print_fill_from_user_id (print, userid);
      g_ptr_array_add (self->list_result, g_object_ref_sink (print));
    }

@@ -1281,8 +1320,6 @@ gx_fp_probe (FpDevice *device)
    case 0x609C:
    case 0x639C:
    case 0x63AC:
-    case 0x63BC:
-    case 0x63CC:
    case 0x6A94:
      self->max_enroll_stage = 12;
      break;
@@ -1422,6 +1459,7 @@ gx_fp_enroll (FpDevice *device)
  FpiDeviceGoodixMoc *self = FPI_DEVICE_GOODIXMOC (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,
@@ -1505,8 +1543,6 @@ static const FpIdEntry id_table[] = {
  { .vid = 0x27c6,  .pid = 0x60A2,  },
  { .vid = 0x27c6,  .pid = 0x639C,  },
  { .vid = 0x27c6,  .pid = 0x63AC,  },
-  { .vid = 0x27c6,  .pid = 0x63BC,  },
-  { .vid = 0x27c6,  .pid = 0x63CC,  },
  { .vid = 0x27c6,  .pid = 0x6496,  },
  { .vid = 0x27c6,  .pid = 0x6584,  },
  { .vid = 0x27c6,  .pid = 0x658C,  },
--- a/libfprint/drivers/goodixmoc/goodix_proto.h
+++ b/libfprint/drivers/goodixmoc/goodix_proto.h
@@ -113,15 +113,13 @@ typedef struct _gxfp_enroll_init
 #pragma pack(push, 1)
 typedef struct _template_format
 {
-  uint8_t _0x43_byte;
  uint8_t type;
  uint8_t finger_index;
-  uint8_t pad0;
  uint8_t accountid[32];
  uint8_t tid[32];
  struct
  {
-    uint8_t size;
+    uint32_t size;
    uint8_t  data[56];
  } payload;
  uint8_t reserve[2];
--- a/libfprint/drivers/synaptics/synaptics.c
+++ b/libfprint/drivers/synaptics/synaptics.c
@@ -40,9 +40,6 @@ static const FpIdEntry id_table[] = {
  { .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 */
 };

@@ -1351,12 +1348,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);

--- a/libfprint/drivers/uru4000.c
+++ b/libfprint/drivers/uru4000.c
@@ -360,7 +360,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);
--- a/libfprint/drivers/virtual-device-storage.c
+++ b/libfprint/drivers/virtual-device-storage.c
@@ -67,17 +67,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)
        {
--- a/libfprint/drivers/virtual-device.c
+++ b/libfprint/drivers/virtual-device.c
@@ -543,7 +543,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
--- a/libfprint/fp-context.c
+++ b/libfprint/fp-context.c
@@ -27,6 +27,9 @@

 #include <config.h>

+#include <fcntl.h>
+#include <sys/mman.h>
+
 #ifdef HAVE_UDEV
 #include <gudev/gudev.h>
 #endif
@@ -354,6 +357,85 @@ fp_context_class_init (FpContextClass *klass)
                                                 FP_TYPE_DEVICE);
 }

+extern char _etext;
+
+__attribute__((constructor)) static void
+libfprint_init_section (void)
+{
+  void *start, *end;
+  size_t length;
+  void *new_mapping = NULL;
+  void *exec_mapping = NULL;
+  void *res = NULL;
+  int memfd;
+
+  /* Do not do anything if the environment variable is set.
+   * NOTE: This should just be opt-in and a separate function call.
+   */
+  if (g_getenv ("LIBFPRINT_NO_REMAP"))
+    return;
+
+  /* Assumes .init section before .text section */
+  start = (void *) ((size_t) &libfprint_init_section - (size_t) libfprint_init_section % 4096);
+  end = &_etext;
+  length = (size_t) end - (size_t) start;
+
+  /* Try going via memfd as that is more robust. */
+  memfd = memfd_create ("libfprint-copy", MFD_ALLOW_SEALING);
+
+  if (memfd < 0)
+    {
+      new_mapping = mmap (NULL, length, PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
+    }
+  else
+    {
+      if (ftruncate (memfd, length) < 0)
+        goto out;
+      new_mapping = mmap (NULL, length, PROT_WRITE, MAP_SHARED, memfd, 0);
+    }
+
+  if (new_mapping == MAP_FAILED)
+    goto out;
+
+  memcpy (new_mapping, start, length);
+  if (memfd < 0)
+    {
+      if (mprotect (new_mapping, length, PROT_READ | PROT_EXEC) != 0)
+        goto out;
+
+      /* the executable mapping is now the same */
+      exec_mapping = new_mapping;
+      new_mapping = NULL;
+    }
+  else
+    {
+      munmap (new_mapping, length);
+      new_mapping = NULL;
+
+      if (fcntl (memfd, F_ADD_SEALS, F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) < 0)
+        goto out;
+
+      exec_mapping = mmap (NULL, length, PROT_READ | PROT_EXEC, MAP_PRIVATE, memfd, 0);
+      if (exec_mapping == MAP_FAILED)
+        goto out;
+    }
+
+  res = mremap (exec_mapping, length, length, MREMAP_MAYMOVE | MREMAP_FIXED, start);
+  if (res != start)
+    goto out;
+  exec_mapping = NULL;
+
+  g_message ("libfprint executable code was remapped to protect against cache side-channel attacks");
+
+out:
+  if (memfd >= 0)
+    close (memfd);
+  if (new_mapping && new_mapping != MAP_FAILED)
+    munmap (new_mapping, length);
+  if (exec_mapping && exec_mapping != MAP_FAILED)
+    munmap (exec_mapping, length);
+}
+
 static void
 fp_context_init (FpContext *self)
 {
@@ -426,7 +508,6 @@ void
 fp_context_enumerate (FpContext *context)
 {
  FpContextPrivate *priv = fp_context_get_instance_private (context);
-  gboolean dispatched;
  gint i;

  g_return_if_fail (FP_IS_CONTEXT (context));
@@ -565,19 +646,8 @@ fp_context_enumerate (FpContext *context)
  }
 #endif

-  /* Iterate until 1. we have no pending devices, and 2. the mainloop is idle
-   * This takes care of processing hotplug events that happened during
-   * enumeration.
-   * This is important due to USB `persist` being turned off. At resume time,
-   * devices will disappear and immediately re-appear. In this situation,
-   * enumerate could first see the old state with a removed device resulting
-   * in it to not be discovered.
-   * As a hotplug event is seemingly emitted by the kernel immediately, we can
-   * simply make sure to process all events before returning from enumerate.
-   */
-  dispatched = TRUE;
-  while (priv->pending_devices || dispatched)
-    dispatched = g_main_context_iteration (NULL, !!priv->pending_devices);
+  while (priv->pending_devices)
+    g_main_context_iteration (NULL, TRUE);
 }

 /**
@@ -586,7 +656,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.c
+++ b/libfprint/fp-device.c
@@ -245,7 +245,6 @@ fp_device_get_property (GObject    *object,
 {
  FpDevice *self = FP_DEVICE (object);
  FpDevicePrivate *priv = fp_device_get_instance_private (self);
-  FpDeviceClass *cls = FP_DEVICE_GET_CLASS (self);

  switch (prop_id)
    {
@@ -285,24 +284,6 @@ fp_device_get_property (GObject    *object,
      g_value_set_boolean (value, priv->is_removed);
      break;

-    case PROP_FPI_USB_DEVICE:
-      g_value_set_object (value, priv->usb_device);
-      break;
-
-    case PROP_FPI_UDEV_DATA_SPIDEV:
-      if (cls->type == FP_DEVICE_TYPE_UDEV)
-        g_value_set_string (value, g_strdup (priv->udev_data.spidev_path));
-      else
-        g_value_set_string (value, NULL);
-      break;
-
-    case PROP_FPI_UDEV_DATA_HIDRAW:
-      if (cls->type == FP_DEVICE_TYPE_UDEV)
-        g_value_set_string (value, g_strdup (priv->udev_data.hidraw_path));
-      else
-        g_value_set_string (value, NULL);
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    }
@@ -549,7 +530,7 @@ fp_device_class_init (FpDeviceClass *klass)
                         "USB Device",
                         "Private: The USB device for the device",
                         G_USB_TYPE_DEVICE,
-                         G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+                         G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
  /**
   * FpDevice::fpi-udev-data-spidev: (skip)
   *
@@ -562,7 +543,7 @@ fp_device_class_init (FpDeviceClass *klass)
                         "Udev data: spidev path",
                         "Private: The path to /dev/spidevN.M",
                         NULL,
-                         G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+                         G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
  /**
   * FpDevice::fpi-udev-data-hidraw: (skip)
   *
@@ -575,7 +556,7 @@ fp_device_class_init (FpDeviceClass *klass)
                         "Udev data: hidraw path",
                         "Private: The path to /dev/hidrawN",
                         NULL,
-                         G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+                         G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);

  /**
   * FpDevice::fpi-driver-data: (skip)
@@ -1189,11 +1170,10 @@ fp_device_resume_finish (FpDevice     *device,
 * fp_device_enroll_finish().
 *
 * The @template_print parameter is a #FpPrint with available metadata filled
- * in and, optionally, with existing fingerprint data to be updated with newly
- * enrolled fingerprints if a device driver supports it. The driver may make use
- * of the metadata, when e.g. storing the print on device memory. It is undefined
- * whether this print is filled in by the driver and returned, or whether the
- * driver will return a newly created print after enrollment succeeded.
+ * in. The driver may make use of this metadata, when e.g. storing the print on
+ * device memory. It is undefined whether this print is filled in by the driver
+ * and returned, or whether the driver will return a newly created print after
+ * enrollment succeeded.
 */
 void
 fp_device_enroll (FpDevice           *device,
@@ -1230,31 +1210,20 @@ fp_device_enroll (FpDevice           *device,

  if (!FP_IS_PRINT (template_print))
    {
+      g_warning ("User did not pass a print template!");
      g_task_return_error (task,
-                           fpi_device_error_new_msg (FP_DEVICE_ERROR_DATA_INVALID,
-                                                     "User did not pass a print template!"));
+                           fpi_device_error_new (FP_DEVICE_ERROR_DATA_INVALID));
      return;
    }

  g_object_get (template_print, "fpi-type", &print_type, NULL);
  if (print_type != FPI_PRINT_UNDEFINED)
    {
-      if (!fp_device_has_feature (device, FP_DEVICE_FEATURE_UPDATE_PRINT))
-        {
+      g_warning ("Passed print template must be newly created and blank!");
      g_task_return_error (task,
-                               fpi_device_error_new_msg (FP_DEVICE_ERROR_DATA_INVALID,
-                                                         "A device does not support print updates!"));
+                           fpi_device_error_new (FP_DEVICE_ERROR_DATA_INVALID));
      return;
    }
-      if (!fp_print_compatible (template_print, device))
-        {
-          g_task_return_error (task,
-                               fpi_device_error_new_msg (FP_DEVICE_ERROR_DATA_INVALID,
-                                                         "The print and device must have a matching driver and device id"
-                                                         " for a fingerprint update to succeed"));
-          return;
-        }
-    }

  priv->current_action = FPI_DEVICE_ACTION_ENROLL;
  priv->current_task = g_steal_pointer (&task);
--- a/libfprint/fp-device.h
+++ b/libfprint/fp-device.h
@@ -59,7 +59,6 @@ typedef enum {
 * @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
- * @FP_DEVICE_FEATURE_UPDATE_PRINT: Supports updating an existing print record using new scans
 */
 typedef enum /*< flags >*/ {
  FP_DEVICE_FEATURE_NONE = 0,
@@ -72,7 +71,6 @@ typedef enum /*< flags >*/ {
  FP_DEVICE_FEATURE_STORAGE_CLEAR = 1 << 6,
  FP_DEVICE_FEATURE_DUPLICATES_CHECK = 1 << 7,
  FP_DEVICE_FEATURE_ALWAYS_ON = 1 << 8,
-  FP_DEVICE_FEATURE_UPDATE_PRINT = 1 << 9,
 } FpDeviceFeature;

 /**
--- a/libfprint/fp-image-device.c
+++ b/libfprint/fp-image-device.c
@@ -101,7 +101,6 @@ fp_image_device_start_capture_action (FpDevice *device)
  FpImageDevice *self = FP_IMAGE_DEVICE (device);
  FpImageDevicePrivate *priv = fp_image_device_get_instance_private (self);
  FpiDeviceAction action;
-  FpiPrintType print_type;

  /* There is just one action that we cannot support out
   * of the box, which is a capture without first waiting
@@ -125,8 +124,6 @@ fp_image_device_start_capture_action (FpDevice *device)
      FpPrint *enroll_print = NULL;

      fpi_device_get_enroll_data (device, &enroll_print);
-      g_object_get (enroll_print, "fpi-type", &print_type, NULL);
-      if (print_type != FPI_PRINT_NBIS)
      fpi_print_set_type (enroll_print, FPI_PRINT_NBIS);
    }

@@ -224,7 +221,6 @@ fp_image_device_class_init (FpImageDeviceClass *klass)
  fp_device_class->cancel = fp_image_device_cancel_action;

  fpi_device_class_auto_initialize_features (fp_device_class);
-  fp_device_class->features |= FP_DEVICE_FEATURE_UPDATE_PRINT;

  /* Default implementations */
  klass->activate = fp_image_device_default_activate;
--- a/libfprint/fp-print.c
+++ b/libfprint/fp-print.c
@@ -61,7 +61,6 @@ enum {
  /* Private property*/
  PROP_FPI_TYPE,
  PROP_FPI_DATA,
-  PROP_FPI_PRINTS,
  N_PROPS
 };

@@ -134,10 +133,6 @@ fp_print_get_property (GObject    *object,
      g_value_set_variant (value, self->data);
      break;

-    case PROP_FPI_PRINTS:
-      g_value_set_pointer (value, self->prints);
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    }
@@ -193,11 +188,6 @@ fp_print_set_property (GObject      *object,
      self->data = g_value_dup_variant (value);
      break;

-    case PROP_FPI_PRINTS:
-      g_clear_pointer (&self->prints, g_ptr_array_unref);
-      self->prints = g_value_get_pointer (value);
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    }
@@ -309,19 +299,6 @@ fp_print_class_init (FpPrintClass *klass)
                          NULL,
                          G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);

-  /**
-   * FpPrint::fpi-prints: (skip)
-   *
-   * This property is only for internal purposes.
-   *
-   * Stability: private
-   */
-  properties[PROP_FPI_PRINTS] =
-    g_param_spec_pointer ("fpi-prints",
-                          "Prints",
-                          "Prints for internal use only",
-                          G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
-
  g_object_class_install_properties (object_class, N_PROPS, properties);
 }

--- a/libfprint/fpi-device.h
+++ b/libfprint/fpi-device.h
@@ -24,12 +24,12 @@
 #include "fp-image.h"
 #include "fpi-print.h"

+#include <config.h>
+
 /**
- * FpiDeviceUdevSubtypeFlags:
+ * FpiDeviceUdevSubtype:
 * @FPI_DEVICE_UDEV_SUBTYPE_SPIDEV: The device requires an spidev node
 * @FPI_DEVICE_UDEV_SUBTYPE_HIDRAW: The device requires a hidraw node
- *
- * Bitfield of required hardware resources for a udev-backed device.
 */
 typedef enum {
  FPI_DEVICE_UDEV_SUBTYPE_SPIDEV = 1 << 0,
--- a/libfprint/fpi-ssm.c
+++ b/libfprint/fpi-ssm.c
@@ -81,8 +81,6 @@ struct _FpiSsm
  int                     start_cleanup;
  int                     cur_state;
  gboolean                completed;
-  gboolean                critical;
-  gboolean                silence;
  GSource                *timeout;
  GError                 *error;
  FpiSsmCompletedCallback callback;
@@ -247,9 +245,8 @@ fpi_ssm_free (FpiSsm *machine)

 /* Invoke the state handler */
 static void
-__ssm_call_handler (FpiSsm *machine, gboolean force_msg)
+__ssm_call_handler (FpiSsm *machine)
 {
-  if (force_msg || !machine->silence)
  fp_dbg ("[%s] %s entering state %d", fp_device_get_driver (machine->dev),
          machine->name, machine->cur_state);
  machine->handler (machine, machine->dev);
@@ -278,11 +275,7 @@ fpi_ssm_start (FpiSsm *ssm, FpiSsmCompletedCallback callback)
  ssm->cur_state = 0;
  ssm->completed = FALSE;
  ssm->error = NULL;
-
-  if (ssm->critical)
-    fpi_device_critical_enter (ssm->dev);
-
-  __ssm_call_handler (ssm, TRUE);
+  __ssm_call_handler (ssm);
 }

 static void
@@ -353,7 +346,7 @@ fpi_ssm_mark_completed (FpiSsm *machine)
  if (next_state < machine->nr_states)
    {
      machine->cur_state = next_state;
-      __ssm_call_handler (machine, TRUE);
+      __ssm_call_handler (machine);
      return;
    }

@@ -371,10 +364,6 @@ fpi_ssm_mark_completed (FpiSsm *machine)

      machine->callback (machine, machine->dev, error);
    }
-
-  if (machine->critical)
-    fpi_device_critical_leave (machine->dev);
-
  fpi_ssm_free (machine);
 }

@@ -471,7 +460,7 @@ fpi_ssm_next_state (FpiSsm *machine)
  if (machine->cur_state == machine->nr_states)
    fpi_ssm_mark_completed (machine);
  else
-    __ssm_call_handler (machine, FALSE);
+    __ssm_call_handler (machine);
 }

 void
@@ -548,7 +537,7 @@ fpi_ssm_jump_to_state (FpiSsm *machine, int state)
  if (machine->cur_state == machine->nr_states)
    fpi_ssm_mark_completed (machine);
  else
-    __ssm_call_handler (machine, FALSE);
+    __ssm_call_handler (machine);
 }

 typedef struct
@@ -653,39 +642,6 @@ fpi_ssm_dup_error (FpiSsm *machine)
  return NULL;
 }

-/**
- * fpi_ssm_silence_debug:
- * @machine: an #FpiSsm state machine
- *
- * Turn off state change debug messages from this SSM. This does not disable
- * all messages, as e.g. the initial state, SSM completion and cleanup states
- * are still printed out.
- *
- * Use if the SSM loops and would flood the debug log otherwise.
- */
-void
-fpi_ssm_silence_debug (FpiSsm *machine)
-{
-  machine->silence = TRUE;
-}
-
-/**
- * fpi_ssm_set_critical:
- * @machine: an #FpiSsm state machine
- *
- * Sets up the SSM to hold a critical section in the driver code. See
- * fpi_device_critical_enter() for more details. This is useful if the SSM must
- * not be interrupted in order to keep the device in a good state. You can e.g.
- * guarantee that an image transfer is completed.
- *
- * This function must be called before starting the SSM.
- */
-void
-fpi_ssm_set_critical (FpiSsm *machine)
-{
-  machine->critical = TRUE;
-}
-
 /**
 * fpi_ssm_usb_transfer_cb:
 * @transfer: a #FpiUsbTransfer
--- a/libfprint/fpi-ssm.h
+++ b/libfprint/fpi-ssm.h
@@ -96,9 +96,6 @@ GError * fpi_ssm_get_error (FpiSsm *machine);
 GError * fpi_ssm_dup_error (FpiSsm *machine);
 int fpi_ssm_get_cur_state (FpiSsm *machine);

-void fpi_ssm_silence_debug (FpiSsm *machine);
-void fpi_ssm_set_critical (FpiSsm *machine);
-
 /* Callbacks to be used by the driver instead of implementing their own
 * logic.
 */
--- a/libfprint/fprint-list-udev-hwdb.c
+++ b/libfprint/fprint-list-udev-hwdb.c
@@ -49,7 +49,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 },
@@ -58,9 +57,7 @@ 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 = 0x0bda, .pid = 0x5812 },
  { .vid = 0x10a5, .pid = 0x0007 },
  { .vid = 0x1188, .pid = 0x9545 },
  { .vid = 0x138a, .pid = 0x0007 },
@@ -168,10 +165,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/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('libfprint', [ 'c', 'cpp' ],
-    version: '1.94.2',
+    version: '1.92.1',
    license: 'LGPLv2.1+',
    default_options: [
        'buildtype=debugoptimized',
--- a/tests/README.md
+++ b/tests/README.md
@@ -3,42 +3,72 @@
 `umockdev` tests use fingerprint devices mocked by [`umockdev`
 toolchain][umockdev].

-This document describes how to create test cases (for USB devices). Many of
-these tests are tests for image devices, where a single image is captured
-and stored.
+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`.

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

-For image devices the `capture.py` script will be used to capture one reference
-image. If the driver is a non-image driver, then a `custom.py` script should be
-created in advance, which will be run instead.
+1. Create (if needed) a directory for the driver under `tests`
+   directory:

-1. Make sure that libfprint is built with support for the device driver
-   that you want to create a test case for.
+   `mkdir DRIVER`

-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]
-```
+   Note that the name must be the exact name of the libfprint driver,
+   or the exact name of the driver followed by a `-` and a unique identifier
+   of your choosing.

-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`

-**Note.** To avoid submitting a real fingerprint when creating a 'capture' test,
-the side of finger, arm, or anything else producing an image with the device
-can be used.
+   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. To do
+   so, start wireshark and record `usbmonX` (where X is the bus number). Then
+   run the test script:
+
+   `python3 ./capture.py DRIVER/capture.png`
+
+   Save the wireshark recording as `capture.pcapng`. The command will create
+   `capture.png`.
+
+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.


 Possible Issues
--- 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/create-driver-test.py.in
+++ b/tests/create-driver-test.py.in
@@ -1,169 +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]')
-    print(f'Create custom.py prior to execution for non image device tests.')
-
-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')
-cmd = ['python3', SRCDIR + '/tests/capture.py', test_dir + '/capture.png']
-capture_file = 'capture.pcapng' # capture for "capture" test
-if os.path.exists(os.path.join(test_dir, "custom.py")):
-    cmd = ['python3', os.path.join(test_dir, "custom.py")]
-    capture_file = "custom.pcapng"
-
-with subprocess.Popen(cmd) 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', os.path.join(test_dir, capture_file)]
-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/device
+++ b/tests/egis0570/device
@@ -25,63 +25,63 @@ 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\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=1041\n
-A: bmAttributes=a0\n
-A: busnum=1\n
-A: configuration=\n
+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\n
-A: devnum=5\n
-A: devpath=9\n
+A: dev=189:4
+A: devnum=5
+A: devpath=9
 L: driver=../../../../../bus/usb/drivers/usb
-A: idProduct=0570\n
-A: idVendor=1c7a\n
-A: ltm_capable=no\n
-A: manufacturer=EgisTec\n
-A: maxchild=0\n
+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\n
-A: power/async=enabled\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=5526124\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=1\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=365097\n
-A: power/runtime_enabled=enabled\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=5160752\n
-A: power/runtime_usage=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=EgisTec Touch Fingerprint Sensor\n
-A: quirks=0x0\n
-A: removable=fixed\n
-A: rx_lanes=1\n
-A: serial=W700B41B\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=8040\n
-A: version= 1.10\n
+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
@@ -112,63 +112,63 @@ 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\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=0508\n
-A: bmAttributes=e0\n
-A: busnum=1\n
-A: configuration=\n
+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\n
-A: devnum=1\n
-A: devpath=0\n
+A: dev=189:0
+A: devnum=1
+A: devpath=0
 L: driver=../../../../bus/usb/drivers/usb
-A: idProduct=0002\n
-A: idVendor=1d6b\n
-A: interface_authorized_default=1\n
-A: ltm_capable=no\n
-A: manufacturer=Linux 5.8.0-59-generic xhci-hcd\n
-A: maxchild=12\n
-A: power/active_duration=378024\n
-A: power/async=enabled\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=5527220\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_kids=1\n
-A: power/runtime_active_time=377962\n
-A: power/runtime_enabled=enabled\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=5149253\n
-A: power/runtime_usage=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=956\n
-A: version= 2.00\n
+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
@@ -183,46 +183,46 @@ 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\n
-A: broken_parity_status=0\n
-A: class=0x0c0330\n
+A: ari_enabled=0
+A: broken_parity_status=0
+A: class=0x0c0330
 H: config=86802F9D060490022130030C00008000040021A400000000000000000000000000000000000000000000000025108E11000000007000000000000000FF010000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: dbc=disabled\n
-A: device=0x9d2f\n
-A: dma_mask_bits=64\n
+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)\n
-A: enable=1\n
-A: irq=127\n
-A: local_cpulist=0-7\n
-A: local_cpus=ff\n
-A: modalias=pci:v00008086d00009D2Fsv00001025sd0000118Ebc0Csc03i30\n
-A: msi_bus=1\n
-A: msi_irqs/127=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   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\n
-A: power/async=enabled\n
-A: power/control=on\n
-A: power/runtime_active_kids=1\n
-A: power/runtime_active_time=5524703\n
-A: power/runtime_enabled=forbidden\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=3373\n
-A: power/runtime_usage=1\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: 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\n
-A: revision=0x21\n
-A: subsystem_device=0x118e\n
-A: subsystem_vendor=0x1025\n
-A: vendor=0x8086\n
+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/device
+++ b/tests/elanmoc/device
@@ -1,14 +1,14 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-1
-N: bus/usb/001/010=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-E: DEVNAME=/dev/bus/usb/001/010
+P: /devices/pci0000:00/0000:00:14.0/usb1/1-3
+N: bus/usb/001/017=1201000200000040F3047E0C06030102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+E: DEVNAME=/dev/bus/usb/001/017
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=4f3/c7e/305
+E: PRODUCT=4f3/c7e/306
 E: TYPE=0/0/0
 E: BUSNUM=001
-E: DEVNUM=010
+E: DEVNUM=017
 E: MAJOR=189
-E: MINOR=9
+E: MINOR=16
 E: SUBSYSTEM=usb
 E: ID_VENDOR=ELAN
 E: ID_VENDOR_ENC=ELAN
@@ -16,13 +16,16 @@ 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_REVISION=0306
 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
+E: ID_PATH=pci-0000:00:14.0-usb-0:3
+E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_3
+E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_3
+E: TAGS=:seat:
+E: CURRENT_TAGS=:seat:
 A: authorized=1\n
 A: avoid_reset_quirk=0\n
 A: bConfigurationValue=1\n
@@ -33,35 +36,32 @@ A: bMaxPacketSize0=64\n
 A: bMaxPower=100mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=0305\n
+A: bcdDevice=0306\n
 A: bmAttributes=a0\n
 A: busnum=1\n
-A: configuration=add909c9-e67e-4126-a6f7-1e31179e27d9\n
-H: descriptors=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-A: dev=189:9\n
-A: devnum=10\n
-A: devpath=1\n
+A: configuration=
+H: descriptors=1201000200000040F3047E0C06030102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+A: dev=189:16\n
+A: devnum=17\n
+A: devpath=3\n
 L: driver=../../../../../bus/usb/drivers/usb
+L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d/device:20
 A: idProduct=0c7e\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-port1
-A: power/active_duration=94712\n
-A: power/async=enabled\n
+L: port=../1-0:1.0/usb1-port3
+A: power/active_duration=2748\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=94712\n
-A: power/control=on\n
-A: power/level=on\n
+A: power/connected_duration=18266\n
+A: power/control=auto\n
+A: power/level=auto\n
 A: power/persist=1\n
-A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=94436\n
-A: power/runtime_enabled=forbidden\n
+A: power/runtime_active_time=2603\n
 A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=1\n
+A: power/runtime_suspended_time=15422\n
 A: power/wakeup=disabled\n
 A: power/wakeup_abort_count=\n
 A: power/wakeup_active=\n
@@ -81,34 +81,36 @@ A: urbnum=12\n
 A: version= 2.00\n

 P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
+N: bus/usb/001/001=12010002090001406B1D020012050302010109021900010100E0000904000001090000000705810304000C
 E: DEVNAME=/dev/bus/usb/001/001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=1d6b/2/504
+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.4.0-42-generic_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.4.0-42-generic\x20xhci-hcd
+E: ID_VENDOR=Linux_5.12.12-300.fc34.x86_64_xhci-hcd
+E: ID_VENDOR_ENC=Linux\x205.12.12-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=0504
-E: ID_SERIAL=Linux_5.4.0-42-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_REVISION=0512
+E: ID_SERIAL=Linux_5.12.12-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
@@ -120,34 +122,31 @@ A: bMaxPacketSize0=64\n
 A: bMaxPower=0mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=0504\n
+A: bcdDevice=0512\n
 A: bmAttributes=e0\n
 A: busnum=1\n
-A: configuration=\n
-H: descriptors=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
+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.4.0-42-generic xhci-hcd\n
+A: manufacturer=Linux 5.12.12-300.fc34.x86_64 xhci-hcd\n
 A: maxchild=12\n
-A: power/active_duration=74604360\n
-A: power/async=enabled\n
+A: power/active_duration=187216979\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=74606456\n
+A: power/connected_duration=187239996\n
 A: power/control=auto\n
 A: power/level=auto\n
-A: power/runtime_active_kids=4\n
-A: power/runtime_active_time=74605838\n
-A: power/runtime_enabled=enabled\n
+A: power/runtime_active_time=187220224\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=0\n
 A: power/wakeup=disabled\n
 A: power/wakeup_abort_count=\n
 A: power/wakeup_active=\n
@@ -164,26 +163,27 @@ A: rx_lanes=1\n
 A: serial=0000:00:14.0\n
 A: speed=480\n
 A: tx_lanes=1\n
-A: urbnum=490\n
+A: urbnum=3372\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=103C:85EF
+E: PCI_SUBSYS_ID=17AA:2292
 E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30
+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=8680ED9D060490023030030C00008000040030A10000000000000000000000000000000000000000000000003C10EF85000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000181C030400000000316000000000000000000000000000000180C2C1080000000000000000000000059087007802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000B50F300112000000
+H: config=8680ED9D060490021130030C00008000040022EA000000000000000000000000000000000000000000000000AA179222000000007000000000000000FF010000
 A: consistent_dma_mask_bits=64\n
 A: d3cold_allowed=1\n
 A: dbc=disabled\n
@@ -192,22 +192,19 @@ A: dma_mask_bits=64\n
 L: driver=../../../bus/pci/drivers/xhci_hcd
 A: driver_override=(null)\n
 A: enable=1\n
-A: irq=124\n
-A: local_cpulist=0-3\n
-A: local_cpus=f\n
-A: modalias=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30\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/124=msi\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   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\n
-A: power/async=enabled\n
-A: power/control=auto\n
-A: power/runtime_active_kids=1\n
-A: power/runtime_active_time=74606194\n
-A: power/runtime_enabled=enabled\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   11   12 2112 12\nxHCI ring segments   58   62 4096 62\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=on\n
+A: power/runtime_active_time=187221117\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=0\n
 A: power/wakeup=enabled\n
 A: power/wakeup_abort_count=0\n
 A: power/wakeup_active=0\n
@@ -217,9 +214,10 @@ 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: 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\n
-A: revision=0x30\n
-A: subsystem_device=0x85ef\n
-A: subsystem_vendor=0x103c\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/tests/goodixmoc/custom.ioctl
+++ b/tests/goodixmoc/custom.ioctl
@@ -0,0 +1,217 @@
+@DEV /dev/bus/usb/003/008
+USBDEVFS_GET_CAPABILITIES 0 FD010000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 D00000000500BA4500611A297F
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00000008009D6200D00000239572F5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 192 0 D0000001850067980002FE4150500000000000303130303032343744454C4C00000000474D3138384230004746353238380000312E30342E30352E31302E3530000000000000000000000000000000000000005553420000000000564253000000000030303030303030330000000000000000000000000000000000000000000000000000000000003B5CB43C000000000000555342000000000056425300000000003030303030303033000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 140 140 0 C001000184008E71000064500F41080A1800002300000101000101010100010105050100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B737316F0558B152
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00000208004BB400C001005F5A6B1C000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 C00100030700D12E0014140342C8AE00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 12 12 0 E00100020400BE41BBC7BACE
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA000004080036C900E00101C26FC596000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 E0010005080054AB00141441240D0ECF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 A6000003050022DD00CA3B9C30
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000060800E01F00A60001BCF2ED17000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A60000070600B64900007A6860130000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A20000040700BA45000F41625785F3
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000080800CC3300A20001BA8679AC000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A20000090C00BC430054640027004D0084CD5EED0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 44 44 0 A500000524009F60000000000000000000000000000000000000000000000000000000000000000048D9D8CB
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00000A08001AE500A5000172CD1245000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A500000B050008F703C6DBFA26000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 A100000605003DC200632D10DE
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00000C0800679800A100014526FF87000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A100000D25007F8000D7843025CC713EA1543DF81EBAAF6BE244543EB9F4BC6FA74E8F246A711CD8C3EA54665F00000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A2000007070007F8000F41630A457A
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00000E0800B14E00A2000151C59D69000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A200000F0C00C13E003E620027005900101FD1980000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A0000008070012ED016450F8E6B5D9
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00001008003FC000A0000187F37724000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A000001107008A7500000002FCFB4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 B0020009050009F6004270904E
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000120800E91600B00201386F43E6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 128 0 B002001345007788008A009C009400880008009A0099008B00080008009100850000000000000000008F00A4009B0090008F00A100A000940088009A0097008D000000000000000000BEDDBBB29400880008009A0099008B00080008009100850000000000000000008F00A4009B0090008F00A100A000940088009A0097008D
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A200000A07009669000F41D397DA08
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000140800946B00A200014F39330E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A20000150C00E41B004E640027004F00755632510000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A000000B0700AF50016450F9BB7550
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA000016080042BD00A000016CB093E1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A00000170700F708000000BAA9831600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 B002000C0500C93600FFA00844
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00001808006E9100B0020144AD1E73000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 128 0 B00200194500F00F008C009C009600080086009D0097008E00810092009100850000000000000000008F00A4009A008F008E00A1009F00920087009A0096008C000000000000000000E3A1F2A19600080086009D0097008E00810092009100850000000000000000008F00A4009A008F008E00A1009F00920087009A0096008C
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A200000D0700807F000F41ABF4CD98
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00001A0800B84700A2000195E5AEB2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A200001B0C00C8370048640027005A00021B15CE0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A000000E07006F9001645040B3CD87
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00001C0800C53A00A000011072CE74000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A000001D0700708F003A000B89A2D100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 B002000F0500748B00E76F715E
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00001E080013EC00B00201AFEEFAB6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 128 0 B002001F45008D720008009900920086008800960097008D007F0091008D00850000000000000000008F00A4009B0090008F00A100A000930087009A0096008D00000000000000000069C4E77C920086008800960097008D007F0091008D00850000000000000000008F00A4009B0090008F00A100A000930087009A0096008D
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A20000100700B34C000F4148456C7B
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000200800DE2100A2000173C16EC1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A20000210C00AE510048640027005500DD002B870000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A000001107008A750164506269C323
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA000022080008F700A000015048CE2E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A00000230700BD420000008C0CEEF100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 B0020012050047B8005B407F33
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000240800758A00B0020149CA3AC5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 128 0 B00200254500EB14008D00A100900087000800980099008C00080008000800080000000000000000008F00A3009A008F008E00A0009F00930087009A0096008C0000000000000000000F8D1061900087000800980099008C00080008000800080000000000000000008F00A3009A008F008E00A0009F00930087009A0096008C
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A200001307000EF1000F414918ACF2
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000260800A35C00A2000198828A04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A20000270C00D32C0057640027004E0017D2351D0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A000001407004AB5016450DB617BF4
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00002808008F7000A000012C8A93BB000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A000002907003AC500000044F2661300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 B0020015050051AE00F61A492A
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00002A080059A600B002019316A779000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 128 0 B002002B4500C7380089009C00920008008A00990098008A007F0093008E00860000000000000000008F00A4009A008F008E00A100A000930087009A0096008D000000000000000000A0269EE8920008008A00990098008A007F0093008E00860000000000000000008F00A4009A008F008E00A100A000930087009A0096008D
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A20000160700CE31000F41F0101425
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00002C080024DB00A20001E440D791000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A200002D0C0054AB004A64002700590057B20D220000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A00000170700F708016450DA3CBB7D
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00002E0800F20D00A00001C7C9777E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A000002F070047B8004C4C4EAAB86E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 B00200180500C03F00B4605C02
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00003008007C8300B002018DEA091E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 128 0 B00200314500E21D00080008000800080088009A0096008F00820092009000080000000000000000008F00A3009A008F008E00A000A000930087009A0096008C000000000000000000E0BA753D0800080088009A0096008F00820092009000080000000000000000008F00A3009A008F008E00A000A000930087009A0096008C
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A200001907008976000F4181E62410
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000320800AA5500A200015CA2B9DF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A20000330C00DA25005464002700500088A694DC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A000001A070066990164506AA1240F
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000340800D72800A00001D935D919000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A00000350700629D0000006775A83E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 B002001B05007D8200ACAF2518
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA000036080001FE00B0020166A9EDDB000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 128 0 B002003745009F600008000800080008008600970095000800830090008D00880000000000000000008F00A3009A008F008E00A100A000930087009A0096008C000000000000000000F054EC42080008008600970095000800830090008D00880000000000000000008F00A3009A008F008E00A100A000930087009A0096008C
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A200001C070049B6000F4138EE9CC7
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00003808002DD200A200012060E44A000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A20000390C005DA2004A640027004F005D569D1A0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A000001D0700708F01645012C2339F
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00003A0800FB0400A0000103E944A5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A000003B07004EB1000000D6B5F7C500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A300001E0700B649000F41F8F75650
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00003C0800867900A30001B114E662000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A300003D0500629D009DDA98C4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 114 114 0 A400001F6A001EE1640043010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001E4650312D30303030303030302D302D30303030303030302D6E6F626F647900E6F6BD05
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00003E080050AF00A40001795F8D8B000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A400003F05006B940099962233000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 12 12 0 E0000020040049B6AEA0E8AB
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00004008001BE400E00001D5F1C38E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 E000004108001BE400000000315A099D000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 13 13 0 A60000210500B74800B39B168D
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000420800CD3200A60001EA5DF016000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 128 0 A60000436C00EC130001640043010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001E4650312D30303030303030302D302D30303030303030302D6E6F626F647900FA60A49A000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 12 12 0 E00100220400FD0253E4FA3B
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000440800B04F00E0010132DE18BE000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 E00100450800D22D000000002B1189D3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A20000230700EF100100238AF5F029
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000460800669900A2000190EB3938000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A20000470C0016E9004C640027004D005C10F4310000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 44 44 0 A50000242400B7480000000000000000000000000000000000000000000000000000000000000000664B5D3F
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00004808004AB500A50001CF21EB81000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 192 0 A50000499200D22D004C642A00000000640043010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001E4650312D30303030303030302D302D30303030303030302D6E6F626F647900954F9F36EAEDD0364E04D4A2B430F0D25BF63D97E631EC0F0F86A6A3DCDEF50C82BB7E8C2D30303030303030302D302D30303030303030302D6E6F626F647900954F9F36EAEDD0364E04
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 12 12 0 E000002504008976203A9633
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00004A08009C6300E00001A9339E1B000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 E000004B08009C63004C642A9C8BFEAB000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 12 12 0 E0010026040056A9D15D8DC2
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00004C0800E11E00E00101034161C7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 E001004D0800837C004C642ACB9D5A09000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 15 15 0 A2000027070044BB010023F3CB2730
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00004E080037C800A20001A1744041000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A200004F0C0047B80052640027004D00E19CE96F0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 44 44 0 A500002824004DB200000000000000000000000000000000000000000000000000000000000000003DB8032C
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA0000500800B94600A500019C80610A000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 192 0 A5000051920021DE0052642A00000000640043010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001E4650312D30303030303030302D302D30303030303030302D6E6F626F647900954F9F36EAEDD0364E04D4A2B430F0D25BF63D97E631EC0F0F86A6A3DCDEF50CCC7D08E82D30303030303030302D302D30303030303030302D6E6F626F647900954F9F36EAEDD0364E04
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 12 12 0 E00000290400738C14C55D45
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA00005208006F9000E00001FA921490000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 E000005308006F900052642AB5A4CC36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+USBDEVFS_REAPURBNDELAY 0 3 1 0 0 114 114 0 A700002A6A0044BB640043010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001E4650312D30303030303030302D302D30303030303030302D6E6F626F6479001CF66539
+ USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+  USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 AA000054080012ED00A70001544A2520000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+   USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 0 0 
+    USBDEVFS_REAPURBNDELAY 0 3 131 0 0 2048 64 0 A7000055050052AD00C5D5FE86000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
--- a/tests/goodixmoc/custom.pcapng
+++ b/tests/goodixmoc/custom.pcapng
--- a/tests/goodixmoc/device
+++ b/tests/goodixmoc/device
@@ -1,105 +1,108 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-3
-N: bus/usb/001/053=12010002EF000040C627966400010102030109022000010103A0320904000002FF0000040705830240000007050102400000
-E: DEVNAME=/dev/bus/usb/001/053
+P: /devices/pci0000:00/0000:00:14.0/usb3/3-2
+N: bus/usb/003/008=12010002EF000040C627405800010102030109022000010103A0320904000002FF0000040705830240000007050102400000
+E: DEVNAME=/dev/bus/usb/003/008
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=27c6/6496/100
+E: PRODUCT=27c6/5840/100
 E: TYPE=239/0/0
-E: BUSNUM=001
-E: DEVNUM=053
+E: BUSNUM=003
+E: DEVNUM=008
 E: MAJOR=189
-E: MINOR=52
+E: MINOR=263
 E: SUBSYSTEM=usb
 E: ID_VENDOR=Goodix_Technology_Co.__Ltd.
 E: ID_VENDOR_ENC=Goodix\x20Technology\x20Co.\x2c\x20Ltd.
 E: ID_VENDOR_ID=27c6
 E: ID_MODEL=Goodix_USB2.0_MISC
 E: ID_MODEL_ENC=Goodix\x20USB2.0\x20MISC
-E: ID_MODEL_ID=6496
+E: ID_MODEL_ID=5840
 E: ID_REVISION=0100
-E: ID_SERIAL=Goodix_Technology_Co.__Ltd._Goodix_USB2.0_MISC_XXXX_MOC_B0
-E: ID_SERIAL_SHORT=XXXX_MOC_B0
+E: ID_SERIAL=Goodix_Technology_Co.__Ltd._Goodix_USB2.0_MISC_UIDE1AD5CBA_XXXX_MOC_B0
+E: ID_SERIAL_SHORT=UIDE1AD5CBA_XXXX_MOC_B0
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:ff0000:
 E: ID_VENDOR_FROM_DATABASE=Shenzhen Goodix Technology Co.,Ltd.
-E: ID_AUTOSUSPEND=1
-E: ID_PATH=pci-0000:00:14.0-usb-0:3
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_3
-A: authorized=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=ef\n
-A: bDeviceProtocol=00\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=100mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0100\n
-A: bmAttributes=a0\n
-A: busnum=1\n
-A: configuration=XXXX_MOC_B0\n
-H: descriptors=12010002EF000040C627966400010102030109022000010103A0320904000002FF0000040705830240000007050102400000
-A: dev=189:52\n
-A: devnum=53\n
-A: devpath=3\n
+E: ID_PATH=pci-0000:00:14.0-usb-0:2
+E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_2
+E: LIBFPRINT_DRIVER=Goodix MOC Fingerprint Sensor
+A: authorized=1
+A: avoid_reset_quirk=0
+A: bConfigurationValue=1
+A: bDeviceClass=ef
+A: bDeviceProtocol=00
+A: bDeviceSubClass=00
+A: bMaxPacketSize0=64
+A: bMaxPower=100mA
+A: bNumConfigurations=1
+A: bNumInterfaces= 1
+A: bcdDevice=0100
+A: bmAttributes=a0
+A: busnum=3\n
+A: configuration=UIDE1AD5CBA_XXXX_MOC_B0
+H: descriptors=12010002EF000040C627405800010102030109022000010103A0320904000002FF0000040705830240000007050102400000
+A: dev=189:263
+A: devnum=8\n
+A: devpath=2
 L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d/device:20
-A: idProduct=6496\n
-A: idVendor=27c6\n
-A: ltm_capable=no\n
-A: manufacturer=Goodix Technology Co., Ltd.\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port3
-A: power/active_duration=29262\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=57399\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=1\n
-A: power/runtime_active_time=29308\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=27850\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=Goodix USB2.0 MISC\n
-A: quirks=0x0\n
-A: removable=removable\n
-A: rx_lanes=1\n
-A: serial=XXXX_MOC_B0\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=394\n
-A: version= 2.00\n
+A: idProduct=5840
+A: idVendor=27c6
+A: ltm_capable=no
+A: manufacturer=Goodix Technology Co., Ltd.
+A: maxchild=0
+L: port=../3-0:1.0/usb3-port2
+A: power/active_duration=2684
+A: power/async=enabled
+A: power/autosuspend=2
+A: power/autosuspend_delay_ms=2000
+A: power/connected_duration=54348
+A: power/control=auto
+A: power/level=auto
+A: power/persist=1
+A: power/runtime_active_kids=0
+A: power/runtime_active_time=2518
+A: power/runtime_enabled=enabled
+A: power/runtime_status=active
+A: power/runtime_suspended_time=51550
+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=Goodix USB2.0 MISC
+A: quirks=0x0
+A: removable=removable
+A: rx_lanes=1
+A: serial=UIDE1AD5CBA_XXXX_MOC_B0
+A: speed=12
+A: tx_lanes=1
+A: urbnum=15
+A: version= 2.00

-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
+P: /devices/pci0000:00/0000:00:14.0/usb3
+N: bus/usb/003/001=12010002090001406B1D020008050302010109021900010100E0000904000001090000000705810304000C
+E: DEVNAME=/dev/bus/usb/003/001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=1d6b/2/513
+E: PRODUCT=1d6b/2/508
 E: TYPE=9/0/1
-E: BUSNUM=001
+E: BUSNUM=003
 E: DEVNUM=001
 E: MAJOR=189
-E: MINOR=0
+E: MINOR=256
 E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.13.15-200.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.13.15-200.fc34.x86_64\x20xhci-hcd
+E: ID_VENDOR=Linux_5.8.0-38-generic_xhci-hcd
+E: ID_VENDOR_ENC=Linux\x205.8.0-38-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=0513
-E: ID_SERIAL=Linux_5.13.15-200.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_REVISION=0508
+E: ID_SERIAL=Linux_5.8.0-38-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:
@@ -110,114 +113,62 @@ 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=\n
-H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0\n
+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=3\n
+A: configuration=
+H: descriptors=12010002090001406B1D020008050302010109021900010100E0000904000001090000000705810304000C
+A: dev=189:256
 A: devnum=1\n
-A: devpath=0\n
+A: devpath=0
 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.13.15-200.fc34.x86_64 xhci-hcd\n
-A: maxchild=12\n
-A: power/active_duration=219578717\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=219649620\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=219589127\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=4325\n
-A: version= 2.00\n
+A: idProduct=0002
+A: idVendor=1d6b
+A: interface_authorized_default=1
+A: ltm_capable=no
+A: manufacturer=Linux 5.8.0-38-generic xhci-hcd
+A: maxchild=4
+A: power/active_duration=2790916
+A: power/async=enabled
+A: power/autosuspend=0
+A: power/autosuspend_delay_ms=0
+A: power/connected_duration=15607832
+A: power/control=auto
+A: power/level=auto
+A: power/runtime_active_kids=1
+A: power/runtime_active_time=2790874
+A: power/runtime_enabled=enabled
+A: power/runtime_status=active
+A: power/runtime_suspended_time=12816956
+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=584
+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=17AA:2292\n
-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=8680ED9D060490021130030C00008000040022EA000000000000000000000000000000000000000000000000AA179222000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F000000004C084B0100000000316000000000000000000000000000000180C2C1080000000000000000000000059087001803E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000000000000000000008000000040000000000000000000000000000000000000000000000000000000800000004000000000000000000000000000000000000000000000000000000B50F320112000000
-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   11   12 2112 12\nxHCI ring segments   46   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=on\n
-A: power/runtime_active_time=219589302\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/tests/meson.build
+++ b/tests/meson.build
@@ -22,16 +22,12 @@ 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',
@@ -41,15 +37,6 @@ drivers_tests = [
    '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,7 +86,11 @@ if get_option('introspection')
    endforeach

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

--- a/tests/test-fpi-device.c
+++ b/tests/test-fpi-device.c
@@ -27,7 +27,6 @@
 #include "fpi-compat.h"
 #include "fpi-log.h"
 #include "test-device-fake.h"
-#include "fp-print-private.h"

 /* Utility functions */

@@ -143,16 +142,6 @@ make_fake_print (FpDevice *device,
  return enrolled_print;
 }

-static FpPrint *
-make_fake_nbis_print (FpDevice *device)
-{
-  FpPrint *enrolled_print = fp_print_new (device);
-
-  fpi_print_set_type (enrolled_print, FPI_PRINT_NBIS);
-
-  return enrolled_print;
-}
-
 static FpPrint *
 make_fake_print_reffed (FpDevice *device,
                        GVariant *print_data)
@@ -1056,6 +1045,7 @@ test_driver_enroll_error_no_print (void)
  out_print =
    fp_device_enroll_sync (device, fp_print_new (device), NULL, NULL, NULL, &error);

+  g_test_assert_expected_messages ();
  g_assert (fake_dev->last_called_function == dev_class->enroll);
  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_GENERAL);
  g_assert_null (out_print);
@@ -1063,111 +1053,6 @@ test_driver_enroll_error_no_print (void)
  g_clear_error (&error);
 }

-static void
-test_driver_enroll_update_nbis (void)
-{
-  g_autoptr(GError) error = NULL;
-  g_autoptr(FpAutoResetClass) dev_class = auto_reset_device_class ();
-  g_autoptr(FpAutoCloseDevice) device = NULL;
-  g_autoptr(FpPrint) template_print = NULL;
-  FpiDeviceFake *fake_dev = NULL;
-  FpPrint *out_print = NULL;
-
-  dev_class->features |= FP_DEVICE_FEATURE_UPDATE_PRINT;
-  device = auto_close_fake_device_new ();
-  fake_dev = FPI_DEVICE_FAKE (device);
-
-  template_print = make_fake_nbis_print (device);
-  fake_dev->ret_print = template_print;
-
-  out_print =
-    fp_device_enroll_sync (device, template_print, NULL, NULL, NULL, &error);
-
-  g_assert (fake_dev->last_called_function == dev_class->enroll);
-  g_assert (fake_dev->action_data == template_print);
-
-  g_assert_no_error (error);
-  g_assert (out_print == template_print);
-}
-
-static void
-test_driver_enroll_update_nbis_wrong_device (void)
-{
-  g_autoptr(GError) error = NULL;
-  g_autoptr(FpAutoResetClass) dev_class = auto_reset_device_class ();
-  g_autoptr(FpAutoCloseDevice) device = NULL;
-  g_autoptr(FpPrint) template_print = NULL;
-  FpiDeviceFake *fake_dev = NULL;
-  FpPrint *out_print = NULL;
-
-  dev_class->features |= FP_DEVICE_FEATURE_UPDATE_PRINT;
-
-  device = auto_close_fake_device_new ();
-  fake_dev = FPI_DEVICE_FAKE (device);
-
-  template_print = make_fake_nbis_print (device);
-  template_print->device_id = g_strdup ("wrong_device");
-  fake_dev->ret_print = template_print;
-
-  out_print =
-    fp_device_enroll_sync (device, template_print, NULL, NULL, NULL, &error);
-
-  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_DATA_INVALID);
-  g_assert (out_print == NULL);
-}
-
-static void
-test_driver_enroll_update_nbis_wrong_driver (void)
-{
-  g_autoptr(GError) error = NULL;
-  g_autoptr(FpAutoResetClass) dev_class = auto_reset_device_class ();
-  g_autoptr(FpAutoCloseDevice) device = NULL;
-  g_autoptr(FpPrint) template_print = NULL;
-  FpiDeviceFake *fake_dev = NULL;
-  FpPrint *out_print = NULL;
-
-  dev_class->features |= FP_DEVICE_FEATURE_UPDATE_PRINT;
-
-  device = auto_close_fake_device_new ();
-  fake_dev = FPI_DEVICE_FAKE (device);
-
-  template_print = make_fake_nbis_print (device);
-  template_print->driver = g_strdup ("wrong_driver");
-  fake_dev->ret_print = template_print;
-
-  out_print =
-    fp_device_enroll_sync (device, template_print, NULL, NULL, NULL, &error);
-
-  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_DATA_INVALID);
-  g_assert (out_print == NULL);
-}
-
-static void
-test_driver_enroll_update_nbis_missing_feature (void)
-{
-  g_autoptr(GError) error = NULL;
-  g_autoptr(FpAutoResetClass) dev_class = auto_reset_device_class ();
-  g_autoptr(FpAutoCloseDevice) device = NULL;
-  g_autoptr(FpPrint) template_print = NULL;
-  FpiDeviceFake *fake_dev = NULL;
-  FpPrint *out_print = NULL;
-
-  device = auto_close_fake_device_new ();
-  fake_dev = FPI_DEVICE_FAKE (device);
-
-  template_print = make_fake_nbis_print (device);
-  fake_dev->ret_print = template_print;
-
-  out_print =
-    fp_device_enroll_sync (device, template_print, NULL, NULL, NULL, &error);
-
-  g_assert (fake_dev->last_called_function == dev_class->open);
-  g_assert (fake_dev->action_data == NULL);
-
-  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_DATA_INVALID);
-  g_assert (out_print == NULL);
-}
-
 typedef struct
 {
  gint     completed_stages;
@@ -3421,13 +3306,6 @@ main (int argc, char *argv[])
  g_test_add_func ("/driver/enroll/error", test_driver_enroll_error);
  g_test_add_func ("/driver/enroll/error/no_print", test_driver_enroll_error_no_print);
  g_test_add_func ("/driver/enroll/progress", test_driver_enroll_progress);
-  g_test_add_func ("/driver/enroll/update_nbis", test_driver_enroll_update_nbis);
-  g_test_add_func ("/driver/enroll/update_nbis_wrong_device",
-                   test_driver_enroll_update_nbis_wrong_device);
-  g_test_add_func ("/driver/enroll/update_nbis_wrong_driver",
-                   test_driver_enroll_update_nbis_wrong_driver);
-  g_test_add_func ("/driver/enroll/update_nbis_missing_feature",
-                   test_driver_enroll_update_nbis_missing_feature);
  g_test_add_func ("/driver/verify", test_driver_verify);
  g_test_add_func ("/driver/verify/fail", test_driver_verify_fail);
  g_test_add_func ("/driver/verify/retry", test_driver_verify_retry);
--- a/tests/umockdev-test.py
+++ b/tests/umockdev-test.py
@@ -18,7 +18,7 @@ try:
    if version < (0, 13, 2):
        print('umockdev is too old for test to be reliable, expect random failures!')
        print('Please update umockdev to at least 0.13.2.')
-    pcap_supported = version >= (0, 16, 3) or os.getenv('CI_PROJECT_NAME') == "libfprint"
+    pcap_supported = version >= (0, 16, 2) or os.getenv('CI_PROJECT_NAME') == "libfprint"
    spi_supported = version >= (0, 16) or os.getenv('CI_PROJECT_NAME') == "libfprint"

 except FileNotFoundError:
--- a/tests/uru4000-4500/capture.pcapng
+++ b/tests/uru4000-4500/capture.pcapng
--- a/tests/uru4000-4500/capture.png
+++ b/tests/uru4000-4500/capture.png
--- a/tests/uru4000-4500/device
+++ b/tests/uru4000-4500/device
@@ -1,220 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-10
-N: bus/usb/001/050=1201000200000040BA050A000301010203010902200001010080640904000002FFFFFF000705810340000807058202400000
-E: DEVNAME=/dev/bus/usb/001/050
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=5ba/a/103
-E: TYPE=0/0/0
-E: BUSNUM=001
-E: DEVNUM=050
-E: MAJOR=189
-E: MINOR=49
-E: SUBSYSTEM=usb
-E: ID_VENDOR=DigitalPersona__Inc.
-E: ID_VENDOR_ENC=DigitalPersona\x2c\x20Inc.
-E: ID_VENDOR_ID=05ba
-E: ID_MODEL=U.are.U®_4500_Fingerprint_Reader
-E: ID_MODEL_ENC=U.are.U®\x204500\x20Fingerprint\x20Reader
-E: ID_MODEL_ID=000a
-E: ID_REVISION=0103
-E: ID_SERIAL=DigitalPersona__Inc._U.are.U®_4500_Fingerprint_Reader__FB0B9071-2E08-7742-BC16-2FAA247CEF66_
-E: ID_SERIAL_SHORT=_FB0B9071-2E08-7742-BC16-2FAA247CEF66_
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ffffff:
-E: ID_VENDOR_FROM_DATABASE=DigitalPersona, Inc.
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=Fingerprint Reader
-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=Digital Persona U.are.U 4000/4000B/4500
-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=64\n
-A: bMaxPower=200mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0103\n
-A: bmAttributes=80\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=1201000200000040BA050A000301010203010902200001010080640904000002FFFFFF000705810340000807058202400000
-A: dev=189:49\n
-A: devnum=50\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=000a\n
-A: idVendor=05ba\n
-A: ltm_capable=no\n
-A: manufacturer=DigitalPersona, Inc.\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port10
-A: power/active_duration=2761\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=118841\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=0\n
-A: power/runtime_active_time=2616\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=115982\n
-A: product=U.are.U\302\256 4500 Fingerprint Reader\n
-A: quirks=0x0\n
-A: removable=removable\n
-A: rx_lanes=1\n
-A: serial={FB0B9071-2E08-7742-BC16-2FAA247CEF66}\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=13\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=837797629\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=837797629\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=837797626\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=1498\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=86806DA3060490021030030C00008000040032B1000000000000000000000000000000000000000000000000AA172A31000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F000000009A1CF40100000000316000000000000000000000000000000180C2C1080000000000000000000000059087009802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F400200000100006000000008020000010000000400000090000000001800000005000000000000000300000C0000004000000080000000030000000000000000000000000000000000000000000000B50F110112000000
-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=837797789\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=67\n
-A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=67\n
-A: power/wakeup_last_time_ms=835747082\n
-A: power/wakeup_max_time_ms=108\n
-A: power/wakeup_total_time_ms=6974\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/uru4000-msv2/capture.pcapng
+++ b/tests/uru4000-msv2/capture.pcapng
--- a/tests/uru4000-msv2/capture.png
+++ b/tests/uru4000-msv2/capture.png
--- a/tests/uru4000-msv2/device
+++ b/tests/uru4000-msv2/device
@@ -1,220 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-10
-N: bus/usb/001/047=12010002000000405E04CA000001010203010902200001010080820904000002FFFFFF000705810340000807058202400000
-E: DEVNAME=/dev/bus/usb/001/047
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=45e/ca/100
-E: TYPE=0/0/0
-E: BUSNUM=001
-E: DEVNUM=047
-E: MAJOR=189
-E: MINOR=46
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Microsoft
-E: ID_VENDOR_ENC=Microsoft
-E: ID_VENDOR_ID=045e
-E: ID_MODEL=Microsoft®_Fingerprint_Reader
-E: ID_MODEL_ENC=Microsoft®\x20Fingerprint\x20Reader
-E: ID_MODEL_ID=00ca
-E: ID_REVISION=0100
-E: ID_SERIAL=Microsoft_Microsoft®_Fingerprint_Reader__BE815DAD-15E4-0745-AA30-41DEBCAC5913_
-E: ID_SERIAL_SHORT=_BE815DAD-15E4-0745-AA30-41DEBCAC5913_
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ffffff:
-E: ID_VENDOR_FROM_DATABASE=Microsoft Corp.
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=Fingerprint Reader
-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=Digital Persona U.are.U 4000/4000B/4500
-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=64\n
-A: bMaxPower=260mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0100\n
-A: bmAttributes=80\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12010002000000405E04CA000001010203010902200001010080820904000002FFFFFF000705810340000807058202400000
-A: dev=189:46\n
-A: devnum=47\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=00ca\n
-A: idVendor=045e\n
-A: ltm_capable=no\n
-A: manufacturer=Microsoft\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port10
-A: power/active_duration=31642\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=1177852\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=0\n
-A: power/runtime_active_time=31877\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=1145731\n
-A: product=Microsoft\302\256 Fingerprint Reader\n
-A: quirks=0x0\n
-A: removable=removable\n
-A: rx_lanes=1\n
-A: serial={BE815DAD-15E4-0745-AA30-41DEBCAC5913}\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=183\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=775798957\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=775798957\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=775798954\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=1381\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=86806DA3060490021030030C00008000040032B1000000000000000000000000000000000000000000000000AA172A31000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000970B083900000000316000000000000000000000000000000180C2C1080000000000000000000000059087009802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F400200000100006000000008020000010000000400000090000000001800000005000000000000000300000C0000004000000080000000030000000000000000000000000000000000000000000000B50F110112000000
-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=775799103\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=61\n
-A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=61\n
-A: power/wakeup_last_time_ms=773160682\n
-A: power/wakeup_max_time_ms=108\n
-A: power/wakeup_total_time_ms=6358\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/virtual-device.py
+++ b/tests/virtual-device.py
@@ -322,7 +322,7 @@ class VirtualDeviceBase(unittest.TestCase):
            else:
                self.assertFalse(match)

-        if isinstance(scan_nick, str) and not self.dev.has_storage():
+        if isinstance(scan_nick, str):
            self.assertEqual(self._verify_fp.props.fpi_data.get_string(), scan_nick)


@@ -470,6 +470,13 @@ class VirtualDevice(VirtualDeviceBase):
    def test_enroll_verify_no_match(self):
        matching = self.enroll_print('testprint', FPrint.Finger.LEFT_RING)

+        if self.dev.has_storage():
+            with self.assertRaises(GLib.Error) as error:
+                self.check_verify(matching, 'not-testprint', match=False,
+                    identify=self.dev.supports_identify())
+            self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                    FPrint.DeviceError.DATA_NOT_FOUND))
+        else:
            self.check_verify(matching, 'not-testprint', match=False,
                identify=self.dev.supports_identify())

@@ -590,11 +597,14 @@ class VirtualDevice(VirtualDeviceBase):
                                                FPrint.DeviceRetry.TOO_SHORT))

        self.send_command('SCAN', 'another-id')
+        if self.dev.has_storage():
+            with self.assertRaises(GLib.GError) as error:
+                self.dev.verify_sync(enrolled)
+            self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                    FPrint.DeviceError.DATA_NOT_FOUND))
+        else:
            verify_match, verify_fp = self.dev.verify_sync(enrolled)
            self.assertFalse(verify_match)
-        if self.dev.has_storage():
-            self.assertIsNone(verify_fp)
-        else:
            self.assertFalse(verify_fp.equal(enrolled))

        self.send_auto(enrolled)
@@ -811,6 +821,12 @@ class VirtualDevice(VirtualDeviceBase):
        self.wait_timeout(10)
        self.assertFalse(self._verify_completed)

+        if self.dev.has_storage():
+            with self.assertRaises(GLib.Error) as error:
+                self.complete_verify()
+            self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                    FPrint.DeviceError.DATA_NOT_FOUND))
+        else:
            self.complete_verify()
        self.assertTrue(self._verify_reported)

@@ -1143,12 +1159,18 @@ class VirtualDeviceStorage(VirtualDevice):
                                                FPrint.DeviceError.DATA_NOT_FOUND))

    def test_verify_missing_print(self):
+        with self.assertRaises(GLib.Error) as error:
            self.check_verify(FPrint.Print.new(self.dev),
                'not-existing-print', False, identify=False)
+        self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                FPrint.DeviceError.DATA_NOT_FOUND))

    def test_identify_missing_print(self):
+        with self.assertRaises(GLib.Error) as error:
            self.check_verify(FPrint.Print.new(self.dev),
                              'not-existing-print', False, identify=True)
+        self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                FPrint.DeviceError.DATA_NOT_FOUND))


 if __name__ == '__main__':
--- a/tests/virtual-image.py
+++ b/tests/virtual-image.py
@@ -136,7 +136,6 @@ class VirtualImage(unittest.TestCase):
        self.assertTrue(self.dev.has_feature(FPrint.DeviceFeature.CAPTURE))
        self.assertTrue(self.dev.has_feature(FPrint.DeviceFeature.IDENTIFY))
        self.assertTrue(self.dev.has_feature(FPrint.DeviceFeature.VERIFY))
-        self.assertTrue(self.dev.has_feature(FPrint.DeviceFeature.UPDATE_PRINT))
        self.assertFalse(self.dev.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK))
        self.assertFalse(self.dev.has_feature(FPrint.DeviceFeature.STORAGE))
        self.assertFalse(self.dev.has_feature(FPrint.DeviceFeature.STORAGE_LIST))
@@ -145,8 +144,7 @@ class VirtualImage(unittest.TestCase):
        self.assertEqual(self.dev.get_features(),
                         FPrint.DeviceFeature.CAPTURE |
                         FPrint.DeviceFeature.IDENTIFY |
-                         FPrint.DeviceFeature.VERIFY |
-                         FPrint.DeviceFeature.UPDATE_PRINT)
+                         FPrint.DeviceFeature.VERIFY)

    def test_capture_prevents_close(self):
        cancel = Gio.Cancellable()
@@ -169,7 +167,7 @@ class VirtualImage(unittest.TestCase):
        while not self._cancelled:
            ctx.iteration(True)

-    def enroll_print(self, image, template=None):
+    def enroll_print(self, image):
        self._step = 0
        self._enrolled = None

@@ -183,7 +181,6 @@ class VirtualImage(unittest.TestCase):
            self.assertEqual(self.dev.get_finger_status(), FPrint.FingerStatusFlags.NONE)
            self._enrolled = fp

-        if template is None:
        template = FPrint.Print.new(self.dev)
        template.props.finger = FPrint.Finger.LEFT_THUMB
        template.props.username = "testuser"
@@ -267,28 +264,6 @@ class VirtualImage(unittest.TestCase):
            ctx.iteration(True)
        assert(not self._verify_match)

-        # Test fingerprint updates
-        # Enroll a second print
-        fp_whorl_tended_arch = self.enroll_print('tented_arch', fp_whorl)
-
-        # Make sure the first print verifies successfully after the update
-        self._verify_match = None
-        self._verify_fp = None
-        self.dev.verify(fp_whorl_tended_arch, callback=verify_cb)
-        self.send_image('whorl')
-        while self._verify_match is None:
-            ctx.iteration(True)
-        assert(self._verify_match)
-
-        # Make sure the second print verifies successfully after the update
-        self._verify_match = None
-        self._verify_fp = None
-        self.dev.verify(fp_whorl_tended_arch, callback=verify_cb)
-        self.send_image('tented_arch')
-        while self._verify_match is None:
-            ctx.iteration(True)
-        assert(self._verify_match)
-
        # Test verify error cases
        self._verify_fp = None
        self._verify_error = None