print: Reject enroll images that can't be matched

If the score of a print matching itself is too low to match, then reject it. It can never match and it is therefore completely useless. Also change this into a non-fatal error, the user is free to retry the enroll step in the hope that more minutiae is found (e.g. longer swipe).
2025-11-15 07:38:12 +00:00 · 2022-05-17 19:16:32 +00:00
111 changed files with 778 additions and 11360 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,36 +1,20 @@
 include:
  - local: '.gitlab-ci/libfprint-image-variables.yaml'
  - local: '.gitlab-ci/libfprint-templates.yaml'
  - project: 'freedesktop/ci-templates'
    ref: master
    file: '/templates/fedora.yml'
  - remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/master/flatpak/flatpak_ci_initiative.yml'
 default:
  # Auto-retry jobs in case of infra failures
  retry:
    max: 1
    when:
      - 'runner_system_failure'
      - 'stuck_or_timeout_failure'
      - 'scheduler_failure'
      - 'api_failure'
 variables:
  extends: .libfprint_common_variables
-  FDO_DISTRIBUTION_TAG: $LIBFPRINT_IMAGE_TAG
+  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"
 workflow:
  rules:
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
    - if: $CI_PIPELINE_SOURCE == 'push'
 stages:
  - image-build
  - check-source
  - build
  - test
@@ -41,16 +25,16 @@ image: $FEDORA_IMAGE
 .build_one_driver_template: &build_one_driver
  script:
    # Build with a driver that doesn't need imaging, or nss
-    - meson setup _build --werror -Ddrivers=$driver
+    - meson --werror -Ddrivers=$driver . _build
-    - meson compile -C _build
+    - ninja -C _build
    - rm -rf _build/
 .build_template: &build
  script:
    # And build with everything
-    - meson setup _build --werror -Ddrivers=all
+    - meson --werror -Ddrivers=all . _build
-    - meson compile -C _build
+    - ninja -C _build
-    - meson install -C _build
+    - ninja -C _build install
 .build_template: &check_abi
  script:
@@ -79,16 +63,12 @@ test:
    variables:
      - $CI_PIPELINE_SOURCE == "schedule"
  script:
-    - meson setup _build --werror -Ddrivers=all -Db_coverage=true
+    - meson --werror -Ddrivers=all -Db_coverage=true . _build
    - ninja -C _build
    - meson test -C _build --print-errorlogs --no-stdsplit --timeout-multiplier 3
    - ninja -C _build coverage
-    - cat _build/meson-logs/coverage.txt || true
+    - cat _build/meson-logs/coverage.txt
  artifacts:
    reports:
      junit: "_build/meson-logs/testlog.junit.xml"
      coverage_report:
        coverage_format: cobertura
        path: _build/meson-logs/coverage.xml
    expose_as: 'Coverage Report'
    when: always
    paths:
@@ -103,12 +83,10 @@ test_valgrind:
    variables:
      - $CI_PIPELINE_SOURCE == "schedule"
  script:
-    - meson setup _build -Ddrivers=all
+    - meson -Ddrivers=all . _build
-    - meson compile -C _build
+    - ninja -C _build
    - meson test -C _build --print-errorlogs --no-stdsplit --setup=valgrind
  artifacts:
    reports:
      junit: "_build/meson-logs/testlog-valgrind.junit.xml"
    expose_as: 'Valgrind test logs'
    when: always
    paths:
@@ -116,29 +94,6 @@ test_valgrind:
      - _build/meson-logs/testlog-valgrind.txt
    expire_in: 1 week
 test_installed:
  stage: test
  except:
    variables:
      - $CI_PIPELINE_SOURCE == "schedule"
  script:
    - meson setup _build --prefix=/usr -Ddrivers=all
    - meson install -C _build
    - mv _build _build_dir
    - rm -rf tests
    - gnome-desktop-testing-runner --list libfprint-2
    - gnome-desktop-testing-runner libfprint-2
        --report-directory=_installed-tests-report/failed/
        --log-directory=_installed-tests-report/logs/
        --parallel=0
  artifacts:
    expose_as: 'GNOME Tests Runner logs'
    when: always
    paths:
      - _build_dir/meson-logs
      - _installed-tests-report
    expire_in: 1 week
 test_scan_build:
  stage: test
@@ -147,12 +102,10 @@ test_scan_build:
      - $CI_PIPELINE_SOURCE == "schedule"
  allow_failure: true
  script:
-    - meson setup _build -Ddrivers=all
+    - meson -Ddrivers=all . _build
    # Wrapper to add --status-bugs and disable malloc checker
-    - SCANBUILD=$CI_PROJECT_DIR/.gitlab-ci/scan-build
+    - SCANBUILD=$CI_PROJECT_DIR/.gitlab-ci/scan-build ninja -C _build scan-build
      ninja -C _build scan-build
  artifacts:
    when: on_failure
    paths:
      - _build/meson-logs
    expire_in: 1 week
@@ -165,7 +118,7 @@ test_indent:
  script:
    - scripts/uncrustify.sh
    - git diff
-    - git diff-index --name-only --exit-code HEAD
+    - "! git status -s | grep -q ."
 test_unsupported_list:
  stage: check-source
@@ -178,45 +131,36 @@ test_unsupported_list:
 flatpak:
  stage: flatpak
-  extends: .flatpak@x86_64
+  extends: .flatpak
  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.36
  variables:
    MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json"
    FLATPAK_MODULE: "libfprint"
    APP_ID: "org.freedesktop.libfprint.Demo"
    BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
    RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
  # Build with any builder
  tags: []
  rules:
    - if: '$CI_PROJECT_PATH != "libfprint/libfprint"'
-      when: manual
+      when: never
      allow_failure: true
    - if: '$CI_PIPELINE_SOURCE == "schedule"'
      when: never
    - if: '$CI_COMMIT_BRANCH == "master"'
      allow_failure: true
      when: always
    - if: '$CI_COMMIT_TAG'
      allow_failure: true
      when: always
    # For any other (commit), allow manual run.
    # This excludes MRs which would create a duplicate pipeline
    - if: '$CI_COMMIT_BRANCH'
      when: manual
      allow_failure: true
    - if: '$CI_MERGE_REQUEST_ID'
      when: manual
      allow_failure: true
 # CONTAINERS creation stage
-.container_fedora_build_base:
+container_fedora_build:
  extends: .fdo.container-build@fedora
  stage: image-build
  only:
    variables:
-      - $CI_PIPELINE_SOURCE == "never"
+      - $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
@@ -224,35 +168,7 @@ flatpak:
      libpcap-devel
      libudev-devel
    FDO_DISTRIBUTION_EXEC: |
-      $LIBFPRINT_EXEC
+      git clone https://github.com/martinpitt/umockdev.git && \
-
+        cd umockdev && \
-.container_fedora_build_forced:
+        meson _build --prefix=/usr && \
-  variables:
+        ninja -C _build && ninja -C _build install
    FDO_FORCE_REBUILD: 1
 container_fedora_build_schedule:
  extends:
    - .container_fedora_build_base
    - .container_fedora_build_forced
  only:
    variables:
      - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
 container_fedora_build_manual:
  extends:
    - .container_fedora_build_base
    - .container_fedora_build_forced
  only:
    variables:
      - $LIBFPRINT_CI_ACTION == "build-image"
 container_fedora_build_on_deps_changed:
  extends: .container_fedora_build_base
  only:
    variables:
      - $CI_PROJECT_NAMESPACE == "libfprint" && $CI_PIPELINE_SOURCE != "schedule"
    refs:
      - branches
      - merge_requests
    changes:
      - .gitlab-ci/libfprint-image-variables.yaml
--- a/.gitlab-ci/libfprint-image-variables.yaml
+++ b/.gitlab-ci/libfprint-image-variables.yaml
@@ -1,2 +0,0 @@
 variables:
  LIBFPRINT_IMAGE_TAG: v3
--- a/.gitlab-ci/libfprint-templates.yaml
+++ b/.gitlab-ci/libfprint-templates.yaml
@@ -1,10 +1,6 @@
 # Bump image version on .gitlab-ci/libfprint-image-variables.yaml to trigger
 # a rebuild on changes to this file
 .libfprint_common_variables:
  LIBFPRINT_DEPENDENCIES:
    doxygen
    dnf-plugins-core
    flatpak-builder
    gcc
    gcc-c++
@@ -13,7 +9,6 @@
    glib2-devel
    glibc-devel
    gobject-introspection-devel
    gnome-desktop-testing
    gtk-doc
    gtk3-devel
    libabigail
@@ -32,18 +27,3 @@
    valgrind
    clang-analyzer
    diffutils
  LIBFPRINT_EXEC: |
    dnf -y install dnf-utils
    debuginfo-install -y \
      glib2 \
      glibc \
      libgusb \
      libusb \
      nss \
      pixman
    git clone https://github.com/martinpitt/umockdev.git && \
        cd umockdev && \
        meson _build --prefix=/usr && \
        ninja -C _build && ninja -C _build install
--- a/57
+++ b/57
@@ -1,59 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.
 2024-02-20: v1.94.7 release
 Highlights:
 * synaptics: fix enroll identify problem after user reset database.
 * synaptics: New PIDs 0x0173, 0x0106, 0x0124.
 * goodixmoc: New PID 0x6582.
 * build: Do not require bash to build, only posix sh.
 * fp-image: Simplify minutiae detection tasks.
 * GLib 2.68 is now required to build libfprint.
 New drivers:
 * realtek (PID 0x5813).
 * focaltech_moc (PIDs 0x9E48, 0xD979, 0xA959).
 * egismoc (PIDs 0x0582, 0x05a1).
 2023-08-17: v1.94.6 release
 Highlights:
 * goodixmoc: New PIDs 0x60A4, 0x60BC, 0x6092, 0x633C and 0x6304.
 * goodixmoc: Fix missing "enroll create" state.
 * elanmoc: New PID 0x0C99.
 * upektc: Improve compatibility with sensors 147e:2016.
 * aes4000: Actually support 08FF:5501 devices.
 * virtual-device-listener: Fix failing tests with GLib 2.76
 * tests: Add installed tests
 Bugs fixed:
 * #526 libfprint: fpcmoc: use after free if enrollment or identification is
   cancelled (Vasily Khoruzhick)
 2022-10-13: v1.94.5 release
 Highlights:
 * New driver: fpcmoc, supporting various FPC MOC Fingerprint Sensors
 * goodixmoc: New PIDs 0x6014, 0x6094, 0x631C, 0x634C, 0x6384, 0x659A.
 * goodixmoc: Support resetting device on firmware failure due to corrupted DB.
 * elanmoc: New PIDs 0x0c88, 0x0c8c, 0x0c8d.
 * synaptics: New PID 0x0104.
 * upektc: New PID 0x2017.
 * Fixed various memory leaks
 * More tests
 2022-05-24: v1.94.4 release
 Highlights:
 * synaptics: New PIDs 0x0168, 0x015f
 * elan: New PID 0x0c4b
 * elanspi: New PID 0x241f
 * synaptics: Minor fix to interrupt transfer resubmission
 * Avoid sysfs writes if value is already expected
 * Improvements to the testing setup
 * Fixes to the internal critical section API
 2021-11-02: v1.94.3 release
 Highlights:
@@ -372,7 +319,7 @@ tests of the drivers using umockdev.
  - Mark fp_dscv_print functions as deprecated
 * Udev rules:
-  - Add some unsupported devices to the allowlist
+  - Add some unsupported devices to the whitelist
 2017-05-14: v0.7.0 release
 * Drivers:
@@ -422,7 +369,7 @@ tests of the drivers using umockdev.
  - Fix possible race condition, and cancellation in uru4000 driver
 * Udev rules:
-  - Add Microsoft keyboard to the suspend denylist
+  - Add Microsoft keyboard to the suspend blacklist
 * Plenty of build fixes
--- a/README.md
+++ b/README.md
@@ -1,86 +1,54 @@
 # libfprint
-
+libfprint is part of the fprint project:
-<div align="center">
+https://fprint.freedesktop.org/
 # LibFPrint
 *LibFPrint is part of the **[FPrint][Website]** project.*
 <br/>
 [![Button Website]][Website]
 [![Button Documentation]][Documentation]
 [![Button Supported]][Supported]
 [![Button Unsupported]][Unsupported]
 [![Button Contribute]][Contribute]
 [![Button Contributors]][Contributors]
 </div>
 ## History
-**LibFPrint** was originally developed as part of an
+libfprint was originally developed as part of an academic project at the
-academic project at the **[University Of Manchester]**.
+University of Manchester with the aim of hiding differences between different
 consumer fingerprint scanners and providing a single uniform API to application
 developers. The ultimate goal of the fprint project is to make fingerprint
 scanners widely and easily usable under common Linux environments.
-It aimed to hide the differences between consumer
+The academic university project runs off a codebase maintained separately
-fingerprint scanners and provide a single uniform
+from this one, although I try to keep them as similar as possible (I'm not
-API to application developers.
+hiding anything in the academic branch, it's just the open source release
-
+contains some commits excluded from the academic project).
 ## Goal
 The ultimate goal of the **FPrint** project is to make
 fingerprint scanners widely and easily usable under
 common Linux environments.
 ## License
-`Section 6` of the license states that for compiled works that use
+THE UNIVERSITY OF MANCHESTER DOES NOT ENDORSE THIS THIS SOFTWARE RELEASE AND
-this library, such works must include **LibFPrint** copyright notices
+IS IN NO WAY RESPONSIBLE FOR THE CODE CONTAINED WITHIN, OR ANY DAMAGES CAUSED
-alongside the copyright notices for the other parts of the work.
+BY USING OR DISTRIBUTING THE SOFTWARE. Development does not happen on
 university computers and the project is not hosted at the university either.
-**LibFPrint** includes code from **NIST's** **[NBIS]** software distribution.
+For more information on libfprint, supported devices, API documentation, etc.,
 see the homepage:
 https://fprint.freedesktop.org/
-We include **Bozorth3** from the **[US Export Controlled]**
+libfprint is licensed under the GNU LGPL version 2.1. See the COPYING file
-distribution, which we have determined to be fine
+for the license text.
 being shipped in an open source project.
-<br/>
+Section 6 of the license states that for compiled works that use this
 library, such works must include libfprint copyright notices alongside the
 copyright notices for the other parts of the work. We have attempted to
 make this process slightly easier for you by grouping these all in one place:
 the AUTHORS file.
-<div align="right">
+libfprint includes code from NIST's NBIS software distribution:
 http://fingerprint.nist.gov/NBIS/index.html
 We include bozorth3 from the US export controlled distribution. We have
 determined that it is fine to ship bozorth3 in an open source project,
 see https://fprint.freedesktop.org/us-export-control.html
-[![Badge License]][License]
+## Historical links
-</div>
+Older versions of libfprint are available at:
 https://sourceforge.net/projects/fprint/files/
 Historical mailing-list archives:
 http://www.reactivated.net/fprint_list_archives/
-<!----------------------------------------------------------------------------->
+Historical website:
-
+http://web.archive.org/web/*/https://www.freedesktop.org/wiki/Software/fprint/
 [Documentation]: https://fprint.freedesktop.org/libfprint-dev/
 [Contributors]: https://gitlab.freedesktop.org/libfprint/libfprint/-/graphs/master
 [Unsupported]: https://gitlab.freedesktop.org/libfprint/wiki/-/wikis/Unsupported-Devices
 [Supported]: https://fprint.freedesktop.org/supported-devices.html
 [Website]: https://fprint.freedesktop.org/
 [Contribute]: ./HACKING.md
 [License]: ./COPYING
 [University Of Manchester]: https://www.manchester.ac.uk/
 [US Export Controlled]: https://fprint.freedesktop.org/us-export-control.html
 [NBIS]: http://fingerprint.nist.gov/NBIS/index.html
 <!---------------------------------[ Badges ]---------------------------------->
 [Badge License]: https://img.shields.io/badge/License-LGPL2.1-015d93.svg?style=for-the-badge&labelColor=blue
 <!---------------------------------[ Buttons ]--------------------------------->
 [Button Documentation]: https://img.shields.io/badge/Documentation-04ACE6?style=for-the-badge&logoColor=white&logo=BookStack
 [Button Contributors]: https://img.shields.io/badge/Contributors-FF4F8B?style=for-the-badge&logoColor=white&logo=ActiGraph
 [Button Unsupported]: https://img.shields.io/badge/Unsupported_Devices-EF2D5E?style=for-the-badge&logoColor=white&logo=AdBlock
 [Button Contribute]: https://img.shields.io/badge/Contribute-66459B?style=for-the-badge&logoColor=white&logo=Git
 [Button Supported]: https://img.shields.io/badge/Supported_Devices-428813?style=for-the-badge&logoColor=white&logo=AdGuard
 [Button Website]: https://img.shields.io/badge/Homepage-3B80AE?style=for-the-badge&logoColor=white&logo=freedesktopDotOrg
--- a/data/autosuspend.hwdb
+++ b/data/autosuspend.hwdb
@@ -67,7 +67,7 @@ usb:v08FFp5731*
 ID_PERSIST=0
 # Supported by libfprint driver aes4000
-usb:v08FFp5501*
+usb:v5501p08FF*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
@@ -77,12 +77,6 @@ usb:v1C7Ap0571*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
 # Supported by libfprint driver egismoc
 usb:v1C7Ap0582*
 usb:v1C7Ap05A1*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
 # Supported by libfprint driver elan
 usb:v04F3p0903*
 usb:v04F3p0907*
@@ -152,10 +146,6 @@ usb:v04F3p0C58*
 usb:v04F3p0C7D*
 usb:v04F3p0C7E*
 usb:v04F3p0C82*
 usb:v04F3p0C88*
 usb:v04F3p0C8C*
 usb:v04F3p0C8D*
 usb:v04F3p0C99*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
@@ -164,47 +154,19 @@ usb:v1C7Ap0603*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
 # Supported by libfprint driver focaltech_moc
 usb:v2808p9E48*
 usb:v2808pD979*
 usb:v2808pA959*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
 # Supported by libfprint driver fpcmoc
 usb:v10A5pFFE0*
 usb:v10A5pA305*
 usb:v10A5pDA04*
 usb:v10A5pD805*
 usb:v10A5pD205*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
 # Supported by libfprint driver goodixmoc
 usb:v27C6p5840*
 usb:v27C6p6014*
 usb:v27C6p6092*
 usb:v27C6p6094*
 usb:v27C6p609C*
 usb:v27C6p60A2*
 usb:v27C6p60A4*
 usb:v27C6p60BC*
 usb:v27C6p6304*
 usb:v27C6p631C*
 usb:v27C6p633C*
 usb:v27C6p634C*
 usb:v27C6p6384*
 usb:v27C6p639C*
 usb:v27C6p63AC*
 usb:v27C6p63BC*
 usb:v27C6p63CC*
 usb:v27C6p6496*
 usb:v27C6p6582*
 usb:v27C6p6584*
 usb:v27C6p658C*
 usb:v27C6p6592*
 usb:v27C6p6594*
 usb:v27C6p659A*
 usb:v27C6p659C*
 usb:v27C6p6A94*
 ID_AUTOSUSPEND=1
@@ -215,11 +177,6 @@ usb:v298Dp1010*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
 # Supported by libfprint driver realtek
 usb:v0BDAp5813*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
 # Supported by libfprint driver synaptics
 usb:v06CBp00BD*
 usb:v06CBp00DF*
@@ -230,14 +187,9 @@ usb:v06CBp0100*
 usb:v06CBp00F0*
 usb:v06CBp0103*
 usb:v06CBp0123*
 usb:v06CBp0124*
 usb:v06CBp0126*
 usb:v06CBp0129*
 usb:v06CBp0168*
 usb:v06CBp015F*
 usb:v06CBp0104*
 usb:v06CBp0173*
 usb:v06CBp0106*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
@@ -250,7 +202,6 @@ usb:v147Ep1001*
 # Supported by libfprint driver upektc
 usb:v0483p2015*
 usb:v0483p2017*
 usb:v147Ep3001*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
@@ -306,24 +257,12 @@ usb:v138Ap0091*
 ID_PERSIST=0
 # Known unsupported devices
 usb:v047Dp00F2*
 usb:v04E8p730B*
 usb:v04F3p036B*
 usb:v04F3p0C00*
 usb:v04F3p0C4C*
 usb:v04F3p0C57*
 usb:v04F3p0C5E*
 usb:v04F3p0C5A*
 usb:v04F3p0C6C*
 usb:v04F3p0C70*
 usb:v04F3p0C72*
 usb:v04F3p0C77*
 usb:v04F3p2706*
 usb:v04F3p3032*
 usb:v04F3p3057*
 usb:v04F3p3104*
 usb:v04F3p310D*
 usb:v04F3p3128*
 usb:v06CBp0081*
 usb:v06CBp0088*
 usb:v06CBp008A*
@@ -340,7 +279,6 @@ usb:v06CBp00C9*
 usb:v06CBp00D8*
 usb:v06CBp00DA*
 usb:v06CBp00DC*
 usb:v06CBp00E4*
 usb:v06CBp00E7*
 usb:v06CBp00E9*
 usb:v06CBp00FD*
@@ -356,8 +294,6 @@ usb:v0A5Cp5845*
 usb:v0BDAp5812*
 usb:v10A5p0007*
 usb:v10A5p9200*
 usb:v10A5p9800*
 usb:v10A5pE340*
 usb:v1188p9545*
 usb:v138Ap0007*
 usb:v138Ap003A*
@@ -370,45 +306,33 @@ usb:v138Ap0094*
 usb:v138Ap0097*
 usb:v138Ap009D*
 usb:v138Ap00AB*
 usb:v138Ap00A6*
 usb:v147Ep1002*
 usb:v1491p0088*
 usb:v16D1p1027*
 usb:v1C7Ap0300*
 usb:v1C7Ap0575*
 usb:v1C7Ap0576*
 usb:v1C7Ap0577*
 usb:v27C6p5042*
 usb:v27C6p5110*
 usb:v27C6p5117*
 usb:v27C6p5120*
 usb:v27C6p5125*
 usb:v27C6p5201*
 usb:v27C6p521D*
 usb:v27C6p5301*
 usb:v27C6p530C*
 usb:v27C6p532D*
 usb:v27C6p5335*
 usb:v27C6p533C*
 usb:v27C6p5381*
 usb:v27C6p5385*
 usb:v27C6p538C*
 usb:v27C6p538D*
 usb:v27C6p5395*
 usb:v27C6p5503*
 usb:v27C6p550A*
 usb:v27C6p550C*
 usb:v27C6p5584*
 usb:v27C6p55A2*
 usb:v27C6p55A4*
 usb:v27C6p55B4*
 usb:v27C6p5740*
 usb:v27C6p5E0A*
 usb:v27C6p581A*
 usb:v27C6p589A*
 usb:v27C6p6382*
 usb:v2808p9338*
 usb:v2808p93A9*
 usb:v298Dp2020*
 usb:v298Dp2033*
 usb:v3538p0930*
--- a/demo/org.freedesktop.libfprint.Demo.json
+++ b/demo/org.freedesktop.libfprint.Demo.json
@@ -1,12 +1,12 @@
 {
    "app-id": "org.freedesktop.libfprint.Demo",
    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
+    "runtime-version": "3.36",
    "sdk": "org.gnome.Sdk",
    "command": "gtk-libfprint-test",
    "finish-args": [
        /* X11 + XShm access */
-        "--share=ipc", "--socket=fallback-x11",
+        "--share=ipc", "--socket=x11",
        /* Wayland access */
        "--socket=wayland",
        /* OpenGL access */
@@ -18,7 +18,7 @@
    "modules": [
        {
            "name": "libusb",
-            "config-opts": [ "--disable-static" ],
+            "config-opts": [ "--disable-static", "--disable-udev" ],
            "cleanup": [
                "/lib/*.la",
                "/lib/pkgconfig",
@@ -27,46 +27,47 @@
            "sources": [
                {
                    "type": "archive",
-                   "url": "https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2",
+                    "url": "https://github.com/libusb/libusb/archive/v1.0.22.tar.gz",
-                   "sha256": "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5"
+                    "sha256": "3500f7b182750cd9ccf9be8b1df998f83df56a39ab264976bdb3307773e16f48"
                }
            ],
            "post-install": [
-                "install -Dm644 COPYING /app/share/licenses/libusb/COPYING"
+                "install -Dm644 COPYING /app/share/licenses/libgusb/COPYING"
            ]
        },
        {
            "name": "libgusb",
            "buildsystem": "meson",
-            "config-opts": [ "-Dtests=false", "-Dvapi=false", "-Ddocs=false" ],
+            "config-opts": [ "-Dtests=false", "-Dvapi=false", "-Ddocs=false", "-Dintrospection=false" ],
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://github.com/hughsie/libgusb/releases/download/0.4.6/libgusb-0.4.6.tar.xz",
+                    "url": "https://github.com/hughsie/libgusb/archive/0.3.0.tar.gz",
-                    "sha256": "1b0422bdcd72183272ac42eec9398c5a0bc48a02f618fa3242c468cbbd003049"
+                    "sha256": "b36310f8405d5fd68f6caf4a829f7ab4c627b38fd3d02a139d411fce0f3a49f1"
                }
            ]
        },
        {
            "name": "gudev",
            "buildsystem": "meson",
-            "config-opts": [ "-Dtests=disabled", "-Dintrospection=disabled", "-Dvapi=disabled" ],
+            "config-opts": [ "-Dtests=disabled", "-Dintrospection=disabled" ],
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libgudev/238/libgudev-238.tar.xz",
+                    "url": "https://download.gnome.org/sources/libgudev/236/libgudev-236.tar.xz",
-                    "sha256": "61266ab1afc9d73dbc60a8b2af73e99d2fdff47d99544d085760e4fa667b5dd1"
+                    "sha256": "e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524"
                }
            ]
        },
        {
            "name": "libfprint",
            "buildsystem": "meson",
-            "config-opts": [ "-Dudev_hwdb=disabled", "-Dudev_rules=disabled", "-Dgtk-examples=true", "-Ddrivers=all" ],
+            "config-opts": [ "-Dudev_hwdb=disabled", "-Dudev_rules=disabled", "-Dx11-examples=false", "-Dgtk-examples=true", "-Ddrivers=all" ],
            "sources": [
                {
                    "type": "git",
-                    "url": "https://gitlab.freedesktop.org/libfprint/libfprint.git"
+                    "url": "https://gitlab.freedesktop.org/libfprint/libfprint.git",
                    "branch": "wip/benzea/v2"
                }
            ]
        }
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -19,13 +19,13 @@ content_files = [
 expand_content_files = content_files
-glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix')
+glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
 glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
 docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')
 gnome.gtkdoc(versioned_libname,
    main_xml: 'libfprint-docs.xml',
-    src_dir: join_paths(meson.project_source_root(), 'libfprint'),
+    src_dir: join_paths(meson.source_root(), 'libfprint'),
    include_directories: include_directories('../libfprint'),
    dependencies: libfprint_dep,
    content_files: content_files,
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -21,8 +21,3 @@ executable('cpp-test',
    'cpp-test.cpp',
    dependencies: libfprint_dep,
 )
 if installed_tests
    install_subdir('prints',
        install_dir: installed_tests_testdir)
 endif
--- a/libfprint/drivers/aes4000.c
+++ b/libfprint/drivers/aes4000.c
@@ -124,7 +124,7 @@ G_DEFINE_TYPE (FpiDeviceAes4000, fpi_device_aes4000, FPI_TYPE_DEVICE_AES3K);
 static const FpIdEntry id_table[] = {
-  { .vid = 0x08ff, .pid = 0x5501 },
+  { .pid = 0x08ff, .vid = 0x5501 },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },
 };
--- a/libfprint/drivers/egis0570.c
+++ b/libfprint/drivers/egis0570.c
@@ -190,7 +190,7 @@ data_resp_cb (FpiUsbTransfer *transfer, FpDevice *dev, gpointer user_data, GErro
    {
      if (!self->stop && (self->strips_len > 0))
        {
-          g_autoptr(FpImage) img = NULL;
+          FpImage *img;
          self->strips = g_slist_reverse (self->strips);
          fpi_do_movement_estimation (&assembling_ctx, self->strips);
          img = fpi_assemble_frames (&assembling_ctx, self->strips);
@@ -199,7 +199,7 @@ data_resp_cb (FpiUsbTransfer *transfer, FpDevice *dev, gpointer user_data, GErro
          self->strips = NULL;
          self->strips_len = 0;
          FpImage *resizeImage = fpi_image_resize (img, EGIS0570_RESIZE, EGIS0570_RESIZE);
-          fpi_image_device_image_captured (img_self, g_steal_pointer (&resizeImage));
+          fpi_image_device_image_captured (img_self, resizeImage);
        }
      fpi_image_device_report_finger_status (img_self, FALSE);
--- a/libfprint/drivers/egismoc/egismoc.c
+++ b/libfprint/drivers/egismoc/egismoc.c
--- a/libfprint/drivers/egismoc/egismoc.h
+++ b/libfprint/drivers/egismoc/egismoc.h
@@ -1,222 +0,0 @@
 /*
 * Driver for Egis Technology (LighTuning) Match-On-Chip sensors
 * Originally authored 2023 by Joshua Grisham <josh@joshuagrisham.com>
 *
 * Portions of code and logic inspired from the elanmoc libfprint driver
 * which is copyright (C) 2021 Elan Microelectronics Inc (see elanmoc.c)
 *
 * Based on original reverse-engineering work by Joshua Grisham. The protocol has
 * been reverse-engineered from captures of the official Windows driver, and by
 * testing commands on the sensor with a multiplatform Python prototype driver:
 * https://github.com/joshuagrisham/galaxy-book2-pro-linux/tree/main/fingerprint/
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 #pragma once
 #include "fpi-device.h"
 #include "fpi-ssm.h"
 G_DECLARE_FINAL_TYPE (FpiDeviceEgisMoc, fpi_device_egismoc, FPI, DEVICE_EGISMOC, FpDevice)
 #define EGISMOC_DRIVER_FULLNAME "Egis Technology (LighTuning) Match-on-Chip"
 #define EGISMOC_DRIVER_CHECK_PREFIX_TYPE1 (1 << 0)
 #define EGISMOC_DRIVER_CHECK_PREFIX_TYPE2 (1 << 1)
 #define EGISMOC_EP_CMD_OUT (0x02 | FPI_USB_ENDPOINT_OUT)
 #define EGISMOC_EP_CMD_IN (0x81 | FPI_USB_ENDPOINT_IN)
 #define EGISMOC_EP_CMD_INTERRUPT_IN 0x83
 #define EGISMOC_USB_CONTROL_TIMEOUT 5000
 #define EGISMOC_USB_SEND_TIMEOUT 5000
 #define EGISMOC_USB_RECV_TIMEOUT 5000
 #define EGISMOC_USB_INTERRUPT_TIMEOUT 60000
 #define EGISMOC_USB_IN_RECV_LENGTH 4096
 #define EGISMOC_USB_INTERRUPT_IN_RECV_LENGTH 64
 #define EGISMOC_ENROLL_TIMES 10
 #define EGISMOC_MAX_ENROLL_NUM 10
 #define EGISMOC_FINGERPRINT_DATA_SIZE 32
 #define EGISMOC_LIST_RESPONSE_PREFIX_SIZE 14
 #define EGISMOC_LIST_RESPONSE_SUFFIX_SIZE 2
 /* standard prefixes for all read/writes */
 static guchar egismoc_write_prefix[] = {'E', 'G', 'I', 'S', 0x00, 0x00, 0x00, 0x01};
 static gsize egismoc_write_prefix_len = sizeof (egismoc_write_prefix) / sizeof (egismoc_write_prefix[0]);
 static guchar egismoc_read_prefix[] = {'S', 'I', 'G', 'E', 0x00, 0x00, 0x00, 0x01};
 static gsize egismoc_read_prefix_len = sizeof (egismoc_read_prefix) / sizeof (egismoc_read_prefix[0]);
 /* hard-coded command payloads */
 static guchar cmd_fw_version[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x0c};
 static gsize cmd_fw_version_len = sizeof (cmd_fw_version) / sizeof (cmd_fw_version[0]);
 static guchar rsp_fw_version_suffix[] = {0x90, 0x00};
 static gsize rsp_fw_version_suffix_len = sizeof (rsp_fw_version_suffix) / sizeof (rsp_fw_version_suffix[0]);
 static guchar cmd_list[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x19, 0x04, 0x00, 0x00, 0x01, 0x40};
 static gsize cmd_list_len = sizeof (cmd_list) / sizeof (cmd_list[0]);
 static guchar cmd_sensor_reset[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x1a, 0x00, 0x00};
 static gsize cmd_sensor_reset_len = sizeof (cmd_sensor_reset) / sizeof (cmd_sensor_reset[0]);
 static guchar cmd_sensor_check[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x02, 0x00};
 static gsize cmd_sensor_check_len = sizeof (cmd_sensor_check) / sizeof (cmd_sensor_check[0]);
 static guchar cmd_sensor_identify[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x01, 0x01};
 static gsize cmd_sensor_identify_len = sizeof (cmd_sensor_identify) / sizeof (cmd_sensor_identify[0]);
 static guchar rsp_identify_match_suffix[] = {0x90, 0x00};
 static gsize rsp_identify_match_suffix_len = sizeof (rsp_identify_match_suffix) / sizeof (rsp_identify_match_suffix[0]);
 static guchar rsp_identify_notmatch_suffix[] = {0x90, 0x04};
 static gsize rsp_identify_notmatch_suffix_len = sizeof (rsp_identify_notmatch_suffix) / sizeof (rsp_identify_notmatch_suffix[0]);
 static guchar cmd_sensor_enroll[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x01, 0x00};
 static gsize cmd_sensor_enroll_len = sizeof (cmd_sensor_enroll) / sizeof (cmd_sensor_enroll[0]);
 static guchar cmd_enroll_starting[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x01, 0x00, 0x00, 0x00, 0x20};
 static gsize cmd_enroll_starting_len = sizeof (cmd_enroll_starting) / sizeof (cmd_enroll_starting[0]);
 static guchar cmd_sensor_start_capture[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x16, 0x02, 0x01};
 static gsize cmd_sensor_start_capture_len = sizeof (cmd_sensor_start_capture) / sizeof (cmd_sensor_start_capture[0]);
 static guchar cmd_read_capture[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x02, 0x02, 0x00, 0x00, 0x02};
 static gsize cmd_read_capture_len = sizeof (cmd_read_capture) / sizeof (cmd_read_capture[0]);
 static guchar rsp_read_success_prefix[] = {0x00, 0x00, 0x00, 0x04};
 static gsize rsp_read_success_prefix_len = sizeof (rsp_read_success_prefix) / sizeof (rsp_read_success_prefix[0]);
 static guchar rsp_read_success_suffix[] = {0x0a, 0x90, 0x00};
 static gsize rsp_read_success_suffix_len = sizeof (rsp_read_success_suffix) / sizeof (rsp_read_success_suffix[0]);
 static guchar rsp_read_offcenter_prefix[] = {0x00, 0x00, 0x00, 0x04};
 static gsize rsp_read_offcenter_prefix_len = sizeof (rsp_read_offcenter_prefix) / sizeof (rsp_read_offcenter_prefix[0]);
 static guchar rsp_read_offcenter_suffix[] = {0x0a, 0x64, 0x91};
 static gsize rsp_read_offcenter_suffix_len = sizeof (rsp_read_offcenter_suffix) / sizeof (rsp_read_offcenter_suffix[0]);
 static guchar rsp_read_dirty_prefix[] = {0x00, 0x00, 0x00, 0x02, 0x64};
 static gsize rsp_read_dirty_prefix_len = sizeof (rsp_read_dirty_prefix) / sizeof (rsp_read_dirty_prefix[0]);
 static guchar cmd_commit_starting[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x05, 0x00, 0x00, 0x00, 0x20};
 static gsize cmd_commit_starting_len = sizeof (cmd_commit_starting) / sizeof (cmd_commit_starting[0]);
 /* commands which exist on the device but are currently not used */
 /*
   static guchar cmd_sensor_cancel[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x16, 0x04, 0x00};
   static gsize cmd_sensor_cancel_len = sizeof(cmd_sensor_cancel) / sizeof(cmd_sensor_cancel[0]);
   static guchar cmd_sensor_verify[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x04, 0x01, 0x00};
   static gsize cmd_sensor_verify_len = sizeof(cmd_sensor_verify) / sizeof(cmd_sensor_verify[0]);
   static guchar cmd_read_verify[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x04, 0x02, 0x00};
   static gsize cmd_read_verify_len = sizeof(cmd_read_verify) / sizeof(cmd_read_verify[0]);
 */
 /* prefixes/suffixes and other things for dynamically created command payloads */
 #define EGISMOC_CHECK_BYTES_LENGTH 2
 #define EGISMOC_IDENTIFY_RESPONSE_PRINT_ID_OFFSET 46
 #define EGISMOC_CMD_CHECK_SEPARATOR_LENGTH 32
 static guchar cmd_new_print_prefix[] = {0x00, 0x00, 0x00, 0x27, 0x50, 0x16, 0x03, 0x00, 0x00, 0x00, 0x20};
 static gsize cmd_new_print_prefix_len = sizeof (cmd_new_print_prefix) / sizeof (cmd_new_print_prefix[0]);
 static guchar cmd_delete_prefix[] = {0x50, 0x18, 0x04, 0x00, 0x00};
 static gsize cmd_delete_prefix_len = sizeof (cmd_delete_prefix) / sizeof (cmd_delete_prefix[0]);
 static guchar rsp_delete_success_prefix[] = {0x00, 0x00, 0x00, 0x02, 0x90, 0x00};
 static gsize rsp_delete_success_prefix_len = sizeof (rsp_delete_success_prefix) / sizeof (rsp_delete_success_prefix[0]);
 static guchar cmd_check_prefix_type1[] = {0x50, 0x17, 0x03, 0x00, 0x00};
 static gsize cmd_check_prefix_type1_len = sizeof (cmd_check_prefix_type1) / sizeof (cmd_check_prefix_type1[0]);
 static guchar cmd_check_prefix_type2[] = {0x50, 0x17, 0x03, 0x80, 0x00};
 static gsize cmd_check_prefix_type2_len = sizeof (cmd_check_prefix_type2) / sizeof (cmd_check_prefix_type2[0]);
 static guchar cmd_check_suffix[] = {0x00, 0x40};
 static gsize cmd_check_suffix_len = sizeof (cmd_check_suffix) / sizeof (cmd_check_suffix[0]);
 static guchar rsp_check_not_yet_enrolled_suffix[] = {0x90, 0x04};
 static gsize rsp_check_not_yet_enrolled_suffix_len = sizeof (rsp_check_not_yet_enrolled_suffix) / sizeof (rsp_check_not_yet_enrolled_suffix[0]);
 /* SSM task states and various status enums */
 typedef enum {
  CMD_SEND,
  CMD_GET,
  CMD_STATES,
 } CommandStates;
 typedef enum {
  DEV_INIT_CONTROL1,
  DEV_INIT_CONTROL2,
  DEV_INIT_CONTROL3,
  DEV_INIT_CONTROL4,
  DEV_INIT_CONTROL5,
  DEV_GET_FW_VERSION,
  DEV_INIT_STATES,
 } DeviceInitStates;
 typedef enum {
  IDENTIFY_GET_ENROLLED_IDS,
  IDENTIFY_CHECK_ENROLLED_NUM,
  IDENTIFY_SENSOR_RESET,
  IDENTIFY_SENSOR_IDENTIFY,
  IDENTIFY_WAIT_FINGER,
  IDENTIFY_SENSOR_CHECK,
  IDENTIFY_CHECK,
  IDENTIFY_COMPLETE_SENSOR_RESET,
  IDENTIFY_COMPLETE,
  IDENTIFY_STATES,
 } IdentifyStates;
 typedef enum {
  ENROLL_GET_ENROLLED_IDS,
  ENROLL_CHECK_ENROLLED_NUM,
  ENROLL_SENSOR_RESET,
  ENROLL_SENSOR_ENROLL,
  ENROLL_WAIT_FINGER,
  ENROLL_SENSOR_CHECK,
  ENROLL_CHECK,
  ENROLL_START,
  ENROLL_CAPTURE_SENSOR_RESET,
  ENROLL_CAPTURE_SENSOR_START_CAPTURE,
  ENROLL_CAPTURE_WAIT_FINGER,
  ENROLL_CAPTURE_READ_RESPONSE,
  ENROLL_COMMIT_START,
  ENROLL_COMMIT,
  ENROLL_COMMIT_SENSOR_RESET,
  ENROLL_COMPLETE,
  ENROLL_STATES,
 } EnrollStates;
 typedef enum {
  ENROLL_STATUS_DEVICE_FULL,
  ENROLL_STATUS_DUPLICATE,
  ENROLL_STATUS_PARTIAL_OK,
  ENROLL_STATUS_RETRY,
  ENROLL_STATUS_COMPLETE,
 } EnrollStatus;
 typedef enum {
  LIST_GET_ENROLLED_IDS,
  LIST_RETURN_ENROLLED_PRINTS,
  LIST_STATES,
 } ListStates;
 typedef enum {
  DELETE_GET_ENROLLED_IDS,
  DELETE_DELETE,
  DELETE_STATES,
 } DeleteStates;
--- a/libfprint/drivers/elan.c
+++ b/libfprint/drivers/elan.c
@@ -357,7 +357,7 @@ elan_cmd_cb (FpiUsbTransfer *transfer, FpDevice *dev,
  if (transfer->endpoint & FPI_USB_ENDPOINT_IN)
    {
      /* just finished receiving */
-      self->last_read = g_memdup2 (transfer->buffer, transfer->actual_length);
+      self->last_read = g_memdup (transfer->buffer, transfer->actual_length);
      elan_cmd_done (ssm);
    }
  else
--- a/libfprint/drivers/elanmoc/elanmoc.c
+++ b/libfprint/drivers/elanmoc/elanmoc.c
@@ -28,10 +28,6 @@ static const FpIdEntry id_table[] = {
  { .vid = 0x04f3,  .pid = 0x0c7d,  },
  { .vid = 0x04f3,  .pid = 0x0c7e,  },
  { .vid = 0x04f3,  .pid = 0x0c82,  },
  { .vid = 0x04f3,  .pid = 0x0c88,  },
  { .vid = 0x04f3,  .pid = 0x0c8c,  },
  { .vid = 0x04f3,  .pid = 0x0c8d,  },
  { .vid = 0x04f3,  .pid = 0x0c99,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
@@ -50,9 +46,9 @@ elanmoc_compose_cmd (
  const struct elanmoc_cmd *cmd_info
                    )
 {
-  g_autofree uint8_t *cmd_buf = NULL;
+  g_autofree char *cmd_buf = NULL;
-  cmd_buf = g_new0 (uint8_t, cmd_info->cmd_len);
+  cmd_buf = g_malloc0 (cmd_info->cmd_len);
  if(cmd_info->cmd_len < ELAN_MAX_HDR_LEN)
    memcpy (cmd_buf, &cmd_info->cmd_header, cmd_info->cmd_len);
  else
@@ -380,9 +376,9 @@ elanmoc_enroll_cb (FpiDeviceElanmoc *self,
          enroll_status_report (self, ENROLL_RSP_RETRY, self->num_frames, NULL);
        }
-      if (self->num_frames == self->max_moc_enroll_time && buffer_in[1] == ELAN_MSG_OK)
+      if (self->num_frames == ELAN_MOC_ENROLL_TIMES && buffer_in[1] == ELAN_MSG_OK)
        fpi_ssm_next_state (self->task_ssm);
-      else if (self->num_frames < self->max_moc_enroll_time)
+      else if (self->num_frames < ELAN_MOC_ENROLL_TIMES)
        fpi_ssm_jump_to_state (self->task_ssm, MOC_ENROLL_WAIT_FINGER);
      else
        fpi_ssm_mark_failed (self->task_ssm, error);
@@ -445,7 +441,7 @@ elan_enroll_run_state (FpiSsm *ssm, FpDevice *dev)
    case MOC_ENROLL_WAIT_FINGER:
      cmd_buf = elanmoc_compose_cmd (&elanmoc_enroll_cmd);
      cmd_buf[3] = self->curr_enrolled;
-      cmd_buf[4] = self->max_moc_enroll_time;
+      cmd_buf[4] = ELAN_MOC_ENROLL_TIMES;
      cmd_buf[5] = self->num_frames;
      elanmoc_get_cmd (dev, cmd_buf, elanmoc_enroll_cmd.cmd_len, elanmoc_enroll_cmd.resp_len, 1, elanmoc_enroll_cb);
      break;
@@ -510,7 +506,7 @@ create_print_from_response (FpiDeviceElanmoc *self,
      return NULL;
    }
-  userid = g_memdup2 (&buffer_in[5], userid_len);
+  userid = g_memdup (&buffer_in[5], userid_len);
  userid_safe = g_strndup ((const char *) &buffer_in[5], userid_len);
  print = fp_print_new (FP_DEVICE (self));
  uid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, userid, userid_len, 1);
@@ -762,7 +758,6 @@ identify_status_report (FpiDeviceElanmoc *self, int verify_status_id,
 }
 enum identify_states {
  IDENTIFY_SET_MODE,
  IDENTIFY_WAIT_FINGER,
  IDENTIFY_NUM_STATES,
 };
@@ -798,13 +793,6 @@ elan_identify_run_state (FpiSsm *ssm, FpDevice *dev)
  fp_info ("elanmoc %s ", __func__);
  switch (fpi_ssm_get_cur_state (ssm))
    {
    case IDENTIFY_SET_MODE:
      fp_info ("elanmoc %s IDENTIFY_SET_MODE", __func__);
      cmd_buf = elanmoc_compose_cmd (&elanmoc_set_mod_cmd);
      cmd_buf[3] = 0x03;
      elanmoc_get_cmd (dev, cmd_buf, elanmoc_set_mod_cmd.cmd_len, elanmoc_set_mod_cmd.resp_len, 0, elanmoc_cmd_ack_cb);
      break;
    case IDENTIFY_WAIT_FINGER:
      fp_info ("elanmoc %s VERIFY_WAIT_FINGER", __func__);
      cmd_buf = elanmoc_compose_cmd (&elanmoc_verify_cmd);
@@ -1011,12 +999,6 @@ elanmoc_get_status_cb (FpiDeviceElanmoc *self,
    }
  if (buffer_in[1] != 0x03 && self->cmd_retry_cnt != 0)
    {
      self->cmd_retry_cnt--;
      cmd_buf = elanmoc_compose_cmd (&cal_status_cmd);
      elanmoc_get_cmd (FP_DEVICE (self), cmd_buf, cal_status_cmd.cmd_len, cal_status_cmd.resp_len, 0, elanmoc_get_status_cb);
    }
  else
    {
      if(self->cmd_retry_cnt == 0)
        {
@@ -1025,6 +1007,12 @@ elanmoc_get_status_cb (FpiDeviceElanmoc *self,
                                                         "Sensor not ready"));
          return;
        }
      self->cmd_retry_cnt--;
      cmd_buf = elanmoc_compose_cmd (&cal_status_cmd);
      elanmoc_get_cmd (FP_DEVICE (self), cmd_buf, cal_status_cmd.cmd_len, cal_status_cmd.resp_len, 0, elanmoc_get_status_cb);
    }
  else
    {
      fpi_ssm_next_state (self->task_ssm);
    }
 }
@@ -1072,7 +1060,6 @@ elanmoc_open (FpDevice *device)
 {
  FpiDeviceElanmoc *self = FPI_DEVICE_ELANMOC (device);
  GError *error = NULL;
  gint productid = 0;
  if (!g_usb_device_reset (fpi_device_get_usb_device (device), &error))
    goto error;
@@ -1080,28 +1067,6 @@ elanmoc_open (FpDevice *device)
  if (!g_usb_device_claim_interface (fpi_device_get_usb_device (device), 0, 0, &error))
    goto error;
  productid = g_usb_device_get_pid (fpi_device_get_usb_device (device));
  switch (productid)
    {
    case 0x0c8c:
      self->max_moc_enroll_time = 11;
      break;
    case 0x0c99:
      self->max_moc_enroll_time = 14;
      break;
    case 0x0c8d:
      self->max_moc_enroll_time = 17;
      break;
    default:
      self->max_moc_enroll_time = ELAN_MOC_ENROLL_TIMES;
      break;
    }
  fpi_device_set_nr_enroll_stages (device, self->max_moc_enroll_time);
  self->task_ssm = fpi_ssm_new (FP_DEVICE (self), dev_init_handler, DEV_INIT_STATES);
  fpi_ssm_start (self->task_ssm, task_ssm_init_done);
  return;
--- a/libfprint/drivers/elanmoc/elanmoc.h
+++ b/libfprint/drivers/elanmoc/elanmoc.h
@@ -188,7 +188,6 @@ struct _FpiDeviceElanmoc
  unsigned char   y_trace;
  int             num_frames;
  int             curr_enrolled;
  int             max_moc_enroll_time;
  int             cancel_result;
  int             cmd_retry_cnt;
  int             list_index;
--- a/libfprint/drivers/focaltech_moc/focaltech_moc.c
+++ b/libfprint/drivers/focaltech_moc/focaltech_moc.c
--- a/libfprint/drivers/focaltech_moc/focaltech_moc.h
+++ b/libfprint/drivers/focaltech_moc/focaltech_moc.h
@@ -1,52 +0,0 @@
 /*
 * Copyright (C) 2021 Focaltech Microelectronics
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 #pragma once
 #include "fpi-device.h"
 #include "fpi-ssm.h"
 #include <libusb.h>
 #include <stdio.h>
 #include <stdlib.h>
 G_DECLARE_FINAL_TYPE (FpiDeviceFocaltechMoc, fpi_device_focaltech_moc, FPI, DEVICE_FOCALTECH_MOC, FpDevice)
 #define FOCALTECH_MOC_DRIVER_FULLNAME "Focaltech MOC Sensors"
 #define FOCALTECH_MOC_CMD_TIMEOUT 1000
 #define FOCALTECH_MOC_MAX_FINGERS 10
 #define FOCALTECH_MOC_UID_PREFIX_LENGTH 8
 #define FOCALTECH_MOC_USER_ID_LENGTH 64
 typedef void (*FocaltechCmdMsgCallback) (FpiDeviceFocaltechMoc *self,
                                         GError                *error);
 struct _FpiDeviceFocaltechMoc
 {
  FpDevice        parent;
  FpiSsm         *task_ssm;
  FpiSsm         *cmd_ssm;
  FpiUsbTransfer *cmd_transfer;
  gboolean        cmd_cancelable;
  gsize           cmd_len_in;
  int             num_frames;
  int             delete_slot;
  guint8          bulk_in_ep;
  guint8          bulk_out_ep;
 };
--- a/libfprint/drivers/fpcmoc/fpc.c
+++ b/libfprint/drivers/fpcmoc/fpc.c
--- a/libfprint/drivers/fpcmoc/fpc.h
+++ b/libfprint/drivers/fpcmoc/fpc.h
@@ -1,221 +0,0 @@
 /*
 * Copyright (c) 2022 Fingerprint Cards AB <tech@fingerprints.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 #pragma once
 #include "fpi-device.h"
 #include "fpi-ssm.h"
 #include <stdio.h>
 #include <stdlib.h>
 #define TEMPLATE_ID_SIZE (32)
 #define MAX_FW_VERSION_STR_LEN (16)
 #define FPC_CMD_INIT (0x01)
 #define FPC_CMD_ARM (0x02)
 #define FPC_CMD_ABORT (0x03)
 #define FPC_CMD_INDICATE_S_STATE (0x08)
 #define FPC_CMD_GET_IMG (0x09)
 #define FPC_CMD_GET_KPI (0x0C)
 #define FPC_CMD_LOAD_DB (0x60)
 #define FPC_CMD_STORE_DB (0x61)
 #define FPC_CMD_DELETE_DB (0x62)
 #define FPC_CMD_DELETE_TEMPLATE (0x63)
 #define FPC_CMD_BEGIN_ENROL (0x67)
 #define FPC_CMD_ENROL (0x68)
 #define FPC_CMD_END_ENROL (0x69)
 #define FPC_CMD_BIND_IDENTITY (0x6A)
 #define FPC_CMD_IDENTIFY (0x6B)
 #define FPC_CMD_ENUM (0x70)
 #define FPC_EVT_INIT_RESULT (0x02)
 #define FPC_EVT_FINGER_DWN (0x06)
 #define FPC_EVT_IMG (0x08)
 #define FPC_EVT_FID_DATA (0x31)
 #define FPC_DB_ID_LEN (16)
 #define FPC_IDENTITY_TYPE_WILDCARD (0x1)
 #define FPC_IDENTITY_TYPE_RESERVED (0x3)
 #define FPC_IDENTITY_WILDCARD (0x25066282)
 #define FPC_SUBTYPE_ANY (0xFF)
 #define FPC_SUBTYPE_RESERVED (0xF5)
 #define FPC_SUBTYPE_NOINFORMATION (0x00)
 #define FPC_CAPTUREID_RESERVED (0x701100F)
 #define FPC_SESSIONID_RESERVED (0x0077FF12)
 #define FPC_TEMPLATES_MAX (10)
 #define SECURITY_MAX_SID_SIZE (68)
 #define FPC_HOST_MS_S0 (0x10)
 #define FPC_HOST_MS_SX (0x11)
 G_DECLARE_FINAL_TYPE (FpiDeviceFpcMoc, fpi_device_fpcmoc, FPI,
                      DEVICE_FPCMOC, FpDevice);
 typedef struct _FPC_FID_DATA
 {
  guint32 identity_type;
  guint32 reserved;
  guint32 identity_size;
  guint32 subfactor;
  guint8  data[SECURITY_MAX_SID_SIZE];
 } FPC_FID_DATA, *PFPC_FID_DATA;
 typedef struct _FPC_LOAD_DB
 {
  gint32  status;
  guint32 reserved;
  guint32 database_id_size;
  guint8  data[FPC_DB_ID_LEN];
 } FPC_LOAD_DB, *PFPC_LOAD_DB;
 typedef union _FPC_DELETE_DB
 {
  guint32 reserved;
  guint32 database_id_size;
  guint8  data[FPC_DB_ID_LEN];
 } FPC_DB_OP, *PFPC_DB_OP;
 typedef struct _FPC_BEGIN_ENROL
 {
  gint32  status;
  guint32 reserved1;
  guint32 reserved2;
 } FPC_BEGIN_ENROL, *PFPC_BEGIN_ENROL;
 typedef struct _FPC_ENROL
 {
  gint32  status;
  guint32 remaining;
 } FPC_ENROL, *PFPC_ENROL;
 typedef struct _FPC_END_ENROL
 {
  gint32  status;
  guint32 fid;
 } FPC_END_ENROL, *PFPC_END_ENROL;
 typedef struct _FPC_IDENTIFY
 {
  gint32  status;
  guint32 identity_type;
  guint32 identity_offset;
  guint32 identity_size;
  guint32 subfactor;
  guint8  data[SECURITY_MAX_SID_SIZE];
 } FPC_IDENTIFY, *PFPC_IDENTIFY;
 typedef struct
 {
  guint32 cmdid;
  guint32 length;
  guint32 status;
 } evt_hdr_t;
 typedef struct
 {
  evt_hdr_t hdr;
  guint16   sensor;
  guint16   hw_id;
  guint16   img_w;
  guint16   img_h;
  guint8    fw_version[MAX_FW_VERSION_STR_LEN];
  guint16   fw_capabilities;
 } evt_initiated_t;
 typedef struct
 {
  guint8  subfactor;
  guint32 identity_type;
  guint32 identity_size;
  guint8  identity[SECURITY_MAX_SID_SIZE];
 } __attribute__((packed)) fpc_fid_data_t;
 typedef struct
 {
  evt_hdr_t      hdr;
  gint           status;
  guint32        num_ids;
  fpc_fid_data_t fid_data[FPC_TEMPLATES_MAX];
 } __attribute__((packed)) evt_enum_fids_t;
 typedef struct _fp_cmd_response
 {
  union
  {
    evt_hdr_t       evt_hdr;
    evt_initiated_t evt_inited;
    evt_enum_fids_t evt_enum_fids;
  };
 } fpc_cmd_response_t, *pfpc_cmd_response_t;
 enum {
  FPC_ENROL_STATUS_COMPLETED = 0,
  FPC_ENROL_STATUS_PROGRESS = 1,
  FPC_ENROL_STATUS_FAILED_COULD_NOT_COMPLETE = 2,
  FPC_ENROL_STATUS_FAILED_ALREADY_ENROLED = 3,
  FPC_ENROL_STATUS_IMAGE_LOW_COVERAGE = 4,
  FPC_ENROL_STATUS_IMAGE_TOO_SIMILAR = 5,
  FPC_ENROL_STATUS_IMAGE_LOW_QUALITY = 6,
 };
 typedef enum {
  FPC_CMDTYPE_UNKNOWN = 0,
  FPC_CMDTYPE_TO_DEVICE,
  FPC_CMDTYPE_TO_DEVICE_EVTDATA,
  FPC_CMDTYPE_FROM_DEVICE,
 } FpcCmdType;
 typedef enum {
  FP_CMD_SEND = 0,
  FP_CMD_GET_DATA,
  FP_CMD_SUSPENDED,
  FP_CMD_RESUME,
  FP_CMD_NUM_STATES,
 } FpCmdState;
 typedef enum {
  FP_INIT = 0,
  FP_LOAD_DB,
  FP_INIT_NUM_STATES,
 } FpInitState;
 typedef enum {
  FP_ENROLL_ENUM = 0,
  FP_ENROLL_CREATE,
  FP_ENROLL_CAPTURE,
  FP_ENROLL_GET_IMG,
  FP_ENROLL_UPDATE,
  FP_ENROLL_COMPLETE,
  FP_ENROLL_CHECK_DUPLICATE,
  FP_ENROLL_BINDID,
  FP_ENROLL_COMMIT,
  FP_ENROLL_DICARD,
  FP_ENROLL_CLEANUP,
  FP_ENROLL_NUM_STATES,
 } FpEnrollState;
 typedef enum {
  FP_VERIFY_CAPTURE = 0,
  FP_VERIFY_GET_IMG,
  FP_VERIFY_IDENTIFY,
  FP_VERIFY_CANCEL,
  FP_VERIFY_NUM_STATES,
 } FpVerifyState;
 typedef enum {
  FP_CLEAR_DELETE_DB = 0,
  FP_CLEAR_CREATE_DB,
  FP_CLEAR_NUM_STATES,
 } FpClearState;
--- a/libfprint/drivers/goodixmoc/goodix.c
+++ b/libfprint/drivers/goodixmoc/goodix.c
@@ -631,11 +631,11 @@ fp_enroll_enum_cb (FpiDeviceGoodixMoc  *self,
      return;
    }
-  fpi_ssm_next_state (self->task_ssm);
+  fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_CAPTURE);
 }
 static void
-fp_enroll_create_cb (FpiDeviceGoodixMoc  *self,
+fp_enroll_init_cb (FpiDeviceGoodixMoc  *self,
                   gxfp_cmd_response_t *resp,
                   GError              *error)
 {
@@ -644,7 +644,7 @@ fp_enroll_create_cb (FpiDeviceGoodixMoc  *self,
      fpi_ssm_mark_failed (self->task_ssm, error);
      return;
    }
-  memcpy (self->template_id, resp->enroll_create.tid, TEMPLATE_ID_SIZE);
+  memcpy (self->template_id, resp->enroll_init.tid, TEMPLATE_ID_SIZE);
  fpi_ssm_next_state (self->task_ssm);
 }
@@ -661,7 +661,7 @@ fp_enroll_capture_cb (FpiDeviceGoodixMoc  *self,
  /* */
  if (resp->result >= GX_FAILED)
    {
-      fp_info ("Capture sample failed, result: 0x%x", resp->result);
+      fp_warn ("Capture sample failed, result: 0x%x", resp->result);
      fpi_device_enroll_progress (FP_DEVICE (self),
                                  self->enroll_stage,
                                  NULL,
@@ -675,7 +675,7 @@ fp_enroll_capture_cb (FpiDeviceGoodixMoc  *self,
  if ((resp->capture_data_resp.img_quality < self->sensorcfg->config[4]) ||
      (resp->capture_data_resp.img_coverage < self->sensorcfg->config[5]))
    {
-      fp_info ("Capture sample poor quality(%d): %d or coverage(%d): %d",
+      fp_warn ("Capture sample poor quality(%d): %d or coverage(%d): %d",
               self->sensorcfg->config[4],
               resp->capture_data_resp.img_quality,
               self->sensorcfg->config[5],
@@ -837,16 +837,6 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
  switch (fpi_ssm_get_cur_state (ssm))
    {
    case FP_ENROLL_PWR_BTN_SHIELD_ON:
      {
        goodix_sensor_cmd (self, MOC_CMD0_PWR_BTN_SHIELD, MOC_CMD1_PWR_BTN_SHIELD_ON,
                           false,
                           NULL,
                           0,
                           fp_pwr_btn_shield_cb);
      }
      break;
    case FP_ENROLL_ENUM:
      {
        goodix_sensor_cmd (self, MOC_CMD0_GETFINGERLIST, MOC_CMD1_DEFAULT,
@@ -857,13 +847,23 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
      }
      break;
    case FP_ENROLL_PWR_BTN_SHIELD_ON:
      {
        goodix_sensor_cmd (self, MOC_CMD0_PWR_BTN_SHIELD, MOC_CMD1_PWR_BTN_SHIELD_ON,
                           false,
                           NULL,
                           0,
                           fp_pwr_btn_shield_cb);
      }
      break;
    case FP_ENROLL_CREATE:
      {
        goodix_sensor_cmd (self, MOC_CMD0_ENROLL_INIT, MOC_CMD1_DEFAULT,
                           false,
                           (const guint8 *) &dummy,
                           1,
-                           fp_enroll_create_cb);
+                           fp_enroll_init_cb);
      }
      break;
@@ -1041,47 +1041,6 @@ fp_init_config_cb (FpiDeviceGoodixMoc  *self,
  fpi_ssm_next_state (self->task_ssm);
 }
 static void
 fp_init_cb_reset_or_complete (FpiDeviceGoodixMoc  *self,
                              gxfp_cmd_response_t *resp,
                              GError              *error)
 {
  if (error)
    {
      fp_warn ("Template storage appears to have been corrupted! Error was: %s", error->message);
      fp_warn ("A known reason for this to happen is a firmware bug triggered by another storage area being initialized.");
      fpi_ssm_jump_to_state (self->task_ssm, FP_INIT_RESET_DEVICE);
    }
  else
    {
      fpi_ssm_mark_completed (self->task_ssm);
    }
 }
 static void
 fp_init_reset_device_cb (FpiDeviceGoodixMoc  *self,
                         gxfp_cmd_response_t *resp,
                         GError              *error)
 {
  if (error)
    {
      fp_warn ("Reset failed: %s", error->message);
      fpi_ssm_mark_failed (self->task_ssm, error);
      return;
    }
  if ((resp->result >= GX_FAILED) && (resp->result != GX_ERROR_FINGER_ID_NOEXIST))
    {
      fp_warn ("Reset failed, device reported: 0x%x", resp->result);
      fpi_ssm_mark_failed (self->task_ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
                                                     "Failed clear storage, result: 0x%x",
                                                     resp->result));
      return;
    }
  fp_warn ("Reset completed");
  fpi_ssm_mark_completed (self->task_ssm);
 }
 static void
 fp_init_sm_run_state (FpiSsm *ssm, FpDevice *device)
@@ -1106,30 +1065,6 @@ fp_init_sm_run_state (FpiSsm *ssm, FpDevice *device)
                         sizeof (gxfp_sensor_cfg_t),
                         fp_init_config_cb);
      break;
    case FP_INIT_TEMPLATE_LIST:
      /* List prints to check whether the template DB was corrupted.
       * As of 2022-06-13 there is a known firmware issue that can cause the
       * stored templates for Linux to be corrupted when the Windows storage
       * area is initialized.
       * In that case, we'll get a protocol failure trying to retrieve the
       * list of prints.
       */
      goodix_sensor_cmd (self, MOC_CMD0_GETFINGERLIST, MOC_CMD1_DEFAULT,
                         FALSE,
                         (const guint8 *) &dummy,
                         1,
                         fp_init_cb_reset_or_complete);
      break;
    case FP_INIT_RESET_DEVICE:
      fp_warn ("Resetting device storage, you will need to enroll all prints again!");
      goodix_sensor_cmd (self, MOC_CMD0_DELETETEMPLATE, MOC_CMD1_DELETE_ALL,
                         FALSE,
                         NULL,
                         0,
                         fp_init_reset_device_cb);
      break;
    }
@@ -1359,24 +1294,12 @@ gx_fp_probe (FpDevice *device)
    {
    case 0x6496:
    case 0x60A2:
    case 0x60A4:
    case 0x6014:
    case 0x6092:
    case 0x6094:
    case 0x609C:
    case 0x60BC:
    case 0x6304:
    case 0x631C:
    case 0x633C:
    case 0x634C:
    case 0x6384:
    case 0x639C:
    case 0x63AC:
    case 0x63BC:
    case 0x63CC:
    case 0x6582:
    case 0x6A94:
    case 0x659A:
      self->max_enroll_stage = 12;
      break;
@@ -1607,29 +1530,17 @@ fpi_device_goodixmoc_init (FpiDeviceGoodixMoc *self)
 static const FpIdEntry id_table[] = {
  { .vid = 0x27c6,  .pid = 0x5840,  },
  { .vid = 0x27c6,  .pid = 0x6014,  },
  { .vid = 0x27c6,  .pid = 0x6092,  },
  { .vid = 0x27c6,  .pid = 0x6094,  },
  { .vid = 0x27c6,  .pid = 0x609C,  },
  { .vid = 0x27c6,  .pid = 0x60A2,  },
  { .vid = 0x27c6,  .pid = 0x60A4,  },
  { .vid = 0x27c6,  .pid = 0x60BC,  },
  { .vid = 0x27c6,  .pid = 0x6304,  },
  { .vid = 0x27c6,  .pid = 0x631C,  },
  { .vid = 0x27c6,  .pid = 0x633C,  },
  { .vid = 0x27c6,  .pid = 0x634C,  },
  { .vid = 0x27c6,  .pid = 0x6384,  },
  { .vid = 0x27c6,  .pid = 0x639C,  },
  { .vid = 0x27c6,  .pid = 0x63AC,  },
  { .vid = 0x27c6,  .pid = 0x63BC,  },
  { .vid = 0x27c6,  .pid = 0x63CC,  },
  { .vid = 0x27c6,  .pid = 0x6496,  },
  { .vid = 0x27c6,  .pid = 0x6582,  },
  { .vid = 0x27c6,  .pid = 0x6584,  },
  { .vid = 0x27c6,  .pid = 0x658C,  },
  { .vid = 0x27c6,  .pid = 0x6592,  },
  { .vid = 0x27c6,  .pid = 0x6594,  },
  { .vid = 0x27c6,  .pid = 0x659A,  },
  { .vid = 0x27c6,  .pid = 0x659C,  },
  { .vid = 0x27c6,  .pid = 0x6A94,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
--- a/libfprint/drivers/goodixmoc/goodix.h
+++ b/libfprint/drivers/goodixmoc/goodix.h
@@ -35,8 +35,6 @@ typedef enum {
 typedef enum {
  FP_INIT_VERSION = 0,
  FP_INIT_CONFIG,
  FP_INIT_TEMPLATE_LIST,
  FP_INIT_RESET_DEVICE,
  FP_INIT_NUM_STATES,
 } FpInitState;
@@ -44,6 +42,7 @@ typedef enum {
 typedef enum {
  FP_ENROLL_PWR_BTN_SHIELD_ON = 0,
  FP_ENROLL_ENUM,
  FP_ENROLL_IDENTIFY,
  FP_ENROLL_CREATE,
  FP_ENROLL_CAPTURE,
  FP_ENROLL_UPDATE,
--- a/libfprint/drivers/goodixmoc/goodix_proto.c
+++ b/libfprint/drivers/goodixmoc/goodix_proto.c
@@ -343,10 +343,10 @@ gx_proto_parse_body (uint16_t cmd, uint8_t *buffer, uint16_t buffer_len, pgxfp_c
      break;
    case MOC_CMD0_ENROLL_INIT:
-      if (buffer_len < sizeof (gxfp_enroll_create_t) + 1)
+      if (buffer_len < sizeof (gxfp_enroll_init_t) + 1)
        return -1;
      if (presp->result == GX_SUCCESS)
-        memcpy (&presp->enroll_create.tid, &buffer[1], TEMPLATE_ID_SIZE);
+        memcpy (&presp->enroll_init.tid, &buffer[1], TEMPLATE_ID_SIZE);
      break;
    case MOC_CMD0_ENROLL:
@@ -393,8 +393,10 @@ gx_proto_parse_body (uint16_t cmd, uint8_t *buffer, uint16_t buffer_len, pgxfp_c
                                       fingerid_length,
                                       &presp->finger_list_resp.finger_list[num]) != 0)
            {
-              g_warning ("Failed to parse finger list");
+              g_error ("parse fingerlist error");
-              return -1;
+              presp->finger_list_resp.finger_num = 0;
              presp->result = GX_FAILED;
              break;
            }
          offset += fingerid_length;
        }
--- a/libfprint/drivers/goodixmoc/goodix_proto.h
+++ b/libfprint/drivers/goodixmoc/goodix_proto.h
@@ -105,10 +105,10 @@ typedef struct _gxfp_parse_msg
 } gxfp_parse_msg_t, *pgxfp_parse_msg_t;
-typedef struct _gxfp_enroll_create
+typedef struct _gxfp_enroll_init
 {
  uint8_t tid[TEMPLATE_ID_SIZE];
-} gxfp_enroll_create_t, *pgxfp_enroll_create_t;
+} gxfp_enroll_init_t, *pgxfp_enroll_init_t;
 #pragma pack(push, 1)
 typedef struct _template_format
@@ -192,7 +192,7 @@ typedef struct _fp_cmd_response
  {
    gxfp_parse_msg_t       parse_msg;
    gxfp_verify_t          verify;
-    gxfp_enroll_create_t   enroll_create;
+    gxfp_enroll_init_t     enroll_init;
    gxfp_capturedata_t     capture_data_resp;
    gxfp_check_duplicate_t check_duplicate_resp;
    gxfp_enroll_commit_t   enroll_commit;
--- a/libfprint/drivers/realtek/realtek.c
+++ b/libfprint/drivers/realtek/realtek.c
--- a/libfprint/drivers/realtek/realtek.h
+++ b/libfprint/drivers/realtek/realtek.h
@@ -1,220 +0,0 @@
 /*
 * Copyright (C) 2022-2023 Realtek Corp.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 #pragma once
 #include "fpi-device.h"
 #include "fpi-ssm.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #define EP_IN (2 | FPI_USB_ENDPOINT_IN)
 #define EP_OUT (1 | FPI_USB_ENDPOINT_OUT)
 #define EP_IN_MAX_BUF_SIZE 2048
 #define FP_RTK_CMD_TOTAL_LEN 12
 #define FP_RTK_CMD_LEN 2
 #define FP_RTK_CMD_PARAM_LEN 4
 #define FP_RTK_CMD_ADDR_LEN 4
 #define FP_RTK_CMD_DATA_LEN 2
 #define TEMPLATE_LEN 35
 #define SUBFACTOR_OFFSET 2
 #define UID_OFFSET 3
 #define UID_PAYLOAD_LEN 32
 /* Command transfer timeout :ms*/
 #define CMD_TIMEOUT 1000
 #define DATA_TIMEOUT 5000
 #define STATUS_TIMEOUT 2000
 #define MAX_ENROLL_SAMPLES 8
 #define DEFAULT_UID_LEN 28
 #define SUB_FINGER_01 0xFF
 #define GET_CMD_TYPE(val)                   ((val & 0xC0) >> 6)
 #define GET_TRANS_DATA_LEN(len_h, len_l)    ((len_h << 8) | len_l)
 #define GET_LEN_L(total_data_len)           ((total_data_len) & 0xff)
 #define GET_LEN_H(total_data_len)           ((total_data_len) >> 8)
 G_DECLARE_FINAL_TYPE (FpiDeviceRealtek, fpi_device_realtek, FPI, DEVICE_REALTEK, FpDevice)
 typedef void (*SynCmdMsgCallback) (FpiDeviceRealtek *self,
                                   uint8_t          *buffer_in,
                                   GError           *error);
 typedef struct
 {
  SynCmdMsgCallback callback;
 } CommandData;
 typedef enum {
  FP_RTK_CMD_ONLY = 0,
  FP_RTK_CMD_READ,
  FP_RTK_CMD_WRITE,
 } FpRtkCmdType;
 typedef enum {
  FP_RTK_MSG_PLAINTEXT = 0,
  FP_RTK_MSG_PLAINTEXT_NO_STATUS,
 } FpRtkMsgType;
 typedef enum {
  FP_RTK_PURPOSE_IDENTIFY = 0x01,     /* identify before enroll */
  FP_RTK_PURPOSE_VERIFY   = 0x02,
  FP_RTK_PURPOSE_ENROLL   = 0x04,
 } FpRtkPurpose;
 typedef enum {
  FP_RTK_SUCCESS = 0x0,
  FP_RTK_TOO_HIGH,
  FP_RTK_TOO_LOW,
  FP_RTK_TOO_LEFT,
  FP_RTK_TOO_RIGHT,
  FP_RTK_TOO_FAST,
  FP_RTK_TOO_SLOW,
  FP_RTK_POOR_QUALITY,
  FP_RTK_TOO_SKEWED,
  FP_RTK_TOO_SHORT,
  FP_RTK_MERGE_FAILURE,
  FP_RTK_MATCH_FAIL,
  FP_RTK_CMD_ERR,
 } FpRtkInStatus;
 typedef enum {
  FP_RTK_ENROLL_GET_TEMPLATE = 0,
  FP_RTK_ENROLL_BEGIN_POS,
  FP_RTK_ENROLL_CAPTURE,
  FP_RTK_ENROLL_FINISH_CAPTURE,
  FP_RTK_ENROLL_ACCEPT_SAMPLE,
  FP_RTK_ENROLL_CHECK_DUPLICATE,
  FP_RTK_ENROLL_COMMIT,
  FP_RTK_ENROLL_NUM_STATES,
 } FpRtkEnrollState;
 typedef enum {
  FP_RTK_VERIFY_CAPTURE = 0,
  FP_RTK_VERIFY_FINISH_CAPTURE,
  FP_RTK_VERIFY_ACCEPT_SAMPLE,
  FP_RTK_VERIFY_INDENTIFY_FEATURE,
  FP_RTK_VERIFY_UPDATE_TEMPLATE,
  FP_RTK_VERIFY_NUM_STATES,
 } FpRtkVerifyState;
 typedef enum {
  FP_RTK_DELETE_GET_POS = 0,
  FP_RTK_DELETE_PRINT,
  FP_RTK_DELETE_NUM_STATES,
 } FpRtkDeleteState;
 typedef enum {
  FP_RTK_INIT_SELECT_OS = 0,
  FP_RTK_INIT_GET_ENROLL_NUM,
  FP_RTK_INIT_NUM_STATES,
 } FpRtkInitState;
 typedef enum {
  FP_RTK_CMD_SEND = 0,
  FP_RTK_CMD_TRANS_DATA,
  FP_RTK_CMD_GET_STATUS,
  FP_RTK_CMD_NUM_STATES,
 } FpRtkCmdState;
 struct _FpiDeviceRealtek
 {
  FpDevice        parent;
  FpiSsm         *task_ssm;
  FpiSsm         *cmd_ssm;
  FpiUsbTransfer *cmd_transfer;
  FpiUsbTransfer *data_transfer;
  gint            cmd_type;
  FpRtkMsgType    message_type;
  gboolean        cmd_cancellable;
  gint            enroll_stage;
  gint            max_enroll_stage;
  guchar         *read_data;
  gsize           trans_data_len;
  FpRtkPurpose    fp_purpose;
  gint            pos_index;
  gint            template_num;
 };
 struct realtek_fp_cmd
 {
  uint8_t cmd[FP_RTK_CMD_LEN];
  uint8_t param[FP_RTK_CMD_PARAM_LEN];
  uint8_t addr[FP_RTK_CMD_ADDR_LEN];
  uint8_t data_len[FP_RTK_CMD_DATA_LEN];
 };
 static struct realtek_fp_cmd co_start_capture = {
  .cmd = {0x05, 0x05},
 };
 static struct realtek_fp_cmd co_finish_capture = {
  .cmd = {0x45, 0x06},
  .data_len = {0x05},
 };
 static struct realtek_fp_cmd co_accept_sample = {
  .cmd = {0x45, 0x08},
  .data_len = {0x09},
 };
 static struct realtek_fp_cmd tls_identify_feature = {
  .cmd = {0x45, 0x22},
  .data_len = {0x2A},
 };
 static struct realtek_fp_cmd co_get_enroll_num = {
  .cmd = {0x45, 0x0d},
  .data_len = {0x02},
 };
 static struct realtek_fp_cmd co_get_template = {
  .cmd = {0x45, 0x0E},
 };
 static struct realtek_fp_cmd tls_enroll_begin = {
  .cmd = {0x05, 0x20},
 };
 static struct realtek_fp_cmd co_check_duplicate = {
  .cmd = {0x45, 0x10},
  .data_len = {0x22},
 };
 static struct realtek_fp_cmd tls_enroll_commit = {
  .cmd = {0x85, 0x21},
  .data_len = {0x20},
 };
 static struct realtek_fp_cmd co_update_template = {
  .cmd = {0x05, 0x11},
 };
 static struct realtek_fp_cmd co_delete_record = {
  .cmd = {0x05, 0x0F},
 };
 static struct realtek_fp_cmd co_select_system = {
  .cmd = {0x05, 0x13},
 };
--- a/libfprint/drivers/synaptics/synaptics.c
+++ b/libfprint/drivers/synaptics/synaptics.c
@@ -40,14 +40,9 @@ static const FpIdEntry id_table[] = {
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00F0,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0103,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0123,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0124,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0126,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0129,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0168,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x015F,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0104,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0173,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0106,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
@@ -109,10 +104,6 @@ cmd_receive_cb (FpiUsbTransfer *transfer,
          if (self->cmd_complete_on_removal)
            {
              if (self->delay_error)
                fpi_ssm_mark_failed (transfer->ssm,
                                     g_steal_pointer (&self->delay_error));
              else
              fpi_ssm_mark_completed (transfer->ssm);
              return;
            }
@@ -648,21 +639,18 @@ verify (FpDevice *device)
 }
 static void
-identify_complete_after_finger_removal (FpiDeviceSynaptics *self, GError *error)
+identify_complete_after_finger_removal (FpiDeviceSynaptics *self)
 {
  FpDevice *device = FP_DEVICE (self);
  if (self->finger_on_sensor)
    {
      fp_dbg ("delaying identify report until after finger removal!");
      if (error)
        g_propagate_error (&self->delay_error, error);
      self->cmd_complete_on_removal = TRUE;
    }
  else
    {
-      fpi_device_identify_complete (device, error);
+      fpi_device_identify_complete (device, NULL);
    }
 }
@@ -712,18 +700,19 @@ identify_msg_cb (FpiDeviceSynaptics *self,
          fp_info ("Match error occurred");
          fpi_device_identify_report (device, NULL, NULL,
                                      fpi_device_retry_new (FP_DEVICE_RETRY_GENERAL));
-          identify_complete_after_finger_removal (self, NULL);
+          identify_complete_after_finger_removal (self);
        }
      else if (resp->result == BMKT_FP_NO_MATCH)
        {
          fp_info ("Print didn't match");
          fpi_device_identify_report (device, NULL, NULL, NULL);
-          identify_complete_after_finger_removal (self, NULL);
+          identify_complete_after_finger_removal (self);
        }
-      else if (resp->result == BMKT_FP_DATABASE_NO_RECORD_EXISTS || resp->result == BMKT_FP_DATABASE_EMPTY)
+      else if (resp->result == BMKT_FP_DATABASE_NO_RECORD_EXISTS)
        {
          fp_info ("Print is not in database");
-          identify_complete_after_finger_removal (self, fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND));
+          fpi_device_identify_complete (device,
                                        fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND));
        }
      else
        {
@@ -759,7 +748,7 @@ identify_msg_cb (FpiDeviceSynaptics *self,
        else
          fpi_device_identify_report (device, NULL, print, NULL);
-        identify_complete_after_finger_removal (self, NULL);
+        identify_complete_after_finger_removal (self);
      }
    }
 }
--- a/libfprint/drivers/synaptics/synaptics.h
+++ b/libfprint/drivers/synaptics/synaptics.h
@@ -127,5 +127,4 @@ struct _FpiDeviceSynaptics
  struct syna_enroll_resp_data enroll_resp_data;
  syna_state_t                 state;
  GError                      *delay_error;
 };
--- a/libfprint/drivers/upektc.c
+++ b/libfprint/drivers/upektc.c
@@ -431,7 +431,6 @@ dev_deinit (FpImageDevice *dev)
 static const FpIdEntry id_table[] = {
  { .vid = 0x0483,  .pid = 0x2015, .driver_data = UPEKTC_2015 },
  { .vid = 0x0483,  .pid = 0x2017, .driver_data = UPEKTC_2015 },
  { .vid = 0x147e,  .pid = 0x3001, .driver_data = UPEKTC_3001 },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },
 };
--- a/libfprint/drivers/upektc_img.c
+++ b/libfprint/drivers/upektc_img.c
@@ -31,6 +31,10 @@ static void start_deactivation (FpImageDevice *dev);
 #define CTRL_TIMEOUT 4000
 #define BULK_TIMEOUT 4000
 #define IMAGE_WIDTH 144
 #define IMAGE_HEIGHT 384
 #define IMAGE_SIZE (IMAGE_WIDTH * IMAGE_HEIGHT)
 #define MAX_CMD_SIZE 64
 #define MAX_RESPONSE_SIZE 2052
 #define SHORT_RESPONSE_SIZE 64
@@ -43,10 +47,8 @@ struct _FpiDeviceUpektcImg
  unsigned char  response[MAX_RESPONSE_SIZE];
  unsigned char *image_bits;
  unsigned char  seq;
  size_t         expected_image_size;
  size_t         image_size;
  size_t         response_rest;
  gboolean       area_sensor;
  gboolean       deactivating;
 };
 G_DECLARE_FINAL_TYPE (FpiDeviceUpektcImg, fpi_device_upektc_img, FPI,
@@ -178,7 +180,6 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
                      gpointer user_data, GError *error)
 {
  FpImageDevice *dev = FP_IMAGE_DEVICE (device);
  FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_GET_CLASS (dev);
  FpiDeviceUpektcImg *self = FPI_DEVICE_UPEKTC_IMG (dev);
  unsigned char *data = self->response;
  FpImage *img;
@@ -246,30 +247,8 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
                                     CAPTURE_ACK_00_28);
              break;
            case 0x13:
              /* finger is present keep your finger on reader */
              fpi_device_report_finger_status_changes (device,
                                                       FP_FINGER_STATUS_NEEDED,
                                                       FP_FINGER_STATUS_NONE);
              fpi_ssm_jump_to_state (transfer->ssm,
                                     self->area_sensor ?
                                     CAPTURE_ACK_00_28 : CAPTURE_ACK_00_28_TERM);
              break;
            case 0x00:
              /* finger is present! */
              fpi_device_report_finger_status_changes (device,
                                                       FP_FINGER_STATUS_PRESENT,
                                                       FP_FINGER_STATUS_NONE);
              fpi_ssm_jump_to_state (transfer->ssm,
                                     CAPTURE_ACK_00_28);
              break;
            case 0x01:
              /* no finger! */
              fpi_device_report_finger_status_changes (device,
                                                       FP_FINGER_STATUS_NONE,
                                                       FP_FINGER_STATUS_PRESENT);
              fpi_ssm_jump_to_state (transfer->ssm,
                                     CAPTURE_ACK_00_28);
              break;
@@ -282,20 +261,18 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
              fpi_image_device_report_finger_status (dev,
                                                     FALSE);
              fpi_ssm_jump_to_state (transfer->ssm,
-                                     self->area_sensor ?
+                                     CAPTURE_ACK_00_28_TERM);
                                     CAPTURE_ACK_00_28 : CAPTURE_ACK_00_28_TERM);
              break;
            case 0x1d:
-              /* too much horizontal movement */
+              /* too much horisontal movement */
-              fp_err ("too much horizontal movement, aborting");
+              fp_err ("too much horisontal movement, aborting");
              fpi_image_device_retry_scan (dev,
                                           FP_DEVICE_RETRY_CENTER_FINGER);
              fpi_image_device_report_finger_status (dev,
                                                     FALSE);
              fpi_ssm_jump_to_state (transfer->ssm,
-                                     self->area_sensor ?
+                                     CAPTURE_ACK_00_28_TERM);
                                     CAPTURE_ACK_00_28 : CAPTURE_ACK_00_28_TERM);
              break;
            default:
@@ -306,8 +283,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
              fpi_image_device_report_finger_status (dev,
                                                     FALSE);
              fpi_ssm_jump_to_state (transfer->ssm,
-                                     self->area_sensor ?
+                                     CAPTURE_ACK_00_28_TERM);
                                     CAPTURE_ACK_00_28 : CAPTURE_ACK_00_28_TERM);
              break;
            }
          break;
@@ -331,13 +307,13 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
          self->image_size +=
            upektc_img_process_image_frame (self->image_bits + self->image_size,
                                            data);
-          BUG_ON (self->image_size != self->expected_image_size);
+          BUG_ON (self->image_size != IMAGE_SIZE);
          fp_dbg ("Image size is %lu",
                  (gulong) self->image_size);
-          img = fp_image_new (img_class->img_width, img_class->img_height);
+          img = fp_image_new (IMAGE_WIDTH, IMAGE_HEIGHT);
          img->flags |= FPI_IMAGE_PARTIAL;
          memcpy (img->data, self->image_bits,
-                  self->image_size);
+                  IMAGE_SIZE);
          fpi_image_device_image_captured (dev, img);
          fpi_image_device_report_finger_status (dev,
                                                 FALSE);
@@ -370,10 +346,6 @@ capture_run_state (FpiSsm *ssm, FpDevice *_dev)
  switch (fpi_ssm_get_cur_state (ssm))
    {
    case CAPTURE_INIT_CAPTURE:
      if (self->area_sensor)
        upektc_img_submit_req (ssm, dev, upek2020_init_capture_press, sizeof (upek2020_init_capture_press),
                               self->seq, capture_reqs_cb);
      else
      upektc_img_submit_req (ssm, dev, upek2020_init_capture, sizeof (upek2020_init_capture),
                             self->seq, capture_reqs_cb);
      self->seq++;
@@ -541,81 +513,15 @@ init_reqs_cb (FpiUsbTransfer *transfer, FpDevice *device,
    fpi_ssm_mark_failed (transfer->ssm, error);
 }
 /* TODO: process response properly */
 static void
 init_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
                   gpointer user_data, GError *error)
 {
-  FpImageDevice *dev = FP_IMAGE_DEVICE (device);
+  if (!error)
  FpiDeviceUpektcImg *self = FPI_DEVICE_UPEKTC_IMG (dev);
  unsigned char *data = self->response;
  if (error)
    {
      fpi_ssm_mark_failed (transfer->ssm, error);
      return;
    }
  if (data[12] == 0x06 && data[13] == 0x14)  /* if get_info */
    {
      FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_GET_CLASS (dev);
      uint16_t width = (data[51] << 8) | data[50];
      uint16_t height = (data[53] << 8) | data[52];
      self->area_sensor = !(data[49] & 0x80);
      switch (width)
        {
        case 256:
          fp_dbg ("Sensor type : TCS1x, width x height: %hu x %hu", width, height); /* 360x256 --- 270x192 must be set */
          BUG_ON (height != 360);
          img_class->img_width = 192;
          img_class->img_height = 270;
          break;
        case 208:
          fp_dbg ("Sensor type : TCS2, width x height: %hu x %hu", width, height); /* 288x208 --- 216x156 must be set */
          BUG_ON (height != 288);
          img_class->img_width = 156;
          img_class->img_height = 216;
          break;
        case 248:
          fp_dbg ("Sensor type : TCS3, width x height: %hu x %hu", width, height); /* 360x248 --- 270x186 must be set */
          BUG_ON (height != 360);
          img_class->img_width = 186;
          img_class->img_height = 270;
          break;
        case 192:
          fp_dbg ("Sensor type : TCS4x, width x height: %hu x %hu", width, height); /* 512x192 --- 384x144 must be set */
          BUG_ON (height != 512);
          img_class->img_width = 144;
          img_class->img_height = 384;
          break;
        case 144:
          fp_dbg ("Sensor type : TCS5x, width x height: %hu x %hu", width, height); /* 512x144 --- 384x108 must be set */
          BUG_ON (height != 512);
          img_class->img_width = 108;
          img_class->img_height = 384;
          break;
        default:
          fp_dbg ("Sensor type : Unknown");
          fpi_ssm_mark_failed (transfer->ssm,
                               fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
                                                         "Unknown sensor type (reported size %dx%d)",
                                                         width, height));
          return;
        }
      self->expected_image_size = img_class->img_width * img_class->img_height;
      self->image_bits = g_malloc0 (self->expected_image_size * 2);
    }
    fpi_ssm_next_state (transfer->ssm);
  else
    fpi_ssm_mark_failed (transfer->ssm, error);
 }
 static void
@@ -710,6 +616,7 @@ dev_deactivate (FpImageDevice *dev)
 static void
 dev_init (FpImageDevice *dev)
 {
  FpiDeviceUpektcImg *self = FPI_DEVICE_UPEKTC_IMG (dev);
  GError *error = NULL;
  /* TODO check that device has endpoints we're using */
@@ -720,6 +627,7 @@ dev_init (FpImageDevice *dev)
      return;
    }
  self->image_bits = g_malloc0 (IMAGE_SIZE * 2);
  fpi_image_device_open_complete (dev, NULL);
 }
@@ -779,6 +687,6 @@ fpi_device_upektc_img_class_init (FpiDeviceUpektcImgClass *klass)
  img_class->bz3_threshold = 20;
-  img_class->img_width = -1;
+  img_class->img_width = IMAGE_WIDTH;
-  img_class->img_height = -1;
+  img_class->img_height = IMAGE_HEIGHT;
 }
--- a/libfprint/drivers/upektc_img.h
+++ b/libfprint/drivers/upektc_img.h
@@ -75,22 +75,6 @@ static const unsigned char upek2020_init_capture[] = {
  0x02,
  0x00, /* Wait for acceptable finger */
  0x02,
  0x25, 0xa9 /* CRC */
 };
 static const unsigned char upek2020_init_capture_press[] = {
  'C', 'i', 'a', 'o',
  0x00,
  0x00, 0x0e, /* Seq = 7, len = 0x00e */
  0x28, /* CMD = 0x28 */
  0x0b, 0x00, /* Inner len = 0x000b */
  0x00, 0x00,
  0x0e, /* SUBCMD = 0x0e */
  0x02,
  0xfe, 0xff, 0xff, 0xff, /* timeout = -2 = 0xfffffffe = infinite time */
  0x02,
  0x01, /* Wait for finger */
  0x02,
  0x14, 0x9a /* CRC */
 };
--- a/libfprint/drivers/uru4000.c
+++ b/libfprint/drivers/uru4000.c
@@ -317,7 +317,6 @@ irq_handler (FpiUsbTransfer *transfer,
      if (urudev->irqs_stopped_cb)
        urudev->irqs_stopped_cb (imgdev);
      urudev->irqs_stopped_cb = NULL;
      g_clear_error (&error);
      return;
    }
  else if (error)
@@ -552,7 +551,7 @@ image_transfer_cb (FpiUsbTransfer *transfer, FpDevice *dev,
    }
  else
    {
-      self->img_data = g_memdup2 (transfer->buffer, sizeof (struct uru4k_image));
+      self->img_data = g_memdup (transfer->buffer, sizeof (struct uru4k_image));
      self->img_data_actual_length = transfer->actual_length;
      fpi_ssm_next_state (ssm);
    }
@@ -1414,9 +1413,6 @@ dev_deinit (FpImageDevice *dev)
    SECITEM_FreeItem (self->param, PR_TRUE);
  if (self->slot)
    PK11_FreeSlot (self->slot);
  NSS_Shutdown ();
  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (dev)),
                                  self->interface, 0, &error);
  g_clear_pointer (&self->rand, g_rand_free);
--- a/libfprint/drivers/vfs0050.c
+++ b/libfprint/drivers/vfs0050.c
@@ -581,7 +581,7 @@ activate_ssm (FpiSsm *ssm, FpDevice *dev)
            /* Initialize fingerprint buffer */
            g_free (self->lines_buffer);
            self->memory = VFS_USB_BUFFER_SIZE;
-            self->lines_buffer = g_malloc0 (self->memory);
+            self->lines_buffer = g_malloc (self->memory);
            self->bytes = 0;
            /* Finger is on the scanner */
@@ -589,15 +589,12 @@ activate_ssm (FpiSsm *ssm, FpDevice *dev)
          }
        /* Increase buffer size while it's insufficient */
-        while (self->memory < self->bytes + VFS_USB_BUFFER_SIZE)
+        while (self->bytes + VFS_USB_BUFFER_SIZE > self->memory)
          {
-            int pre_memory = self->memory;
+            self->memory <<= 1;
            self->memory += VFS_USB_BUFFER_SIZE;
            self->lines_buffer =
              (struct vfs_line *) g_realloc (self->lines_buffer,
                                             self->memory);
            memset ((guint8 *) self->lines_buffer + pre_memory, 0,
                    VFS_USB_BUFFER_SIZE);
          }
        /* Receive chunk of data */
--- a/libfprint/drivers/vfs301_proto.c
+++ b/libfprint/drivers/vfs301_proto.c
@@ -432,7 +432,7 @@ img_process_data (int first_block, FpDeviceVfs301 *dev, const guint8 *buf, int l
    usb_send (dev, data, len, NULL); \
  }
-#define RAW_DATA(x) g_memdup2 (x, sizeof (x)), sizeof (x)
+#define RAW_DATA(x) g_memdup (x, sizeof (x)), sizeof (x)
 #define IS_VFS301_FP_SEQ_START(b) ((b[0] == 0x01) && (b[1] == 0xfe))
--- a/libfprint/drivers/virtual-device-listener.c
+++ b/libfprint/drivers/virtual-device-listener.c
@@ -273,8 +273,7 @@ on_stream_read_cb (GObject      *source_object,
        }
      else
        {
-          g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
+          // g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "Got empty data");
                                   "Got empty data");
          return;
        }
    }
--- a/libfprint/drivers/virtual-device.c
+++ b/libfprint/drivers/virtual-device.c
@@ -526,8 +526,8 @@ dev_verify (FpDevice *dev)
  if (scan_id)
    {
      g_autoptr(FpPrint) new_scan = NULL;
      GVariant *data = NULL;
      FpPrint *new_scan;
      FpPrint *print;
      gboolean success;
@@ -556,7 +556,7 @@ dev_verify (FpDevice *dev)
          self->match_reported = TRUE;
          fpi_device_verify_report (dev,
                                    success ? FPI_MATCH_SUCCESS : FPI_MATCH_FAIL,
-                                    g_steal_pointer (&new_scan),
+                                    new_scan,
                                    NULL);
        }
    }
@@ -733,13 +733,7 @@ dev_deinit (FpDevice *dev)
    }
  if (!self->keep_alive)
    {
    stop_listener (self);
      self->supports_cancellation = TRUE;
    }
  self->enroll_stages_passed = 0;
  self->match_reported = FALSE;
  fpi_device_close_complete (dev, NULL);
 }
--- a/libfprint/fp-context.c
+++ b/libfprint/fp-context.c
@@ -67,26 +67,32 @@ enum {
 static guint signals[LAST_SIGNAL] = { 0 };
 static const char *
-get_drivers_allowlist_env (void)
+get_drivers_whitelist_env (void)
 {
-  return g_getenv ("FP_DRIVERS_ALLOWLIST");
+  return g_getenv ("FP_DRIVERS_WHITELIST");
 }
 static gboolean
 is_driver_allowed (const gchar *driver)
 {
-  g_auto(GStrv) allowlisted_drivers = NULL;
+  g_auto(GStrv) whitelisted_drivers = NULL;
-  const char *fp_drivers_allowlist_env;
+  const char *fp_drivers_whitelist_env;
  int i;
  g_return_val_if_fail (driver, TRUE);
-  fp_drivers_allowlist_env = get_drivers_allowlist_env ();
+  fp_drivers_whitelist_env = get_drivers_whitelist_env ();
-  if (!fp_drivers_allowlist_env)
+  if (!fp_drivers_whitelist_env)
    return TRUE;
-  allowlisted_drivers = g_strsplit (fp_drivers_allowlist_env, ":", -1);
+  whitelisted_drivers = g_strsplit (fp_drivers_whitelist_env, ":", -1);
-  return g_strv_contains ((const gchar * const *) allowlisted_drivers, driver);
+
  for (i = 0; whitelisted_drivers[i]; ++i)
    if (g_strcmp0 (driver, whitelisted_drivers[i]) == 0)
      return TRUE;
  return FALSE;
 }
 typedef struct
@@ -285,10 +291,11 @@ fp_context_finalize (GObject *object)
  FpContext *self = (FpContext *) object;
  FpContextPrivate *priv = fp_context_get_instance_private (self);
  g_clear_pointer (&priv->devices, g_ptr_array_unref);
  g_cancellable_cancel (priv->cancellable);
  g_clear_object (&priv->cancellable);
  g_clear_pointer (&priv->drivers, g_array_unref);
  g_clear_pointer (&priv->devices, g_ptr_array_unref);
  g_slist_free_full (g_steal_pointer (&priv->sources), (GDestroyNotify) g_source_destroy);
@@ -358,7 +365,7 @@ fp_context_init (FpContext *self)
  priv->drivers = fpi_get_driver_types ();
-  if (get_drivers_allowlist_env ())
+  if (get_drivers_whitelist_env ())
    {
      for (i = 0; i < priv->drivers->len;)
        {
--- a/libfprint/fp-device-private.h
+++ b/libfprint/fp-device-private.h
@@ -44,7 +44,7 @@ typedef struct
  FpDeviceType type;
  GUsbDevice  *usb_device;
-  gchar       *virtual_env;
+  const gchar *virtual_env;
  struct
  {
    gchar *spidev_path;
@@ -111,6 +111,8 @@ typedef struct
  GDestroyNotify   enroll_progress_destroy;
 } FpEnrollData;
 void enroll_data_free (FpEnrollData *enroll_data);
 typedef struct
 {
  FpPrint       *enrolled_print;   /* verify */
@@ -126,6 +128,7 @@ typedef struct
  GDestroyNotify match_destroy;
 } FpMatchData;
 void match_data_free (FpMatchData *match_data);
 void fpi_device_suspend (FpDevice *device);
 void fpi_device_resume (FpDevice *device);
--- a/libfprint/fp-device.c
+++ b/libfprint/fp-device.c
@@ -1088,15 +1088,6 @@ fp_device_resume_finish (FpDevice     *device,
  return g_task_propagate_boolean (G_TASK (result), error);
 }
 static void
 enroll_data_free (FpEnrollData *data)
 {
  if (data->enroll_progress_destroy)
    data->enroll_progress_destroy (data->enroll_progress_data);
  data->enroll_progress_data = NULL;
  g_clear_object (&data->print);
  g_free (data);
 }
 /**
 * fp_device_enroll:
@@ -1181,6 +1172,10 @@ fp_device_enroll (FpDevice           *device,
        }
    }
  priv->current_action = FPI_DEVICE_ACTION_ENROLL;
  priv->current_task = g_steal_pointer (&task);
  setup_task_cancellable (device);
  fpi_device_update_temp (device, TRUE);
  if (priv->temp_current == FP_TEMPERATURE_HOT)
    {
@@ -1189,10 +1184,6 @@ fp_device_enroll (FpDevice           *device,
      return;
    }
  priv->current_action = FPI_DEVICE_ACTION_ENROLL;
  priv->current_task = g_steal_pointer (&task);
  setup_task_cancellable (device);
  data = g_new0 (FpEnrollData, 1);
  data->print = g_object_ref_sink (template_print);
  data->enroll_progress_cb = progress_cb;
@@ -1226,23 +1217,6 @@ fp_device_enroll_finish (FpDevice     *device,
  return g_task_propagate_pointer (G_TASK (result), error);
 }
 static void
 match_data_free (FpMatchData *data)
 {
  g_clear_object (&data->print);
  g_clear_object (&data->match);
  g_clear_error (&data->error);
  if (data->match_destroy)
    data->match_destroy (data->match_data);
  data->match_data = NULL;
  g_clear_object (&data->enrolled_print);
  g_clear_pointer (&data->gallery, g_ptr_array_unref);
  g_free (data);
 }
 /**
 * fp_device_verify:
 * @device: a #FpDevice
@@ -1299,6 +1273,10 @@ fp_device_verify (FpDevice           *device,
      return;
    }
  priv->current_action = FPI_DEVICE_ACTION_VERIFY;
  priv->current_task = g_steal_pointer (&task);
  setup_task_cancellable (device);
  fpi_device_update_temp (device, TRUE);
  if (priv->temp_current == FP_TEMPERATURE_HOT)
    {
@@ -1307,10 +1285,6 @@ fp_device_verify (FpDevice           *device,
      return;
    }
  priv->current_action = FPI_DEVICE_ACTION_VERIFY;
  priv->current_task = g_steal_pointer (&task);
  setup_task_cancellable (device);
  data = g_new0 (FpMatchData, 1);
  data->enrolled_print = g_object_ref (enrolled_print);
  data->match_cb = match_cb;
@@ -1426,13 +1400,9 @@ fp_device_identify (FpDevice           *device,
      return;
    }
-  if (prints == NULL)
+  priv->current_action = FPI_DEVICE_ACTION_IDENTIFY;
-    {
+  priv->current_task = g_steal_pointer (&task);
-      g_task_return_error (task,
+  setup_task_cancellable (device);
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_DATA_INVALID,
                                                     "Invalid gallery array"));
      return;
    }
  fpi_device_update_temp (device, TRUE);
  if (priv->temp_current == FP_TEMPERATURE_HOT)
@@ -1442,10 +1412,6 @@ fp_device_identify (FpDevice           *device,
      return;
    }
  priv->current_action = FPI_DEVICE_ACTION_IDENTIFY;
  priv->current_task = g_steal_pointer (&task);
  setup_task_cancellable (device);
  data = g_new0 (FpMatchData, 1);
  /* We cannot store the gallery directly, because the ptr array may not own
   * a reference to each print. Also, the caller could in principle modify the
@@ -1559,6 +1525,10 @@ fp_device_capture (FpDevice           *device,
      return;
    }
  priv->current_action = FPI_DEVICE_ACTION_CAPTURE;
  priv->current_task = g_steal_pointer (&task);
  setup_task_cancellable (device);
  fpi_device_update_temp (device, TRUE);
  if (priv->temp_current == FP_TEMPERATURE_HOT)
    {
@@ -1567,10 +1537,6 @@ fp_device_capture (FpDevice           *device,
      return;
    }
  priv->current_action = FPI_DEVICE_ACTION_CAPTURE;
  priv->current_task = g_steal_pointer (&task);
  setup_task_cancellable (device);
  priv->wait_for_finger = wait_for_finger;
  cls->capture (device);
--- a/libfprint/fp-image.c
+++ b/libfprint/fp-image.c
@@ -20,11 +20,9 @@
 #define FP_COMPONENT "image"
 #include "fpi-compat.h"
 #include "fpi-image.h"
 #include "fpi-log.h"
 #include <config.h>
 #include <nbis.h>
 /**
@@ -160,65 +158,60 @@ fp_image_init (FpImage *self)
 typedef struct
 {
  GAsyncReadyCallback user_cb;
  struct fp_minutiae *minutiae;
-  guchar             *binarized;
+  gint                width, height;
  gdouble             ppmm;
  FpiImageFlags       flags;
-  unsigned char      *image;
+  guchar             *image;
-  gboolean            image_changed;
+  guchar             *binarized;
-} DetectMinutiaeNbisData;
+} DetectMinutiaeData;
 static void
-fp_image_detect_minutiae_free (DetectMinutiaeNbisData *data)
+fp_image_detect_minutiae_free (DetectMinutiaeData *data)
 {
  g_clear_pointer (&data->image, g_free);
  g_clear_pointer (&data->minutiae, free_minutiae);
  g_clear_pointer (&data->binarized, g_free);
  if (data->image_changed)
    g_clear_pointer (&data->image, g_free);
  g_free (data);
 }
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (DetectMinutiaeNbisData, fp_image_detect_minutiae_free)
+static void
-
+fp_image_detect_minutiae_cb (GObject      *source_object,
-
+                             GAsyncResult *res,
-static gboolean
+                             gpointer      user_data)
 fp_image_detect_minutiae_nbis_finish (FpImage *self,
                                      GTask   *task,
                                      GError **error)
 {
-  g_autoptr(DetectMinutiaeNbisData) data = NULL;
+  GTask *task = G_TASK (res);
  FpImage *image;
  DetectMinutiaeData *data = g_task_get_task_data (task);
-  data = g_task_propagate_pointer (task, error);
+  if (!g_task_had_error (task))
  if (data != NULL)
    {
-      self->flags = data->flags;
+      gint i;
      image = FP_IMAGE (source_object);
-      if (data->image_changed)
+      image->flags = data->flags;
        {
          g_clear_pointer (&self->data, g_free);
          self->data = g_steal_pointer (&data->image);
        }
-      g_clear_pointer (&self->binarized, g_free);
+      g_clear_pointer (&image->data, g_free);
-      self->binarized = g_steal_pointer (&data->binarized);
+      image->data = g_steal_pointer (&data->image);
-      g_clear_pointer (&self->minutiae, g_ptr_array_unref);
+      g_clear_pointer (&image->binarized, g_free);
-      self->minutiae = g_ptr_array_new_full (data->minutiae->num,
+      image->binarized = g_steal_pointer (&data->binarized);
      g_clear_pointer (&image->minutiae, g_ptr_array_unref);
      image->minutiae = g_ptr_array_new_full (data->minutiae->num,
                                              (GDestroyNotify) free_minutia);
-      for (int i = 0; i < data->minutiae->num; i++)
+      for (i = 0; i < data->minutiae->num; i++)
-        g_ptr_array_add (self->minutiae,
+        g_ptr_array_add (image->minutiae,
                         g_steal_pointer (&data->minutiae->list[i]));
-      /* Don't let free_minutiae delete the minutiae that we now own. */
+      /* Don't let it delete anything. */
      data->minutiae->num = 0;
      return TRUE;
    }
-  return FALSE;
+  if (data->user_cb)
    data->user_cb (source_object, res, user_data);
 }
 static void
@@ -271,83 +264,70 @@ invert_colors (guint8 *data, gint width, gint height)
 }
 static void
-fp_image_detect_minutiae_nbis_thread_func (GTask        *task,
+fp_image_detect_minutiae_thread_func (GTask        *task,
                                      gpointer      source_object,
                                      gpointer      task_data,
                                      GCancellable *cancellable)
 {
  g_autoptr(GTimer) timer = NULL;
-  g_autoptr(DetectMinutiaeNbisData) ret_data = NULL;
+  DetectMinutiaeData *data = task_data;
-  g_autoptr(GTask) thread_task = g_steal_pointer (&task);
+  struct fp_minutiae *minutiae = NULL;
  g_autofree gint *direction_map = NULL;
  g_autofree gint *low_contrast_map = NULL;
  g_autofree gint *low_flow_map = NULL;
  g_autofree gint *high_curve_map = NULL;
  g_autofree gint *quality_map = NULL;
-  g_autofree LFSPARMS *lfsparms = NULL;
+  g_autofree guchar *bdata = NULL;
  FpImage *self = source_object;
  FpiImageFlags minutiae_flags;
  unsigned char *image;
  gint map_w, map_h;
  gint bw, bh, bd;
  gint r;
-
+  g_autofree LFSPARMS *lfsparms = NULL;
  image = self->data;
  minutiae_flags = self->flags & ~(FPI_IMAGE_H_FLIPPED |
                                   FPI_IMAGE_V_FLIPPED |
                                   FPI_IMAGE_COLORS_INVERTED);
  if (minutiae_flags != FPI_IMAGE_NONE)
    image = g_memdup2 (self->data, self->width * self->height);
  ret_data = g_new0 (DetectMinutiaeNbisData, 1);
  ret_data->flags = minutiae_flags;
  ret_data->image = image;
  ret_data->image_changed = image != self->data;
  /* Normalize the image first */
-  if (self->flags & FPI_IMAGE_H_FLIPPED)
+  if (data->flags & FPI_IMAGE_H_FLIPPED)
-    hflip (image, self->width, self->height);
+    hflip (data->image, data->width, data->height);
-  if (self->flags & FPI_IMAGE_V_FLIPPED)
+  if (data->flags & FPI_IMAGE_V_FLIPPED)
-    vflip (image, self->width, self->height);
+    vflip (data->image, data->width, data->height);
-  if (self->flags & FPI_IMAGE_COLORS_INVERTED)
+  if (data->flags & FPI_IMAGE_COLORS_INVERTED)
-    invert_colors (image, self->width, self->height);
+    invert_colors (data->image, data->width, data->height);
-  lfsparms = g_memdup2 (&g_lfsparms_V2, sizeof (LFSPARMS));
+  data->flags &= ~(FPI_IMAGE_H_FLIPPED | FPI_IMAGE_V_FLIPPED | FPI_IMAGE_COLORS_INVERTED);
-  lfsparms->remove_perimeter_pts = minutiae_flags & FPI_IMAGE_PARTIAL ? TRUE : FALSE;
+
  lfsparms = g_memdup (&g_lfsparms_V2, sizeof (LFSPARMS));
  lfsparms->remove_perimeter_pts = data->flags & FPI_IMAGE_PARTIAL ? TRUE : FALSE;
  timer = g_timer_new ();
-  r = get_minutiae (&ret_data->minutiae, &quality_map, &direction_map,
+  r = get_minutiae (&minutiae, &quality_map, &direction_map,
                    &low_contrast_map, &low_flow_map, &high_curve_map,
-                    &map_w, &map_h, &ret_data->binarized, &bw, &bh, &bd,
+                    &map_w, &map_h, &bdata, &bw, &bh, &bd,
-                    image, self->width, self->height, 8,
+                    data->image, data->width, data->height, 8,
-                    self->ppmm, lfsparms);
+                    data->ppmm, lfsparms);
  g_timer_stop (timer);
  fp_dbg ("Minutiae scan completed in %f secs", g_timer_elapsed (timer, NULL));
-  if (g_task_had_error (thread_task))
+  data->binarized = g_steal_pointer (&bdata);
-    return;
+  data->minutiae = minutiae;
  if (r)
    {
      fp_err ("get minutiae failed, code %d", r);
-      g_task_return_new_error (thread_task, G_IO_ERROR,
+      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "Minutiae scan failed with code %d", r);
-                               G_IO_ERROR_FAILED,
+      g_object_unref (task);
                               "Minutiae scan failed with code %d", r);
      return;
    }
-  if (!ret_data->minutiae || ret_data->minutiae->num == 0)
+  if (!data->minutiae || data->minutiae->num == 0)
    {
-      g_task_return_new_error (thread_task, G_IO_ERROR, G_IO_ERROR_FAILED,
+      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED,
                               "No minutiae found");
      g_object_unref (task);
      return;
    }
-  g_task_return_pointer (thread_task, g_steal_pointer (&ret_data),
+  g_task_return_boolean (task, TRUE);
-                         (GDestroyNotify) fp_image_detect_minutiae_free);
+  g_object_unref (task);
 }
 /**
@@ -463,25 +443,21 @@ fp_image_detect_minutiae (FpImage            *self,
                          GAsyncReadyCallback callback,
                          gpointer            user_data)
 {
-  g_autoptr(GTask) task = NULL;
+  GTask *task;
  DetectMinutiaeData *data = g_new0 (DetectMinutiaeData, 1);
-  g_return_if_fail (FP_IS_IMAGE (self));
+  task = g_task_new (self, cancellable, fp_image_detect_minutiae_cb, user_data);
  g_return_if_fail (callback != NULL);
-  task = g_task_new (self, cancellable, callback, user_data);
+  data->image = g_malloc (self->width * self->height);
-  g_task_set_source_tag (task, fp_image_detect_minutiae);
+  memcpy (data->image, self->data, self->width * self->height);
-  g_task_set_check_cancellable (task, TRUE);
+  data->flags = self->flags;
  data->width = self->width;
  data->height = self->height;
  data->ppmm = self->ppmm;
  data->user_cb = callback;
-  if (!g_atomic_int_compare_and_exchange (&self->detection_in_progress,
+  g_task_set_task_data (task, data, (GDestroyNotify) fp_image_detect_minutiae_free);
-                                          FALSE, TRUE))
+  g_task_run_in_thread (task, fp_image_detect_minutiae_thread_func);
    {
      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_ADDRESS_IN_USE,
                               "Minutiae detection is already in progress");
      return;
    }
  g_task_run_in_thread (g_steal_pointer (&task),
                        fp_image_detect_minutiae_nbis_thread_func);
 }
 /**
@@ -499,27 +475,7 @@ fp_image_detect_minutiae_finish (FpImage      *self,
                                 GAsyncResult *result,
                                 GError      **error)
 {
-  GTask *task;
+  return g_task_propagate_boolean (G_TASK (result), error);
  gboolean changed;
  g_return_val_if_fail (FP_IS_IMAGE (self), FALSE);
  g_return_val_if_fail (g_task_is_valid (result, self), FALSE);
  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) ==
                        fp_image_detect_minutiae, FALSE);
  task = G_TASK (result);
  changed = g_atomic_int_compare_and_exchange (&self->detection_in_progress,
                                               TRUE, FALSE);
  g_assert (changed);
  if (g_task_had_error (task))
    {
      gpointer data = g_task_propagate_pointer (task, error);
      g_assert (data == NULL);
      return FALSE;
    }
  return fp_image_detect_minutiae_nbis_finish (self, task, error);
 }
 /**
--- a/libfprint/fp-print.c
+++ b/libfprint/fp-print.c
@@ -339,7 +339,7 @@ fp_print_init (FpPrint *self)
 * create a new print, fill in the relevant metadata, and then start
 * enrollment.
 *
- * Returns: (transfer floating): A newly created #FpPrint
+ * Returns: (transfer floating): A newyl created #FpPrint
 */
 FpPrint *
 fp_print_new (FpDevice *device)
@@ -721,12 +721,13 @@ fp_print_serialize (FpPrint *print,
  result = g_variant_builder_end (&builder);
-#if (G_BYTE_ORDER == G_BIG_ENDIAN)
+  if (G_BYTE_ORDER == G_BIG_ENDIAN)
    {
      GVariant *tmp;
      tmp = g_variant_byteswap (result);
      g_variant_unref (result);
      result = tmp;
-#endif
+    }
  len = g_variant_get_size (result);
  /* Add 3 bytes of header */
@@ -799,11 +800,10 @@ fp_print_deserialize (const guchar *data,
  if (!raw_value)
    goto invalid_format;
-#if (G_BYTE_ORDER == G_BIG_ENDIAN)
+  if (G_BYTE_ORDER == G_BIG_ENDIAN)
    value = g_variant_byteswap (raw_value);
-#else
+  else
    value = g_variant_get_normal_form (raw_value);
 #endif
  g_variant_get (value,
                 "(i&s&sbymsmsi@a{sv}v)",
--- a/libfprint/fpi-byte-reader.c
+++ b/libfprint/fpi-byte-reader.c
@@ -1181,7 +1181,7 @@ fpi_byte_reader_dup_string_utf##bits (FpiByteReader * reader, type ** str) \
    *str = NULL; \
    return FALSE; \
  } \
-  *str = g_memdup2 (reader->data + reader->byte, size); \
+  *str = g_memdup (reader->data + reader->byte, size); \
  reader->byte += size; \
  return TRUE; \
 }
--- a/libfprint/fpi-byte-reader.h
+++ b/libfprint/fpi-byte-reader.h
@@ -22,7 +22,6 @@
 #pragma once
 #include <glib.h>
 #include "fpi-compat.h"
 #include "fpi-byte-utils.h"
 G_BEGIN_DECLS
@@ -361,7 +360,7 @@ static inline guint8 *
 fpi_byte_reader_dup_data_unchecked (FpiByteReader * reader, guint size)
 {
  gconstpointer data = fpi_byte_reader_get_data_unchecked (reader, size);
-  return (guint8 *) g_memdup2 (data, size);
+  return (guint8 *) g_memdup (data, size);
 }
 /* Unchecked variants that should not be used */
--- a/libfprint/fpi-byte-writer.c
+++ b/libfprint/fpi-byte-writer.c
@@ -211,7 +211,7 @@ fpi_byte_writer_reset_and_get_data (FpiByteWriter * writer)
  data = (guint8 *) writer->parent.data;
  if (!writer->owned)
-    data = g_memdup2 (data, writer->parent.size);
+    data = g_memdup (data, writer->parent.size);
  writer->parent.data = NULL;
  fpi_byte_writer_reset (writer);
--- a/libfprint/fpi-compat.h
+++ b/libfprint/fpi-compat.h
@@ -20,6 +20,25 @@
 #include <glib-object.h>
 #if !GLIB_CHECK_VERSION (2, 57, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GTypeClass, g_type_class_unref);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GEnumClass, g_type_class_unref);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GFlagsClass, g_type_class_unref);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GParamSpec, g_param_spec_unref);
 #else
 /* Re-define G_SOURCE_FUNC as we are technically not allowed to use it with
 * the version we depend on currently. */
 #undef G_SOURCE_FUNC
 #endif
 #define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void))(f))
 #if !GLIB_CHECK_VERSION (2, 63, 3)
 typedef struct _FpDeviceClass FpDeviceClass;
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FpDeviceClass, g_type_class_unref);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GDate, g_date_free);
 #endif
 #if  __GNUC__ > 10 || (__GNUC__ == 10 && __GNUC_MINOR__ >= 1)
 #define FP_GNUC_ACCESS(m, p, s) __attribute__((access (m, p, s)))
 #else
--- a/libfprint/fpi-device.c
+++ b/libfprint/fpi-device.c
@@ -21,7 +21,6 @@
 #define FP_COMPONENT "device"
 #include <math.h>
 #include <fcntl.h>
 #include <errno.h>
 #include "fpi-log.h"
@@ -522,6 +521,33 @@ fpi_device_get_driver_data (FpDevice *device)
  return priv->driver_data;
 }
 void
 enroll_data_free (FpEnrollData *data)
 {
  if (data->enroll_progress_destroy)
    data->enroll_progress_destroy (data->enroll_progress_data);
  data->enroll_progress_data = NULL;
  g_clear_object (&data->print);
  g_free (data);
 }
 void
 match_data_free (FpMatchData *data)
 {
  g_clear_object (&data->print);
  g_clear_object (&data->match);
  g_clear_error (&data->error);
  if (data->match_destroy)
    data->match_destroy (data->match_data);
  data->match_data = NULL;
  g_clear_object (&data->enrolled_print);
  g_clear_pointer (&data->gallery, g_ptr_array_unref);
  g_free (data);
 }
 /**
 * fpi_device_get_enroll_data:
 * @device: The #FpDevice
@@ -595,14 +621,7 @@ fpi_device_get_verify_data (FpDevice *device,
 * @device: The #FpDevice
 * @prints: (out) (transfer none) (element-type FpPrint): The gallery of prints
 *
- * Get prints gallery for identification.
+ * Get data for identify.
 *
 * The @prints array is always non-%NULL and may contain a list of #FpPrint's
 * that the device should match against.
 *
 * Note that @prints can be an empty array, in such case the device is expected
 * to report the scanned print matching the one in its internal storage, if any.
 *
 */
 void
 fpi_device_get_identify_data (FpDevice   *device,
@@ -1292,14 +1311,12 @@ fpi_device_enroll_complete (FpDevice *device, FpPrint *print, GError *error)
 * @device: The #FpDevice
 * @error: A #GError if result is %FPI_MATCH_ERROR
 *
- * Finish an ongoing verify operation.
+ * Finish an ongoing verify operation. The returned print should be
 * representing the new scan and not the one passed for verification.
 *
 * Note that @error should only be set for actual errors. In the case
 * of retry errors, report these using fpi_device_verify_report()
 * and then call this function without any error argument.
 *
 * If @error is not set, we expect that a result (and print, in case)
 * have been already reported via fpi_device_verify_report().
 */
 void
 fpi_device_verify_complete (FpDevice *device,
@@ -1357,14 +1374,9 @@ fpi_device_verify_complete (FpDevice *device,
 * @device: The #FpDevice
 * @error: The #GError or %NULL on success
 *
- * Finish an ongoing identify operation.
+ * Finish an ongoing identify operation. The match that was identified is
- *
+ * returned in @match. The @print parameter returns the newly created scan
- * Note that @error should only be set for actual errors. In the case
+ * that was used for matching.
 * of retry errors, report these using fpi_device_identify_report()
 * and then call this function without any error argument.
 *
 * If @error is not set, we expect that a match and / or a print have been
 * already reported via fpi_device_identify_report()
 */
 void
 fpi_device_identify_complete (FpDevice *device,
@@ -1583,13 +1595,11 @@ update_attr (const char *attr, const char *value)
 static void
 complete_suspend_resume_task (FpDevice *device)
 {
  g_autoptr(GTask) task = NULL;
  FpDevicePrivate *priv = fp_device_get_instance_private (device);
  g_assert (priv->suspend_resume_task);
  task = g_steal_pointer (&priv->suspend_resume_task);
-  g_task_return_boolean (task, TRUE);
+  g_task_return_boolean (g_steal_pointer (&priv->suspend_resume_task), TRUE);
 }
 void
@@ -1693,9 +1703,9 @@ fpi_device_configure_wakeup (FpDevice *device, gboolean enabled)
    case FP_DEVICE_TYPE_USB:
      {
        g_autoptr(GString) ports = NULL;
-        g_autoptr(GUsbDevice) dev = NULL;
+        GUsbDevice *dev, *parent;
        const char *wakeup_command = enabled ? "enabled" : "disabled";
-        guint8 bus;
+        guint8 bus, port;
        g_autofree gchar *sysfs_wakeup = NULL;
        g_autofree gchar *sysfs_persist = NULL;
        int res;
@@ -1704,20 +1714,12 @@ fpi_device_configure_wakeup (FpDevice *device, gboolean enabled)
        bus = g_usb_device_get_bus (priv->usb_device);
        /* Walk up, skipping the root hub. */
-        g_set_object (&dev, priv->usb_device);
+        dev = priv->usb_device;
-        while (TRUE)
+        while ((parent = g_usb_device_get_parent (dev)))
          {
            g_autoptr(GUsbDevice) parent = g_usb_device_get_parent (dev);
            g_autofree gchar *port_str = NULL;
            guint8 port;
            if (!parent)
              break;
            port = g_usb_device_get_port_number (dev);
-            port_str = g_strdup_printf ("%d.", port);
+            g_string_prepend (ports, g_strdup_printf ("%d.", port));
-            g_string_prepend (ports, port_str);
+            dev = parent;
            g_set_object (&dev, parent);
          }
        g_string_set_size (ports, ports->len - 1);
@@ -1754,7 +1756,6 @@ fpi_device_configure_wakeup (FpDevice *device, gboolean enabled)
 static void
 fpi_device_suspend_completed (FpDevice *device)
 {
  g_autoptr(GTask) task = NULL;
  FpDevicePrivate *priv = fp_device_get_instance_private (device);
  /* We have an ongoing operation, allow the device to wake up the machine. */
@@ -1764,12 +1765,11 @@ fpi_device_suspend_completed (FpDevice *device)
  if (priv->critical_section)
    g_warning ("Driver was in a critical section at suspend time. It likely deadlocked!");
  task = g_steal_pointer (&priv->suspend_resume_task);
  if (priv->suspend_error)
-    g_task_return_error (task, g_steal_pointer (&priv->suspend_error));
+    g_task_return_error (g_steal_pointer (&priv->suspend_resume_task),
                         g_steal_pointer (&priv->suspend_error));
  else
-    g_task_return_boolean (task, TRUE);
+    g_task_return_boolean (g_steal_pointer (&priv->suspend_resume_task), TRUE);
 }
 /**
@@ -1797,12 +1797,11 @@ fpi_device_suspend_complete (FpDevice *device,
  g_return_if_fail (priv->suspend_resume_task);
  g_return_if_fail (priv->suspend_error == NULL);
-  priv->suspend_error = g_steal_pointer (&error);
+  priv->suspend_error = error;
  priv->is_suspended = TRUE;
  /* If there is no error, we have no running task, return immediately. */
-  if (!priv->suspend_error || !priv->current_task ||
+  if (error == NULL || !priv->current_task || g_task_get_completed (priv->current_task))
      g_task_get_completed (priv->current_task))
    {
      fpi_device_suspend_completed (device);
      return;
@@ -1834,7 +1833,6 @@ void
 fpi_device_resume_complete (FpDevice *device,
                            GError   *error)
 {
  g_autoptr(GTask) task = NULL;
  FpDevicePrivate *priv = fp_device_get_instance_private (device);
  g_return_if_fail (FP_IS_DEVICE (device));
@@ -1843,12 +1841,10 @@ fpi_device_resume_complete (FpDevice *device,
  priv->is_suspended = FALSE;
  fpi_device_configure_wakeup (device, FALSE);
  task = g_steal_pointer (&priv->suspend_resume_task);
  if (error)
-    g_task_return_error (task, error);
+    g_task_return_error (g_steal_pointer (&priv->suspend_resume_task), error);
  else
-    g_task_return_boolean (task, TRUE);
+    g_task_return_boolean (g_steal_pointer (&priv->suspend_resume_task), TRUE);
 }
 /**
@@ -2005,26 +2001,12 @@ fpi_device_verify_report (FpDevice      *device,
 * fpi_device_identify_report:
 * @device: The #FpDevice
 * @match: (transfer none): The #FpPrint from the gallery that matched
- * @print: (transfer floating): The scanned #FpPrint, set in the absence
+ * @print: (transfer floating): The scanned #FpPrint
- *   of an error.
+ * @error: A #GError if result is %FPI_MATCH_ERROR
 * @error: A #GError of %FP_DEVICE_RETRY type if @match and @print are unset.
 *
- * Report the results of an identify operation.
+ * Report the result of a identify operation. Note that the passed @error must be
- *
+ * a retry error with the %FP_DEVICE_RETRY domain. For all other error cases,
- * In case of successful identification @match is expected to be set to a
+ * the error should passed to fpi_device_identify_complete().
 * #FpPrint that matches one from the provided gallery, while @print
 * represents the scanned print and will be different.
 *
 * If there are no errors, it's expected that the device always reports the
 * recognized @print even if there is no @match with the provided gallery (that
 * can be potentially empty). This is required for application logic further
 * up in the stack, such as for enroll-duplicate checking. @print needs to be
 * sufficiently filled to do a comparison.
 *
 * In case of error, both @match and @print are expected to be %NULL.
 * Note that the passed @error must be a retry error from the %FP_DEVICE_RETRY
 * domain. For all other error cases, the error should passed to
 * fpi_device_identify_complete().
 */
 void
 fpi_device_identify_report (FpDevice *device,
--- a/libfprint/fpi-image-device.c
+++ b/libfprint/fpi-image-device.c
@@ -277,7 +277,7 @@ fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, g
    {
      print = fp_print_new (device);
      fpi_print_set_type (print, FPI_PRINT_NBIS);
-      if (!fpi_print_add_from_image (print, image, &error))
+      if (!fpi_print_add_from_image (print, image, priv->bz3_threshold, &error))
        {
          g_clear_object (&print);
--- a/libfprint/fpi-image.c
+++ b/libfprint/fpi-image.c
@@ -24,9 +24,8 @@
 #include "fpi-log.h"
 #include <nbis.h>
 #include <config.h>
-#ifdef HAVE_PIXMAN
+#if HAVE_PIXMAN
 #include <pixman.h>
 #endif
@@ -108,12 +107,12 @@ fpi_mean_sq_diff_norm (const guint8 *buf1,
  return res / size;
 }
 #if HAVE_PIXMAN
 FpImage *
 fpi_image_resize (FpImage *orig_img,
                  guint    w_factor,
                  guint    h_factor)
 {
 #ifdef HAVE_PIXMAN
  int new_width = orig_img->width * w_factor;
  int new_height = orig_img->height * h_factor;
  pixman_image_t *orig, *resized;
@@ -146,9 +145,5 @@ fpi_image_resize (FpImage *orig_img,
  pixman_image_unref (resized);
  return newimg;
 #else
  fp_err ("Libfprint compiled without pixman support, impossible to resize");
  return g_object_ref (orig_img);
 #endif
 }
 #endif
--- a/libfprint/fpi-image.h
+++ b/libfprint/fpi-image.h
@@ -20,6 +20,7 @@
 #pragma once
 #include <config.h>
 #include "fp-image.h"
 /**
@@ -33,7 +34,6 @@
 * rely on the image to be normalized by libfprint before further processing.
 */
 typedef enum {
  FPI_IMAGE_NONE            = 0,
  FPI_IMAGE_V_FLIPPED       = 1 << 0,
  FPI_IMAGE_H_FLIPPED       = 1 << 1,
  FPI_IMAGE_COLORS_INVERTED = 1 << 2,
@@ -68,8 +68,7 @@ struct _FpImage
  guint8    *binarized;
  GPtrArray *minutiae;
-
+  guint      ref_count;
  gboolean   detection_in_progress;
 };
 gint fpi_std_sq_dev (const guint8 *buf,
@@ -78,6 +77,8 @@ gint fpi_mean_sq_diff_norm (const guint8 *buf1,
                            const guint8 *buf2,
                            gint          size);
 #if HAVE_PIXMAN
 FpImage *fpi_image_resize (FpImage *orig,
                           guint    w_factor,
                           guint    h_factor);
 #endif
--- a/libfprint/fpi-print.c
+++ b/libfprint/fpi-print.c
@@ -50,7 +50,7 @@ fpi_print_add_print (FpPrint *print, FpPrint *add)
  g_return_if_fail (add->type == FPI_PRINT_NBIS);
  g_assert (add->prints->len == 1);
-  g_ptr_array_add (print->prints, g_memdup2 (add->prints->pdata[0], sizeof (struct xyt_struct)));
+  g_ptr_array_add (print->prints, g_memdup (add->prints->pdata[0], sizeof (struct xyt_struct)));
 }
 /**
@@ -154,11 +154,14 @@ minutiae_to_xyt (struct fp_minutiae *minutiae,
 gboolean
 fpi_print_add_from_image (FpPrint *print,
                          FpImage *image,
                          gint     bz3_threshold,
                          GError **error)
 {
  g_autofree struct xyt_struct *xyt = NULL;
  GPtrArray *minutiae;
  struct fp_minutiae _minutiae;
-  struct xyt_struct *xyt;
+  gint probe_len;
  gint score;
  if (print->type != FPI_PRINT_NBIS || !image)
    {
@@ -173,8 +176,8 @@ fpi_print_add_from_image (FpPrint *print,
  if (!minutiae || minutiae->len == 0)
    {
      g_set_error (error,
-                   G_IO_ERROR,
+                   FP_DEVICE_RETRY,
-                   G_IO_ERROR_INVALID_DATA,
+                   FP_DEVICE_RETRY_GENERAL,
                   "No minutiae found in image or not yet detected!");
      return FALSE;
    }
@@ -185,7 +188,20 @@ fpi_print_add_from_image (FpPrint *print,
  xyt = g_new0 (struct xyt_struct, 1);
  minutiae_to_xyt (&_minutiae, image->width, image->height, xyt);
-  g_ptr_array_add (print->prints, xyt);
+
  probe_len = bozorth_probe_init (xyt);
  score = bozorth_to_gallery (probe_len, xyt, xyt);
  fp_dbg ("self-match score %d/%d", score, bz3_threshold);
  if (score <= bz3_threshold)
    {
      g_set_error (error,
                   FP_DEVICE_RETRY,
                   FP_DEVICE_RETRY_GENERAL,
                   "Not enough minutiae to generate a match!");
      return FPI_MATCH_SUCCESS;
    }
  g_ptr_array_add (print->prints, g_steal_pointer (&xyt));
  g_clear_object (&print->image);
  print->image = g_object_ref (image);
--- a/libfprint/fpi-print.h
+++ b/libfprint/fpi-print.h
@@ -40,9 +40,10 @@ void     fpi_print_set_device_stored (FpPrint *print,
 gboolean fpi_print_add_from_image (FpPrint *print,
                                   FpImage *image,
                                   gint     bz3_threshold,
                                   GError **error);
-FpiMatchResult fpi_print_bz3_match (FpPrint *temp,
+FpiMatchResult fpi_print_bz3_match (FpPrint * template,
                                    FpPrint * print,
                                    gint bz3_threshold,
                                    GError **error);
--- a/libfprint/fpi-ssm.c
+++ b/libfprint/fpi-ssm.c
@@ -73,7 +73,7 @@
 struct _FpiSsm
 {
  FpDevice               *dev;
-  char                   *name;
+  const char             *name;
  FpiSsm                 *parentsm;
  gpointer                ssm_data;
  GDestroyNotify          ssm_data_destroy;
--- a/libfprint/fprint-list-supported-devices.c
+++ b/libfprint/fprint-list-supported-devices.c
@@ -110,7 +110,7 @@ main (int argc, char **argv)
  printed = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  g_print ("%% libfprint — Supported Devices\n");
+  g_print ("%% lifprint — Supported Devices\n");
  g_print ("%% Bastien Nocera, Daniel Drake\n");
  g_print ("%% 2018\n");
  g_print ("\n");
@@ -132,7 +132,7 @@ main (int argc, char **argv)
    g_print ("%s", (char *) l->data);
  g_print ("\n");
-  g_list_free_full (g_steal_pointer (&usb_list), g_free);
+  g_list_free_full (usb_list, g_free);
  g_print ("## SPI devices\n");
  g_print ("\n");
@@ -146,7 +146,7 @@ main (int argc, char **argv)
    g_print ("%s", (char *) l->data);
  g_print ("\n");
-  g_list_free_full (g_steal_pointer (&spi_list), g_free);
+  g_list_free_full (usb_list, g_free);
  g_hash_table_destroy (printed);
--- a/libfprint/fprint-list-udev-hwdb.c
+++ b/libfprint/fprint-list-udev-hwdb.c
@@ -24,29 +24,17 @@
 #include "fpi-context.h"
 #include "fpi-device.h"
-static const FpIdEntry allowlist_id_table[] = {
+static const FpIdEntry whitelist_id_table[] = {
  /* Currently known and unsupported devices.
   * You can generate this list from the wiki page using e.g.:
   *   gio cat https://gitlab.freedesktop.org/libfprint/wiki/-/wikis/Unsupported-Devices.md | sed -n 's!|.*\([0-9a-fA-F]\{4\}\):\([0-9a-fA-F]\{4\}\).*|.*!  { .vid = 0x\1, .pid = 0x\2 },!p'
   */
  { .vid = 0x047d, .pid = 0x00f2 },
  { .vid = 0x04e8, .pid = 0x730b },
  { .vid = 0x04f3, .pid = 0x036b },
  { .vid = 0x04f3, .pid = 0x0c00 },
  { .vid = 0x04f3, .pid = 0x0c4c },
  { .vid = 0x04f3, .pid = 0x0c57 },
  { .vid = 0x04f3, .pid = 0x0c5e },
  { .vid = 0x04f3, .pid = 0x0c5a },
  { .vid = 0x04f3, .pid = 0x0c6c },
  { .vid = 0x04f3, .pid = 0x0c70 },
  { .vid = 0x04f3, .pid = 0x0c72 },
  { .vid = 0x04f3, .pid = 0x0c77 },
  { .vid = 0x04f3, .pid = 0x2706 },
  { .vid = 0x04f3, .pid = 0x3032 },
  { .vid = 0x04f3, .pid = 0x3057 },
  { .vid = 0x04f3, .pid = 0x3104 },
  { .vid = 0x04f3, .pid = 0x310d },
  { .vid = 0x04f3, .pid = 0x3128 },
  { .vid = 0x06cb, .pid = 0x0081 },
  { .vid = 0x06cb, .pid = 0x0088 },
  { .vid = 0x06cb, .pid = 0x008a },
@@ -63,7 +51,6 @@ static const FpIdEntry allowlist_id_table[] = {
  { .vid = 0x06cb, .pid = 0x00d8 },
  { .vid = 0x06cb, .pid = 0x00da },
  { .vid = 0x06cb, .pid = 0x00dc },
  { .vid = 0x06cb, .pid = 0x00e4 },
  { .vid = 0x06cb, .pid = 0x00e7 },
  { .vid = 0x06cb, .pid = 0x00e9 },
  { .vid = 0x06cb, .pid = 0x00fd },
@@ -79,8 +66,6 @@ static const FpIdEntry allowlist_id_table[] = {
  { .vid = 0x0bda, .pid = 0x5812 },
  { .vid = 0x10a5, .pid = 0x0007 },
  { .vid = 0x10a5, .pid = 0x9200 },
  { .vid = 0x10a5, .pid = 0x9800 },
  { .vid = 0x10a5, .pid = 0xe340 },
  { .vid = 0x1188, .pid = 0x9545 },
  { .vid = 0x138a, .pid = 0x0007 },
  { .vid = 0x138a, .pid = 0x003a },
@@ -93,63 +78,51 @@ static const FpIdEntry allowlist_id_table[] = {
  { .vid = 0x138a, .pid = 0x0097 },
  { .vid = 0x138a, .pid = 0x009d },
  { .vid = 0x138a, .pid = 0x00ab },
  { .vid = 0x138a, .pid = 0x00a6 },
  { .vid = 0x147e, .pid = 0x1002 },
  { .vid = 0x1491, .pid = 0x0088 },
  { .vid = 0x16d1, .pid = 0x1027 },
  { .vid = 0x1c7a, .pid = 0x0300 },
  { .vid = 0x1c7a, .pid = 0x0575 },
  { .vid = 0x1c7a, .pid = 0x0576 },
  { .vid = 0x1c7a, .pid = 0x0577 },
  { .vid = 0x27c6, .pid = 0x5042 },
  { .vid = 0x27c6, .pid = 0x5110 },
  { .vid = 0x27c6, .pid = 0x5117 },
  { .vid = 0x27c6, .pid = 0x5120 },
  { .vid = 0x27c6, .pid = 0x5125 },
  { .vid = 0x27c6, .pid = 0x5201 },
  { .vid = 0x27c6, .pid = 0x521d },
  { .vid = 0x27c6, .pid = 0x5301 },
  { .vid = 0x27c6, .pid = 0x530c },
  { .vid = 0x27c6, .pid = 0x532d },
  { .vid = 0x27c6, .pid = 0x5335 },
  { .vid = 0x27c6, .pid = 0x533c },
  { .vid = 0x27c6, .pid = 0x5381 },
  { .vid = 0x27c6, .pid = 0x5385 },
  { .vid = 0x27c6, .pid = 0x538c },
  { .vid = 0x27c6, .pid = 0x538d },
  { .vid = 0x27c6, .pid = 0x5395 },
  { .vid = 0x27c6, .pid = 0x5503 },
  { .vid = 0x27c6, .pid = 0x550a },
  { .vid = 0x27c6, .pid = 0x550c },
  { .vid = 0x27c6, .pid = 0x5584 },
  { .vid = 0x27c6, .pid = 0x55a2 },
  { .vid = 0x27c6, .pid = 0x55a4 },
  { .vid = 0x27c6, .pid = 0x55b4 },
  { .vid = 0x27c6, .pid = 0x5740 },
  { .vid = 0x27c6, .pid = 0x5e0a },
  { .vid = 0x27c6, .pid = 0x581a },
  { .vid = 0x27c6, .pid = 0x589a },
  { .vid = 0x27c6, .pid = 0x6382 },
  { .vid = 0x2808, .pid = 0x9338 },
  { .vid = 0x2808, .pid = 0x93a9 },
  { .vid = 0x298d, .pid = 0x2020 },
  { .vid = 0x298d, .pid = 0x2033 },
  { .vid = 0x3538, .pid = 0x0930 },
  { .vid = 0 },
 };
-static const FpIdEntry denylist_id_table[] = {
+static const FpIdEntry blacklist_id_table[] = {
  { .vid = 0x0483, .pid = 0x2016 },
  /* https://bugs.freedesktop.org/show_bug.cgi?id=66659 */
  { .vid = 0x045e, .pid = 0x00bb },
  { .vid = 0 },
 };
-static const FpDeviceClass allowlist = {
+static const FpDeviceClass whitelist = {
  .type = FP_DEVICE_TYPE_USB,
-  .id_table = allowlist_id_table,
+  .id_table = whitelist_id_table,
-  .id = "allowlist",
+  .id = "whitelist",
-  .full_name = "Hardcoded allowlist"
+  .full_name = "Hardcoded whitelist"
 };
 GHashTable *printed = NULL;
@@ -168,7 +141,7 @@ print_driver (const FpDeviceClass *cls)
      const FpIdEntry *bl_entry;
      char *key;
-      for (bl_entry = denylist_id_table; bl_entry->vid != 0; bl_entry++)
+      for (bl_entry = blacklist_id_table; bl_entry->vid != 0; bl_entry++)
        if (entry->vid == bl_entry->vid && entry->pid == bl_entry->pid)
          break;
@@ -179,7 +152,7 @@ print_driver (const FpDeviceClass *cls)
      if (g_hash_table_lookup (printed, key) != NULL)
        {
-          if (cls == &allowlist)
+          if (cls == &whitelist)
            g_warning ("%s implemented by driver %s",
                       key, (const char *) g_hash_table_lookup (printed, key));
          g_free (key);
@@ -190,7 +163,7 @@ print_driver (const FpDeviceClass *cls)
      if (num_printed == 0)
        {
-          if (cls != &allowlist)
+          if (cls != &whitelist)
            g_print ("\n# Supported by libfprint driver %s\n", cls->id);
          else
            g_print ("\n# Known unsupported devices\n");
@@ -244,7 +217,7 @@ main (int argc, char **argv)
      print_driver (cls);
    }
-  print_driver (&allowlist);
+  print_driver (&whitelist);
  g_hash_table_destroy (printed);
--- a/libfprint/meson.build
+++ b/libfprint/meson.build
@@ -119,8 +119,6 @@ driver_sources = {
        [ 'drivers/etes603.c' ],
    'egis0570' :
        [ 'drivers/egis0570.c' ],
    'egismoc' :
        [ 'drivers/egismoc/egismoc.c' ],
    'vfs0050' :
        [ 'drivers/vfs0050.c' ],
    'elan' :
@@ -141,12 +139,6 @@ driver_sources = {
        [ 'drivers/synaptics/synaptics.c', 'drivers/synaptics/bmkt_message.c' ],
    'goodixmoc' :
        [ 'drivers/goodixmoc/goodix.c', 'drivers/goodixmoc/goodix_proto.c' ],
    'fpcmoc' :
        [ 'drivers/fpcmoc/fpc.c' ],
    'realtek' :
        [ 'drivers/realtek/realtek.c' ],
    'focaltech_moc' :
        [ 'drivers/focaltech_moc/focaltech_moc.c' ],
 }
 helper_sources = {
@@ -269,7 +261,7 @@ libfprint_drivers = static_library('fprint-drivers',
    install: false)
 mapfile = files('libfprint.ver')
-vflag = '-Wl,--version-script,@0@/@1@'.format(meson.project_source_root(), mapfile[0])
+vflag = '-Wl,--version-script,@0@/@1@'.format(meson.source_root(), mapfile[0])
 libfprint = shared_library(versioned_libname.split('lib')[1],
    sources: [
@@ -338,19 +330,17 @@ if install_udev_rules
    )
 endif
-sync_udev_udb = custom_target('sync-udev-hwdb',
+custom_target('sync-udev-hwdb',
    depends: udev_hwdb_generator,
    output: 'sync-udev-hwdb',
    install: false,
    command: [
        'cp', '-v',
        udev_hwdb_generator.full_path(),
-        meson.project_source_root() / 'data'
+        meson.source_root() / 'data'
    ]
 )
 alias_target('sync-udev-hwdb', sync_udev_udb)
 supported_devices = executable('fprint-list-supported-devices',
    'fprint-list-supported-devices.c',
    dependencies: libfprint_private_dep,
--- a/libfprint/nbis/fix-musl-build.patch
+++ b/libfprint/nbis/fix-musl-build.patch
@@ -1,31 +0,0 @@
 From 2584d440afc87d463cb8dc809d48c660e091c2c4 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Thu, 23 Jun 2022 05:57:46 +0100
 Subject: [PATCH] nbis: fix build on musl
 Drop re-definition of stderr. There's no need for this anywhere
 (including glibc). This breaks in particular on musl because
 stderr (and stdin) are both const, and macros unlike in glibc.
 Bug: https://bugs.gentoo.org/853811
 ---
 nbis/include/bozorth.h | 2 --
 1 file changed, 2 deletions(-)
 diff --git a/nbis/include/bozorth.h b/nbis/include/bozorth.h
 index a705da98..fd8975bf 100644
 --- a/nbis/include/bozorth.h
 +++ b/nbis/include/bozorth.h
@@ -217,8 +217,6 @@ struct xytq_struct {
 /**************************************************************************/
 /* Globals supporting command line options */
 extern int verbose_threshold;
 -/* Global supporting error reporting */
 -extern FILE *stderr;
 /**************************************************************************/
 /* In: BZ_GBLS.C */
 -- 
 GitLab
--- a/libfprint/nbis/include/bozorth.h
+++ b/libfprint/nbis/include/bozorth.h
@@ -217,6 +217,8 @@ struct xytq_struct {
 /**************************************************************************/
 /* Globals supporting command line options */
 extern int verbose_threshold;
 /* Global supporting error reporting */
 extern FILE *stderr;
 /**************************************************************************/
 /* In: BZ_GBLS.C */
--- a/libfprint/nbis/update-from-nbis.sh
+++ b/libfprint/nbis/update-from-nbis.sh
@@ -198,6 +198,3 @@ patch -p0 < fix-scan-build-reports.patch
 # Add pass to remove perimeter points
 patch -p0 < remove-perimeter-pts.patch
 # Fix build on musl by dropping unnecessary redeclaration of stderr
 patch -p0 < fix-musl-build.patch
--- a/meson.build
+++ b/meson.build
@@ -1,27 +1,22 @@
 project('libfprint', [ 'c', 'cpp' ],
-    version: '1.94.7',
+    version: '1.94.3',
    license: 'LGPLv2.1+',
    default_options: [
        'buildtype=debugoptimized',
        'warning_level=1',
        'c_std=gnu99',
    ],
-    meson_version: '>= 0.56.0')
+    meson_version: '>= 0.49.0')
 gnome = import('gnome')
 libfprint_conf = configuration_data()
 libfprint_conf.set_quoted('LIBFPRINT_VERSION', meson.project_version())
 prefix = get_option('prefix')
 libdir = prefix / get_option('libdir')
 libexecdir = prefix / get_option('libexecdir')
 datadir = prefix / get_option('datadir')
 cc = meson.get_compiler('c')
 cpp = meson.get_compiler('cpp')
 host_system = host_machine.system()
-glib_min_version = '2.68'
+glib_min_version = '2.56'
 glib_version_def = 'GLIB_VERSION_@0@_@1@'.format(
    glib_min_version.split('.')[0], glib_min_version.split('.')[1])
@@ -120,7 +115,6 @@ default_drivers = [
    'vfs0050',
    'etes603',
    'egis0570',
    'egismoc',
    'vcom5s',
    'synaptics',
    'elan',
@@ -131,9 +125,6 @@ default_drivers = [
    'upekts',
    'goodixmoc',
    'nb1010',
    'fpcmoc',
    'realtek',
    'focaltech_moc',
    # SPI
    'elanspi',
@@ -142,27 +133,8 @@ default_drivers = [
 # FIXME: All the drivers should be fixed by adjusting the byte order.
 # See https://gitlab.freedesktop.org/libfprint/libfprint/-/issues/236
 endian_independent_drivers = virtual_drivers + [
    'aes1610',
    'aes1660',
    'aes2550',
    'aes2660',
    'aes3500',
    'aes4000',
    'egis0570',
    'egismoc',
    'elanmoc',
    'etes603',
    'focaltech_moc',
    'nb1010',
    'realtek',
    'synaptics',
    'upeksonly',
    'upektc',
    'upektc_img',
    'upekts',
    'vcom5s',
    'vfs101',
    'vfs7552',
 ]
 all_drivers = default_drivers + virtual_drivers
@@ -269,7 +241,7 @@ if install_udev_rules
    udev_rules_dir = get_option('udev_rules_dir')
    if udev_rules_dir == 'auto'
        udev_dep = dependency('udev')
-        udev_rules_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/rules.d'
+        udev_rules_dir = udev_dep.get_pkgconfig_variable('udevdir') + '/rules.d'
    endif
 endif
@@ -306,13 +278,15 @@ if not udev_hwdb.disabled()
    if udev_hwdb_dir == 'auto'
        udev_dep = dependency('udev')
-        udev_hwdb_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/hwdb.d'
+        udev_hwdb_dir = udev_dep.get_pkgconfig_variable('udevdir') + '/hwdb.d'
    endif
 else
    udev_hwdb_dir = ''
 endif
 if get_option('gtk-examples')
    gnome = import('gnome')
    gtk_dep = dependency('gtk+-3.0', required: false)
    if not gtk_dep.found()
        error('GTK+ 3.x is required for GTK+ examples')
@@ -324,7 +298,9 @@ subdir('libfprint')
 configure_file(output: 'config.h', configuration: libfprint_conf)
 subdir('examples')
 if get_option('doc')
    gnome = import('gnome')
    subdir('doc')
 endif
 if get_option('gtk-examples')
@@ -334,8 +310,6 @@ endif
 subdir('data')
 subdir('tests')
 subdir('examples')
 pkgconfig = import('pkgconfig')
 pkgconfig.generate(
    name: versioned_libname,
@@ -346,5 +320,3 @@ pkgconfig.generate(
    subdirs: versioned_libname,
    filebase: versioned_libname,
 )
 summary({'Drivers': drivers, }, section: 'Drivers')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -30,7 +30,3 @@ option('doc',
       description: 'Whether to build the API documentation',
       type: 'boolean',
       value: true)
 option('installed-tests',
       description: 'Whether to install the installed tests',
       type: 'boolean',
       value: true)
--- a/scripts/uncrustify.cfg
+++ b/scripts/uncrustify.cfg
@@ -120,7 +120,7 @@ nl_multi_line_cond              true
 # Not clear what to do about that...
 mod_full_brace_for              Remove
 mod_full_brace_if               Remove
-mod_full_brace_if_chain         1
+mod_full_brace_if_chain         True
 mod_full_brace_while            Remove
 mod_full_brace_do               Remove
 mod_full_brace_nl               3
--- a/tests/capture.py
+++ b/tests/capture.py
@@ -1,15 +1,10 @@
 #!/usr/bin/python3
 import cairo
 import sys
 import traceback
 import gi
 gi.require_version('FPrint', '2.0')
 from gi.repository import FPrint, GLib
-
+import cairo
-# Exit with error on any exception, included those happening in async callbacks
+import sys
 sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
 if len(sys.argv) != 2:
    print("Please specify exactly one argument, the output location for the capture image")
--- a/tests/create-driver-test.py.in
+++ b/tests/create-driver-test.py.in
@@ -44,7 +44,7 @@ if len(sys.argv) > 3:
    sys.exit(1)
 driver_name = sys.argv[1]
-os.environ['FP_DRIVERS_ALLOWLIST'] = driver_name
+os.environ['FP_DRIVERS_WHITELIST'] = driver_name
 test_variant = None
 if len(sys.argv) == 3:
--- a/tests/driver.test.in
+++ b/tests/driver.test.in
@@ -1,5 +0,0 @@
 [Test]
 Type=session
 # We can't use TestEnvironment as per
 #  https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1
 Exec=env @driver_env@ @installed_tests_execdir@/@umockdev_test_name@ @installed_tests_testdir@/@driver_test@
--- a/tests/egis0570/capture.pcapng
+++ b/tests/egis0570/capture.pcapng
--- a/tests/egis0570/device
+++ b/tests/egis0570/device
@@ -24,7 +24,7 @@ E: ID_USB_INTERFACES=:ff0000:
 E: ID_VENDOR_FROM_DATABASE=LighTuning Technology Inc.
 E: ID_PATH=pci-0000:00:14.0-usb-0:9
 E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_9
-E: LIBFPRINT_DRIVER=Hardcoded allowlist
+E: LIBFPRINT_DRIVER=Hardcoded whitelist
 A: authorized=1\n
 A: avoid_reset_quirk=0\n
 A: bConfigurationValue=1\n
--- a/tests/egismoc-05a1/custom.pcapng
+++ b/tests/egismoc-05a1/custom.pcapng
--- a/tests/egismoc-05a1/custom.py
+++ b/tests/egismoc-05a1/custom.py
@@ -1,156 +0,0 @@
 #!/usr/bin/python3
 import traceback
 import sys
 import time
 import gi
 gi.require_version('FPrint', '2.0')
 from gi.repository import FPrint, GLib
 # Exit with error on any exception, included those happening in async callbacks
 sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
 ctx = GLib.main_context_default()
 c = FPrint.Context()
 c.enumerate()
 devices = c.get_devices()
 d = devices[0]
 del devices
 d.open_sync()
 assert d.get_driver() == "egismoc"
 assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
 assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
 assert d.has_feature(FPrint.DeviceFeature.VERIFY)
 assert d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
 def enroll_progress(*args):
    print("finger status: ", d.get_finger_status())
    print('enroll progress: ' + str(args))
 def identify_done(dev, res):
    global identified
    identified = True
    identify_match, identify_print = dev.identify_finish(res)
    print('indentification_done: ', identify_match, identify_print)
    assert identify_match.equal(identify_print)
 # Beginning with list and clear assumes you begin with >0 prints enrolled before capturing
 print("listing - device should have prints")
 stored = d.list_prints_sync()
 assert len(stored) > 0
 del stored
 print("clear device storage")
 d.clear_storage_sync()
 print("clear done")
 print("listing - device should be empty")
 stored = d.list_prints_sync()
 assert len(stored) == 0
 del stored
 print("enrolling")
 template = FPrint.Print.new(d)
 template.set_finger(FPrint.Finger.LEFT_INDEX)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 p1 = d.enroll_sync(template, None, enroll_progress, None)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("enroll done")
 del template
 print("listing - device should have 1 print")
 stored = d.list_prints_sync()
 assert len(stored) == 1
 assert stored[0].equal(p1)
 print("verifying")
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 verify_res, verify_print = d.verify_sync(p1)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("verify done")
 assert verify_res == True
 identified = False
 deserialized_prints = []
 for p in stored:
    deserialized_prints.append(FPrint.Print.deserialize(p.serialize()))
    assert deserialized_prints[-1].equal(p)
 del stored
 print('async identifying')
 d.identify(deserialized_prints, callback=identify_done)
 del deserialized_prints
 while not identified:
    ctx.iteration(True)
 print("try to enroll duplicate")
 template = FPrint.Print.new(d)
 template.set_finger(FPrint.Finger.RIGHT_INDEX)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 try:
    d.enroll_sync(template, None, enroll_progress, None)
 except GLib.Error as error:
    assert error.matches(FPrint.DeviceError.quark(),
                         FPrint.DeviceError.DATA_DUPLICATE)
 except Exception as exc:
    raise
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("duplicate enroll attempt done")
 print("listing - device should still only have 1 print")
 stored = d.list_prints_sync()
 assert len(stored) == 1
 assert stored[0].equal(p1)
 del stored
 print("enroll new finger")
 template = FPrint.Print.new(d)
 template.set_finger(FPrint.Finger.RIGHT_INDEX)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 p2 = d.enroll_sync(template, None, enroll_progress, None)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("enroll new finger done")
 del template
 print("listing - device should have 2 prints")
 stored = d.list_prints_sync()
 assert len(stored) == 2
 assert (stored[0].equal(p1) and stored[1].equal(p2)) or (stored[0].equal(p2) and stored[1].equal(p1))
 del stored
 print("deleting first print")
 d.delete_print_sync(p1)
 print("delete done")
 del p1
 print("listing - device should only have second print")
 stored = d.list_prints_sync()
 assert len(stored) == 1
 assert stored[0].equal(p2)
 del stored
 del p2
 print("clear device storage")
 d.clear_storage_sync()
 print("clear done")
 print("listing - device should be empty")
 stored = d.list_prints_sync()
 assert len(stored) == 0
 del stored
 d.close_sync()
 del d
 del c
--- a/tests/egismoc-05a1/device
+++ b/tests/egismoc-05a1/device
@@ -1,262 +0,0 @@
 P: /devices/pci0000:00/0000:00:14.0/usb1/1-5
 N: bus/usb/001/003=12010002FF0000407A1CA10513120102030109022700010100A0320904000003FF000000070581020002000705020200020007058303400005
 E: BUSNUM=001
 E: DEVNAME=/dev/bus/usb/001/003
 E: DEVNUM=003
 E: DEVTYPE=usb_device
 E: DRIVER=usb
 E: ID_BUS=usb
 E: ID_MODEL=ETU905A80-E
 E: ID_MODEL_ENC=ETU905A80-E
 E: ID_MODEL_ID=05a1
 E: ID_REVISION=1213
 E: ID_SERIAL=EGIS_ETU905A80-E_0C5A44PCU833
 E: ID_SERIAL_SHORT=0C5A44PCU833
 E: ID_USB_INTERFACES=:ff0000:
 E: ID_USB_MODEL=ETU905A80-E
 E: ID_USB_MODEL_ENC=ETU905A80-E
 E: ID_USB_MODEL_ID=05a1
 E: ID_USB_REVISION=1213
 E: ID_USB_SERIAL=EGIS_ETU905A80-E_0C5A44PCU833
 E: ID_USB_SERIAL_SHORT=0C5A44PCU833
 E: ID_USB_VENDOR=EGIS
 E: ID_USB_VENDOR_ENC=EGIS
 E: ID_USB_VENDOR_ID=1c7a
 E: ID_VENDOR=EGIS
 E: ID_VENDOR_ENC=EGIS
 E: ID_VENDOR_FROM_DATABASE=LighTuning Technology Inc.
 E: ID_VENDOR_ID=1c7a
 E: MAJOR=189
 E: MINOR=2
 E: PRODUCT=1c7a/5a1/1213
 E: SUBSYSTEM=usb
 E: TYPE=255/0/0
 A: authorized=1\n
 A: avoid_reset_quirk=0\n
 A: bConfigurationValue=1\n
 A: bDeviceClass=ff\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=1213\n
 A: bmAttributes=a0\n
 A: busnum=1\n
 A: configuration=
 H: descriptors=12010002FF0000407A1CA10513120102030109022700010100A0320904000003FF000000070581020002000705020200020007058303400005
 A: dev=189:2\n
 A: devnum=3\n
 A: devpath=5\n
 L: driver=../../../../../bus/usb/drivers/usb
 L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:51/device:52/device:57
 A: idProduct=05a1\n
 A: idVendor=1c7a\n
 A: ltm_capable=no\n
 A: manufacturer=EGIS\n
 A: maxchild=0\n
 A: physical_location/dock=no\n
 A: physical_location/horizontal_position=center\n
 A: physical_location/lid=no\n
 A: physical_location/panel=unknown\n
 A: physical_location/vertical_position=center\n
 L: port=../1-0:1.0/usb1-port5
 A: power/active_duration=955612\n
 A: power/async=enabled\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
 A: power/connected_duration=955612\n
 A: power/control=on\n
 A: power/level=on\n
 A: power/persist=0\n
 A: power/runtime_active_kids=0\n
 A: power/runtime_active_time=955338\n
 A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
 A: power/runtime_usage=1\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=ETU905A80-E\n
 A: quirks=0x0\n
 A: removable=fixed\n
 A: rx_lanes=1\n
 A: serial=0C5A44PCU833\n
 A: speed=480\n
 A: tx_lanes=1\n
 A: urbnum=491\n
 A: version= 2.00\n
 P: /devices/pci0000:00/0000:00:14.0/usb1
 N: bus/usb/001/001=12010002090001406B1D020005060302010109021900010100E0000904000001090000000705810304000C
 E: BUSNUM=001
 E: CURRENT_TAGS=:seat:
 E: DEVNAME=/dev/bus/usb/001/001
 E: DEVNUM=001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
 E: ID_AUTOSUSPEND=1
 E: ID_BUS=usb
 E: ID_FOR_SEAT=usb-pci-0000_00_14_0
 E: ID_MODEL=xHCI_Host_Controller
 E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
 E: ID_MODEL_FROM_DATABASE=2.0 root hub
 E: ID_MODEL_ID=0002
 E: ID_PATH=pci-0000:00:14.0
 E: ID_PATH_TAG=pci-0000_00_14_0
 E: ID_REVISION=0605
 E: ID_SERIAL=Linux_6.5.0-9-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_SERIAL_SHORT=0000:00:14.0
 E: ID_USB_INTERFACES=:090000:
 E: ID_USB_MODEL=xHCI_Host_Controller
 E: ID_USB_MODEL_ENC=xHCI\x20Host\x20Controller
 E: ID_USB_MODEL_ID=0002
 E: ID_USB_REVISION=0605
 E: ID_USB_SERIAL=Linux_6.5.0-9-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_USB_SERIAL_SHORT=0000:00:14.0
 E: ID_USB_VENDOR=Linux_6.5.0-9-generic_xhci-hcd
 E: ID_USB_VENDOR_ENC=Linux\x206.5.0-9-generic\x20xhci-hcd
 E: ID_USB_VENDOR_ID=1d6b
 E: ID_VENDOR=Linux_6.5.0-9-generic_xhci-hcd
 E: ID_VENDOR_ENC=Linux\x206.5.0-9-generic\x20xhci-hcd
 E: ID_VENDOR_FROM_DATABASE=Linux Foundation
 E: ID_VENDOR_ID=1d6b
 E: MAJOR=189
 E: MINOR=0
 E: PRODUCT=1d6b/2/605
 E: SUBSYSTEM=usb
 E: TAGS=:seat:
 E: TYPE=9/0/1
 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=0605\n
 A: bmAttributes=e0\n
 A: busnum=1\n
 A: configuration=
 H: descriptors=12010002090001406B1D020005060302010109021900010100E0000904000001090000000705810304000C
 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:51/device:52
 A: idProduct=0002\n
 A: idVendor=1d6b\n
 A: interface_authorized_default=1\n
 A: ltm_capable=no\n
 A: manufacturer=Linux 6.5.0-9-generic xhci-hcd\n
 A: maxchild=12\n
 A: power/active_duration=956044\n
 A: power/async=enabled\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
 A: power/connected_duration=956044\n
 A: power/control=auto\n
 A: power/level=auto\n
 A: power/runtime_active_kids=2\n
 A: power/runtime_active_time=956041\n
 A: power/runtime_enabled=enabled\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
 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=181\n
 A: version= 2.00\n
 P: /devices/pci0000:00/0000:00:14.0
 E: DRIVER=xhci_hcd
 E: ID_MODEL_FROM_DATABASE=Alder Lake PCH USB 3.2 xHCI Host Controller
 E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
 E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
 E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
 E: ID_VENDOR_FROM_DATABASE=Intel Corporation
 E: MODALIAS=pci:v00008086d000051EDsv0000144Dsd0000C1CAbc0Csc03i30
 E: PCI_CLASS=C0330
 E: PCI_ID=8086:51ED
 E: PCI_SLOT_NAME=0000:00:14.0
 E: PCI_SUBSYS_ID=144D:C1CA
 E: SUBSYSTEM=pci
 A: ari_enabled=0\n
 A: broken_parity_status=0\n
 A: class=0x0c0330\n
 H: config=8680ED51060490020130030C0000800004001A3E6000000000000000000000000000000000000000000000004D14CAC1000000007000000000000000FF010000FD0134A089C27F8000000000000000003F6DD80F000000000000000000000000316000000000000000000000000000000180C2C108000000000000000000000005908700D804E0FE000000000000000009B014F01000400100000000C10A080000080E00001800008F50020000010000090000018680C00009001014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B50F110112000000
 A: consistent_dma_mask_bits=64\n
 A: d3cold_allowed=1\n
 A: dbc=disabled\n
 A: dbc_bInterfaceProtocol=01\n
 A: dbc_bcdDevice=0010\n
 A: dbc_idProduct=0010\n
 A: dbc_idVendor=1d6b\n
 A: device=0x51ed\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:51
 A: index=9\n
 L: iommu=../../virtual/iommu/dmar2
 L: iommu_group=../../../kernel/iommu_groups/11
 A: irq=142\n
 A: label=Onboard - Other\n
 A: local_cpulist=0-15\n
 A: local_cpus=ffff\n
 A: modalias=pci:v00008086d000051EDsv0000144Dsd0000C1CAbc0Csc03i30\n
 A: msi_bus=1\n
 A: msi_irqs/142=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    6    7 2112  7\nxHCI ring segments   28   28 4096 28\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          1   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=957198\n
 A: power/runtime_enabled=enabled\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
 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=0x000000603e1a0000 0x000000603e1affff 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=0x01\n
 A: subsystem_device=0xc1ca\n
 A: subsystem_vendor=0x144d\n
 A: vendor=0x8086\n
--- a/tests/egismoc/custom.pcapng
+++ b/tests/egismoc/custom.pcapng
--- a/tests/egismoc/custom.py
+++ b/tests/egismoc/custom.py
@@ -1,156 +0,0 @@
 #!/usr/bin/python3
 import traceback
 import sys
 import time
 import gi
 gi.require_version('FPrint', '2.0')
 from gi.repository import FPrint, GLib
 # Exit with error on any exception, included those happening in async callbacks
 sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
 ctx = GLib.main_context_default()
 c = FPrint.Context()
 c.enumerate()
 devices = c.get_devices()
 d = devices[0]
 del devices
 d.open_sync()
 assert d.get_driver() == "egismoc"
 assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
 assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
 assert d.has_feature(FPrint.DeviceFeature.VERIFY)
 assert d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
 def enroll_progress(*args):
    print("finger status: ", d.get_finger_status())
    print('enroll progress: ' + str(args))
 def identify_done(dev, res):
    global identified
    identified = True
    identify_match, identify_print = dev.identify_finish(res)
    print('indentification_done: ', identify_match, identify_print)
    assert identify_match.equal(identify_print)
 # Beginning with list and clear assumes you begin with >0 prints enrolled before capturing
 print("listing - device should have prints")
 stored = d.list_prints_sync()
 assert len(stored) > 0
 del stored
 print("clear device storage")
 d.clear_storage_sync()
 print("clear done")
 print("listing - device should be empty")
 stored = d.list_prints_sync()
 assert len(stored) == 0
 del stored
 print("enrolling")
 template = FPrint.Print.new(d)
 template.set_finger(FPrint.Finger.LEFT_INDEX)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 p1 = d.enroll_sync(template, None, enroll_progress, None)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("enroll done")
 del template
 print("listing - device should have 1 print")
 stored = d.list_prints_sync()
 assert len(stored) == 1
 assert stored[0].equal(p1)
 print("verifying")
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 verify_res, verify_print = d.verify_sync(p1)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("verify done")
 assert verify_res == True
 identified = False
 deserialized_prints = []
 for p in stored:
    deserialized_prints.append(FPrint.Print.deserialize(p.serialize()))
    assert deserialized_prints[-1].equal(p)
 del stored
 print('async identifying')
 d.identify(deserialized_prints, callback=identify_done)
 del deserialized_prints
 while not identified:
    ctx.iteration(True)
 print("try to enroll duplicate")
 template = FPrint.Print.new(d)
 template.set_finger(FPrint.Finger.RIGHT_INDEX)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 try:
    d.enroll_sync(template, None, enroll_progress, None)
 except GLib.Error as error:
    assert error.matches(FPrint.DeviceError.quark(),
                         FPrint.DeviceError.DATA_DUPLICATE)
 except Exception as exc:
    raise
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("duplicate enroll attempt done")
 print("listing - device should still only have 1 print")
 stored = d.list_prints_sync()
 assert len(stored) == 1
 assert stored[0].equal(p1)
 del stored
 print("enroll new finger")
 template = FPrint.Print.new(d)
 template.set_finger(FPrint.Finger.RIGHT_INDEX)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 p2 = d.enroll_sync(template, None, enroll_progress, None)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("enroll new finger done")
 del template
 print("listing - device should have 2 prints")
 stored = d.list_prints_sync()
 assert len(stored) == 2
 assert (stored[0].equal(p1) and stored[1].equal(p2)) or (stored[0].equal(p2) and stored[1].equal(p1))
 del stored
 print("deleting first print")
 d.delete_print_sync(p1)
 print("delete done")
 del p1
 print("listing - device should only have second print")
 stored = d.list_prints_sync()
 assert len(stored) == 1
 assert stored[0].equal(p2)
 del stored
 del p2
 print("clear device storage")
 d.clear_storage_sync()
 print("clear done")
 print("listing - device should be empty")
 stored = d.list_prints_sync()
 assert len(stored) == 0
 del stored
 d.close_sync()
 del d
 del c
--- a/tests/egismoc/device
+++ b/tests/egismoc/device
@@ -1,262 +0,0 @@
 P: /devices/pci0000:00/0000:00:14.0/usb3/3-5
 N: bus/usb/003/012=12010002FF0000407A1C820581110102030109022700010100A0320904000003FF000000070581020002000705020200020007058303400005
 E: BUSNUM=003
 E: CURRENT_TAGS=:snap_cups_ippeveprinter:snap_cups_cupsd:
 E: DEVNAME=/dev/bus/usb/003/012
 E: DEVNUM=012
 E: DEVTYPE=usb_device
 E: DRIVER=usb
 E: ID_BUS=usb
 E: ID_MODEL=ETU905A80-E
 E: ID_MODEL_ENC=ETU905A80-E
 E: ID_MODEL_ID=0582
 E: ID_PATH=pci-0000:00:14.0-usb-0:5
 E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_5
 E: ID_REVISION=1181
 E: ID_SERIAL=EGIS_ETU905A80-E_0E7828PBS393
 E: ID_SERIAL_SHORT=0E7828PBS393
 E: ID_USB_INTERFACES=:ff0000:
 E: ID_USB_MODEL=ETU905A80-E
 E: ID_USB_MODEL_ENC=ETU905A80-E
 E: ID_USB_MODEL_ID=0582
 E: ID_USB_REVISION=1181
 E: ID_USB_SERIAL=EGIS_ETU905A80-E_0E7828PBS393
 E: ID_USB_SERIAL_SHORT=0E7828PBS393
 E: ID_USB_VENDOR=EGIS
 E: ID_USB_VENDOR_ENC=EGIS
 E: ID_USB_VENDOR_ID=1c7a
 E: ID_VENDOR=EGIS
 E: ID_VENDOR_ENC=EGIS
 E: ID_VENDOR_FROM_DATABASE=LighTuning Technology Inc.
 E: ID_VENDOR_ID=1c7a
 E: MAJOR=189
 E: MINOR=267
 E: PRODUCT=1c7a/582/1181
 E: SUBSYSTEM=usb
 E: TAGS=:snap_cups_ippeveprinter:snap_cups_cupsd:
 E: TYPE=255/0/0
 A: authorized=1\n
 A: avoid_reset_quirk=0\n
 A: bConfigurationValue=1\n
 A: bDeviceClass=ff\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=1181\n
 A: bmAttributes=a0\n
 A: busnum=3\n
 A: configuration=
 H: descriptors=12010002FF0000407A1C820581110102030109022700010100A0320904000003FF000000070581020002000705020200020007058303400005
 A: dev=189:267\n
 A: devnum=12\n
 A: devpath=5\n
 L: driver=../../../../../bus/usb/drivers/usb
 L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:51/device:52/device:57
 A: idProduct=0582\n
 A: idVendor=1c7a\n
 A: ltm_capable=no\n
 A: manufacturer=EGIS\n
 A: maxchild=0\n
 A: physical_location/dock=no\n
 A: physical_location/horizontal_position=center\n
 A: physical_location/lid=no\n
 A: physical_location/panel=unknown\n
 A: physical_location/vertical_position=center\n
 L: port=../3-0:1.0/usb3-port5
 A: power/active_duration=1425996\n
 A: power/async=enabled\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
 A: power/connected_duration=1426656\n
 A: power/control=on\n
 A: power/level=on\n
 A: power/persist=0\n
 A: power/runtime_active_kids=0\n
 A: power/runtime_active_time=1426124\n
 A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
 A: power/runtime_usage=1\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=ETU905A80-E\n
 A: quirks=0x0\n
 A: removable=fixed\n
 A: rx_lanes=1\n
 A: serial=0E7828PBS393\n
 A: speed=480\n
 A: tx_lanes=1\n
 A: urbnum=2803\n
 A: version= 2.00\n
 P: /devices/pci0000:00/0000:00:14.0/usb3
 N: bus/usb/003/001=12010002090001406B1D020002060302010109021900010100E0000904000001090000000705810304000C
 E: BUSNUM=003
 E: CURRENT_TAGS=:seat:snap_cups_cupsd:snap_cups_ippeveprinter:
 E: DEVNAME=/dev/bus/usb/003/001
 E: DEVNUM=001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
 E: ID_AUTOSUSPEND=1
 E: ID_BUS=usb
 E: ID_FOR_SEAT=usb-pci-0000_00_14_0
 E: ID_MODEL=xHCI_Host_Controller
 E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
 E: ID_MODEL_FROM_DATABASE=2.0 root hub
 E: ID_MODEL_ID=0002
 E: ID_PATH=pci-0000:00:14.0
 E: ID_PATH_TAG=pci-0000_00_14_0
 E: ID_REVISION=0602
 E: ID_SERIAL=Linux_6.2.0-34-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_SERIAL_SHORT=0000:00:14.0
 E: ID_USB_INTERFACES=:090000:
 E: ID_USB_MODEL=xHCI_Host_Controller
 E: ID_USB_MODEL_ENC=xHCI\x20Host\x20Controller
 E: ID_USB_MODEL_ID=0002
 E: ID_USB_REVISION=0602
 E: ID_USB_SERIAL=Linux_6.2.0-34-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_USB_SERIAL_SHORT=0000:00:14.0
 E: ID_USB_VENDOR=Linux_6.2.0-34-generic_xhci-hcd
 E: ID_USB_VENDOR_ENC=Linux\x206.2.0-34-generic\x20xhci-hcd
 E: ID_USB_VENDOR_ID=1d6b
 E: ID_VENDOR=Linux_6.2.0-34-generic_xhci-hcd
 E: ID_VENDOR_ENC=Linux\x206.2.0-34-generic\x20xhci-hcd
 E: ID_VENDOR_FROM_DATABASE=Linux Foundation
 E: ID_VENDOR_ID=1d6b
 E: MAJOR=189
 E: MINOR=256
 E: PRODUCT=1d6b/2/602
 E: SUBSYSTEM=usb
 E: TAGS=:snap_cups_cupsd:seat:snap_cups_ippeveprinter:
 E: TYPE=9/0/1
 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=0602\n
 A: bmAttributes=e0\n
 A: busnum=3\n
 A: configuration=
 H: descriptors=12010002090001406B1D020002060302010109021900010100E0000904000001090000000705810304000C
 A: dev=189:256\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:51/device:52
 A: idProduct=0002\n
 A: idVendor=1d6b\n
 A: interface_authorized_default=1\n
 A: ltm_capable=no\n
 A: manufacturer=Linux 6.2.0-34-generic xhci-hcd\n
 A: maxchild=12\n
 A: power/active_duration=337953872\n
 A: power/async=enabled\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
 A: power/connected_duration=337978524\n
 A: power/control=auto\n
 A: power/level=auto\n
 A: power/runtime_active_kids=1\n
 A: power/runtime_active_time=337962424\n
 A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=616\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=4969\n
 A: version= 2.00\n
 P: /devices/pci0000:00/0000:00:14.0
 E: DRIVER=xhci_hcd
 E: ID_MODEL_FROM_DATABASE=Alder Lake PCH USB 3.2 xHCI Host Controller
 E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
 E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
 E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
 E: ID_VENDOR_FROM_DATABASE=Intel Corporation
 E: MODALIAS=pci:v00008086d000051EDsv0000144Dsd0000C870bc0Csc03i30
 E: PCI_CLASS=C0330
 E: PCI_ID=8086:51ED
 E: PCI_SLOT_NAME=0000:00:14.0
 E: PCI_SUBSYS_ID=144D:C870
 E: SUBSYSTEM=pci
 A: ari_enabled=0\n
 A: broken_parity_status=0\n
 A: class=0x0c0330\n
 H: config=8680ED51060490020130030C000080000400161D6000000000000000000000000000000000000000000000004D1470C8000000007000000000000000FF010000FD0134A089C27F8000000000000000003F6DD80F000000000000000000000000316000000000000000000000000000000180C2C1080000000000000000000000059087007805E0FE000000000000000009B014F01000400100000000C10A080000080E00001800008F50020000010000090000018680C00009001014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B50F010112000000
 A: consistent_dma_mask_bits=64\n
 A: d3cold_allowed=1\n
 A: dbc=disabled\n
 A: device=0x51ed\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:51
 A: index=7\n
 L: iommu=../../virtual/iommu/dmar1
 L: iommu_group=../../../kernel/iommu_groups/8
 A: irq=145\n
 A: label=Onboard - Other\n
 A: local_cpulist=0-15\n
 A: local_cpus=ffff\n
 A: modalias=pci:v00008086d000051EDsv0000144Dsd0000C870bc0Csc03i30\n
 A: msi_bus=1\n
 A: msi_irqs/145=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    6    9 2112  9\nxHCI ring segments   26   34 4096 34\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0   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=337964621\n
 A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=438\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
 A: power/wakeup_active_count=7\n
 A: power/wakeup_count=0\n
 A: power/wakeup_expire_count=7\n
 A: power/wakeup_last_time_ms=336554844\n
 A: power/wakeup_max_time_ms=105\n
 A: power/wakeup_total_time_ms=721\n
 A: power_state=D0\n
 A: resource=0x000000601d160000 0x000000601d16ffff 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=0x01\n
 A: subsystem_device=0xc870\n
 A: subsystem_vendor=0x144d\n
 A: vendor=0x8086\n
--- a/tests/elanmoc/custom.pcapng
+++ b/tests/elanmoc/custom.pcapng
--- a/tests/elanmoc/custom.py
+++ b/tests/elanmoc/custom.py
@@ -1,15 +1,9 @@
 #!/usr/bin/python3
 import traceback
 import sys
 import gi
 gi.require_version('FPrint', '2.0')
 from gi.repository import FPrint, GLib
 # Exit with error on any exception, included those happening in async callbacks
 sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
 ctx = GLib.main_context_default()
 c = FPrint.Context()
--- a/tests/elanmoc/device
+++ b/tests/elanmoc/device
@@ -1,67 +1,63 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-9
+P: /devices/pci0000:00/0000:00:14.0/usb1/1-1
-N: bus/usb/001/003=1201000200000008F304880C04800102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+N: bus/usb/001/010=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-E: DEVNAME=/dev/bus/usb/001/003
+E: DEVNAME=/dev/bus/usb/001/010
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=4f3/c88/8004
+E: PRODUCT=4f3/c7e/305
 E: TYPE=0/0/0
 E: BUSNUM=001
-E: DEVNUM=003
+E: DEVNUM=010
 E: MAJOR=189
-E: MINOR=2
+E: MINOR=9
 E: SUBSYSTEM=usb
 E: ID_VENDOR=ELAN
 E: ID_VENDOR_ENC=ELAN
 E: ID_VENDOR_ID=04f3
 E: ID_MODEL=ELAN:ARM-M4
 E: ID_MODEL_ENC=ELAN:ARM-M4
-E: ID_MODEL_ID=0c88
+E: ID_MODEL_ID=0c7e
-E: ID_REVISION=8004
+E: ID_REVISION=0305
 E: ID_SERIAL=ELAN_ELAN:ARM-M4
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:ff0000:
 E: ID_VENDOR_FROM_DATABASE=Elan Microelectronics Corp.
-E: ID_PATH=pci-0000:00:14.0-usb-0:9
+E: ID_PATH=pci-0000:00:14.0-usb-0:1
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_9
+E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_1
 E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_9
 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: bMaxPacketSize0=64\n
 A: bMaxPower=100mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=8004\n
+A: bcdDevice=0305\n
 A: bmAttributes=a0\n
 A: busnum=1\n
-A: configuration=
+A: configuration=add909c9-e67e-4126-a6f7-1e31179e27d9\n
-H: descriptors=1201000200000008F304880C04800102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+H: descriptors=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-A: dev=189:2\n
+A: dev=189:9\n
-A: devnum=3\n
+A: devnum=10\n
-A: devpath=9\n
+A: devpath=1\n
 L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:3d/device:3e/device:47
+A: idProduct=0c7e\n
 A: idProduct=0c88\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-port9
+L: port=../1-0:1.0/usb1-port1
-A: power/active_duration=35269124\n
+A: power/active_duration=94712\n
 A: power/async=enabled\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=35283788\n
+A: power/connected_duration=94712\n
 A: power/control=on\n
 A: power/level=on\n
-A: power/persist=0\n
+A: power/persist=1\n
 A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=35276624\n
+A: power/runtime_active_time=94436\n
 A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
@@ -81,40 +77,38 @@ A: removable=removable\n
 A: rx_lanes=1\n
 A: speed=12\n
 A: tx_lanes=1\n
-A: urbnum=2773\n
+A: urbnum=12\n
 A: version= 2.00\n
 P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020015050302010109021900010100E0000904000001090000000705810304000C
+N: bus/usb/001/001=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
 E: DEVNAME=/dev/bus/usb/001/001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=1d6b/2/515
+E: PRODUCT=1d6b/2/504
 E: TYPE=9/0/1
 E: BUSNUM=001
 E: DEVNUM=001
 E: MAJOR=189
 E: MINOR=0
 E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.15.0-39-generic_xhci-hcd
+E: ID_VENDOR=Linux_5.4.0-42-generic_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.15.0-39-generic\x20xhci-hcd
+E: ID_VENDOR_ENC=Linux\x205.4.0-42-generic\x20xhci-hcd
 E: ID_VENDOR_ID=1d6b
 E: ID_MODEL=xHCI_Host_Controller
 E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
 E: ID_MODEL_ID=0002
-E: ID_REVISION=0515
+E: ID_REVISION=0504
-E: ID_SERIAL=Linux_5.15.0-39-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_SERIAL=Linux_5.4.0-42-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_SERIAL_SHORT=0000:00:14.0
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:090000:
 E: ID_VENDOR_FROM_DATABASE=Linux Foundation
 E: ID_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
@@ -126,31 +120,30 @@ A: bMaxPacketSize0=64\n
 A: bMaxPower=0mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=0515\n
+A: bcdDevice=0504\n
 A: bmAttributes=e0\n
 A: busnum=1\n
-A: configuration=
+A: configuration=\n
-H: descriptors=12010002090001406B1D020015050302010109021900010100E0000904000001090000000705810304000C
+H: descriptors=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
 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:3d/device:3e
 A: idProduct=0002\n
 A: idVendor=1d6b\n
 A: interface_authorized_default=1\n
 A: ltm_capable=no\n
-A: manufacturer=Linux 5.15.0-39-generic xhci-hcd\n
+A: manufacturer=Linux 5.4.0-42-generic xhci-hcd\n
-A: maxchild=14\n
+A: maxchild=12\n
-A: power/active_duration=35270364\n
+A: power/active_duration=74604360\n
 A: power/async=enabled\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=35284300\n
+A: power/connected_duration=74606456\n
 A: power/control=auto\n
 A: power/level=auto\n
-A: power/runtime_active_kids=2\n
+A: power/runtime_active_kids=4\n
-A: power/runtime_active_time=35277420\n
+A: power/runtime_active_time=74605838\n
 A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
@@ -171,63 +164,62 @@ A: rx_lanes=1\n
 A: serial=0000:00:14.0\n
 A: speed=480\n
 A: tx_lanes=1\n
-A: urbnum=549\n
+A: urbnum=490\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:8C31
+E: PCI_ID=8086:9DED
-E: PCI_SUBSYS_ID=1043:201F
+E: PCI_SUBSYS_ID=103C:85EF
 E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d00008C31sv00001043sd0000201Fbc0Csc03i30
+E: MODALIAS=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30
 E: SUBSYSTEM=pci
 E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
 E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
 E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
 E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=8 Series/C220 Series Chipset Family USB xHCI
+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=8680318C060490020530030C000000000400A0F700000000000000000000000000000000000000000000000043101F200000000070000000000000000B010000FD01368089C60F8000000000000000009F6E8807000000000000000000000000302000000000000000000000000000000180C2C1080000000000000000000000050087000410E0FE000000002F00000000000000000000000000000000000000400100000000000000000000000000000F000100000000000000000000000000030420C0030C3000030C300000000000FF1A0000FF1A00003F0000003F000000A00000000000000000000000D8D8D8080000000000000000B10F060800000000
+H: config=8680ED9D060490023030030C00008000040030A10000000000000000000000000000000000000000000000003C10EF85000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000181C030400000000316000000000000000000000000000000180C2C1080000000000000000000000059087007802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000B50F300112000000
 A: consistent_dma_mask_bits=64\n
 A: d3cold_allowed=1\n
-A: device=0x8c31\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:3d
+A: irq=124\n
 A: irq=31\n
 A: local_cpulist=0-3\n
 A: local_cpus=f\n
-A: modalias=pci:v00008086d00008C31sv00001043sd0000201Fbc0Csc03i30\n
+A: modalias=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30\n
 A: msi_bus=1\n
-A: msi_irqs/31=msi\n
+A: msi_irqs/124=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    5    6 2112  6\nxHCI ring segments   24   24 4096 24\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          3   32  128  1\nbuffer-32           0    0   32  0\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=on\n
+A: power/control=auto\n
 A: power/runtime_active_kids=1\n
-A: power/runtime_active_time=35278060\n
+A: power/runtime_active_time=74606194\n
-A: power/runtime_enabled=forbidden\n
+A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=1\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
-A: power/wakeup_active_count=5\n
+A: power/wakeup_active_count=0\n
 A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=5\n
+A: power/wakeup_expire_count=0\n
-A: power/wakeup_last_time_ms=12694896\n
+A: power/wakeup_last_time_ms=0\n
-A: power/wakeup_max_time_ms=103\n
+A: power/wakeup_max_time_ms=0\n
-A: power/wakeup_total_time_ms=518\n
+A: power/wakeup_total_time_ms=0\n
-A: power_state=D0\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: resource=0x00000000f7a00000 0x00000000f7a0ffff 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: revision=0x05\n
+A: subsystem_device=0x85ef\n
-A: subsystem_device=0x201f\n
+A: subsystem_vendor=0x103c\n
 A: subsystem_vendor=0x1043\n
 A: vendor=0x8086\n
--- a/tests/focaltech_moc/custom.pcapng
+++ b/tests/focaltech_moc/custom.pcapng
--- a/tests/focaltech_moc/custom.py
+++ b/tests/focaltech_moc/custom.py
@@ -1,89 +0,0 @@
 #!/usr/bin/python3
 import traceback
 import sys
 import gi
 gi.require_version('FPrint', '2.0')
 from gi.repository import FPrint, GLib
 # Exit with error on any exception, included those happening in async callbacks
 sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
 ctx = GLib.main_context_default()
 c = FPrint.Context()
 c.enumerate()
 devices = c.get_devices()
 d = devices[0]
 del devices
 assert d.get_driver() == "focaltech_moc"
 assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
 assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
 assert d.has_feature(FPrint.DeviceFeature.VERIFY)
 assert not d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
 assert not d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
 d.open_sync()
 template = FPrint.Print.new(d)
 def enroll_progress(*args):
    #assert d.get_finger_status() == FPrint.FingerStatusFlags.NEEDED
    print("finger status: ", d.get_finger_status())
    print('enroll progress: ' + str(args))
 def identify_done(dev, res):
    global identified
    identified = True
    identify_match, identify_print = dev.identify_finish(res)
    print('indentification_done: ', identify_match, identify_print)
    assert identify_match.equal(identify_print)
 # List, enroll, list, verify, identify, delete
 print("enrolling")
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 p = d.enroll_sync(template, None, enroll_progress, None)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("enroll done")
 print("listing")
 stored = d.list_prints_sync()
 print("listing done")
 assert len(stored) == 1
 assert stored[0].equal(p)
 print("verifying")
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 verify_res, verify_print = d.verify_sync(p)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("verify done")
 del p
 assert verify_res == True
 identified = False
 deserialized_prints = []
 for p in stored:
    deserialized_prints.append(FPrint.Print.deserialize(p.serialize()))
    assert deserialized_prints[-1].equal(p)
 del stored
 print('async identifying')
 d.identify(deserialized_prints, callback=identify_done)
 del deserialized_prints
 while not identified:
    ctx.iteration(True)
 print("deleting")
 d.delete_print_sync(p)
 print("delete done")
 d.close_sync()
 del d
 del c
--- a/tests/focaltech_moc/device
+++ b/tests/focaltech_moc/device
--- a/tests/fpcmoc/custom.pcapng
+++ b/tests/fpcmoc/custom.pcapng
--- a/tests/fpcmoc/custom.py
+++ b/tests/fpcmoc/custom.py
@@ -1,92 +0,0 @@
 #!/usr/bin/python3
 import traceback
 import sys
 import gi
 gi.require_version('FPrint', '2.0')
 from gi.repository import FPrint, GLib
 # Exit with error on any exception, included those happening in async callbacks
 sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
 ctx = GLib.main_context_default()
 c = FPrint.Context()
 c.enumerate()
 devices = c.get_devices()
 d = devices[0]
 del devices
 assert d.get_driver() == "fpcmoc"
 assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
 assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
 assert d.has_feature(FPrint.DeviceFeature.VERIFY)
 assert d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
 d.open_sync()
 print("Clear")
 d.clear_storage_sync()
 print("Clear done")
 template = FPrint.Print.new(d)
 def enroll_progress(*args):
    assert d.get_finger_status() == FPrint.FingerStatusFlags.NEEDED
    print('enroll progress: ' + str(args))
 def identify_done(dev, res):
    global identified
    identified = True
    identify_match, identify_print = dev.identify_finish(res)
    print('indentification_done: ', identify_match, identify_print)
    assert identify_match.equal(identify_print)
 # List, enroll, list, verify, identify, delete
 print("enrolling")
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 p = d.enroll_sync(template, None, enroll_progress, None)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("enroll done")
 print("listing")
 stored = d.list_prints_sync()
 print("listing done")
 assert len(stored) == 1
 assert stored[0].equal(p)
 print("verifying")
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 verify_res, verify_print = d.verify_sync(p)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("verify done")
 del p
 assert verify_res == True
 identified = False
 deserialized_prints = []
 for p in stored:
    deserialized_prints.append(FPrint.Print.deserialize(p.serialize()))
    assert deserialized_prints[-1].equal(p)
 del stored
 print('async identifying')
 d.identify(deserialized_prints, callback=identify_done)
 del deserialized_prints
 while not identified:
    ctx.iteration(True)
 print("deleting")
 d.delete_print_sync(p)
 print("delete done")
 d.close_sync()
 del d
 del c
--- a/tests/fpcmoc/device
+++ b/tests/fpcmoc/device
@@ -1,234 +0,0 @@
 P: /devices/pci0000:00/0000:00:14.0/usb1/1-1
 N: bus/usb/001/019=1201000200000040A510E0FF10000102000109021900010104A0320904000001FFFFFF0507058102400000
 E: DEVNAME=/dev/bus/usb/001/019
 E: DEVTYPE=usb_device
 E: DRIVER=usb
 E: PRODUCT=10a5/ffe0/10
 E: TYPE=0/0/0
 E: BUSNUM=001
 E: DEVNUM=019
 E: MAJOR=189
 E: MINOR=18
 E: SUBSYSTEM=usb
 E: ID_VENDOR=FPC
 E: ID_VENDOR_ENC=FPC
 E: ID_VENDOR_ID=10a5
 E: ID_MODEL=FPC_L:0001_FW:127010
 E: ID_MODEL_ENC=FPC\x20L:0001\x20FW:127010
 E: ID_MODEL_ID=ffe0
 E: ID_REVISION=0010
 E: ID_SERIAL=FPC_FPC_L:0001_FW:127010
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:ffffff:
 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_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_1
 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=100mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
 A: bcdDevice=0010\n
 A: bmAttributes=a0\n
 A: busnum=1\n
 A: configuration=FPC\n
 H: descriptors=1201000200000040A510E0FF10000102000109021900010104A0320904000001FFFFFF0507058102400000
 A: dev=189:18\n
 A: devnum=19\n
 A: devpath=1\n
 L: driver=../../../../../bus/usb/drivers/usb
 L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d/device:1e
 A: idProduct=ffe0\n
 A: idVendor=10a5\n
 A: ltm_capable=no\n
 A: manufacturer=FPC\n
 A: maxchild=0\n
 L: port=../1-0:1.0/usb1-port1
 A: power/active_duration=27204308\n
 A: power/async=enabled\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
 A: power/connected_duration=27204308\n
 A: power/control=on\n
 A: power/level=on\n
 A: power/persist=1\n
 A: power/runtime_active_kids=0\n
 A: power/runtime_active_time=27204033\n
 A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
 A: power/runtime_usage=1\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=FPC L:0001 FW:127010\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=31\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.0-52-generic_xhci-hcd
 E: ID_VENDOR_ENC=Linux\x205.13.0-52-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.0-52-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_SERIAL_SHORT=0000:00:14.0
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:090000:
 E: ID_VENDOR_FROM_DATABASE=Linux Foundation
 E: ID_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: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.0-52-generic xhci-hcd\n
 A: maxchild=12\n
 A: power/active_duration=32728176\n
 A: power/async=enabled\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
 A: power/connected_duration=32728176\n
 A: power/control=auto\n
 A: power/level=auto\n
 A: power/runtime_active_kids=2\n
 A: power/runtime_active_time=32728177\n
 A: power/runtime_enabled=enabled\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
 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=1353\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:9D2F
 E: PCI_SUBSYS_ID=103C:8079
 E: PCI_SLOT_NAME=0000:00:14.0
 E: MODALIAS=pci:v00008086d00009D2Fsv0000103Csd00008079bc0Csc03i30
 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=Sunrise Point-LP USB 3.0 xHCI Controller (EliteBook 840 G3)
 A: ari_enabled=0\n
 A: broken_parity_status=0\n
 A: class=0x0c0330\n
 H: config=86802F9D060490022130030C00008000040022E10000000000000000000000000000000000000000000000003C1079800000000070000000000000000B010000FD01348088C60F8000000000000000005F6ECE0F000000000000000000000000306000000000000000000000000000000180C2C1080000000000000000000000050087000480E0FE0000000022000000090014F01000400100000000C10A080000080400001800008F40020000010400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B30F400800000000
 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
 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=122\n
 A: local_cpulist=0-3\n
 A: local_cpus=f\n
 A: modalias=pci:v00008086d00009D2Fsv0000103Csd00008079bc0Csc03i30\n
 A: msi_bus=1\n
 A: msi_irqs/122=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   14 2112 14\nxHCI ring segments   34   44 4096 44\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0   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=32728973\n
 A: power/runtime_enabled=enabled\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
 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=0x00000000e1220000 0x00000000e122ffff 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=0x8079\n
 A: subsystem_vendor=0x103c\n
 A: vendor=0x8086\n
--- a/tests/goodixmoc/custom.pcapng
+++ b/tests/goodixmoc/custom.pcapng
--- a/tests/goodixmoc/custom.py
+++ b/tests/goodixmoc/custom.py
@@ -1,15 +1,9 @@
 #!/usr/bin/python3
 import traceback
 import sys
 import gi
 gi.require_version('FPrint', '2.0')
 from gi.repository import FPrint, GLib
 # Exit with error on any exception, included those happening in async callbacks
 sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
 ctx = GLib.main_context_default()
 c = FPrint.Context()
@@ -31,13 +25,10 @@ assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
 d.open_sync()
 # 1. verify clear storage command, 2. make sure later asserts are good
 d.clear_storage_sync()
 template = FPrint.Print.new(d)
 def enroll_progress(*args):
-    assert d.get_finger_status() & FPrint.FingerStatusFlags.NEEDED
+    assert d.get_finger_status() == FPrint.FingerStatusFlags.NEEDED
    print('enroll progress: ' + str(args))
 def identify_done(dev, res):
--- a/tests/goodixmoc/device
+++ b/tests/goodixmoc/device
@@ -1,30 +1,30 @@
-P: /devices/pci0000:00/0000:00:14.0/usb3/3-9
+P: /devices/pci0000:00/0000:00:14.0/usb1/1-3
-N: bus/usb/003/004=12010002EF000040C627AC6300010102030109022000010103A0320904000002FF0000040705830240000007050102400000
+N: bus/usb/001/053=12010002EF000040C627966400010102030109022000010103A0320904000002FF0000040705830240000007050102400000
-E: DEVNAME=/dev/bus/usb/003/004
+E: DEVNAME=/dev/bus/usb/001/053
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=27c6/63ac/100
+E: PRODUCT=27c6/6496/100
 E: TYPE=239/0/0
-E: BUSNUM=003
+E: BUSNUM=001
-E: DEVNUM=004
+E: DEVNUM=053
 E: MAJOR=189
-E: MINOR=259
+E: MINOR=52
 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=63ac
+E: ID_MODEL_ID=6496
 E: ID_REVISION=0100
-E: ID_SERIAL=Goodix_Technology_Co.__Ltd._Goodix_USB2.0_MISC_UID4C77C784_XXXX_MOC_B0
+E: ID_SERIAL=Goodix_Technology_Co.__Ltd._Goodix_USB2.0_MISC_XXXX_MOC_B0
-E: ID_SERIAL_SHORT=UID4C77C784_XXXX_MOC_B0
+E: ID_SERIAL_SHORT=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:9
+E: ID_PATH=pci-0000:00:14.0-usb-0:3
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_9
+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
@@ -37,34 +37,30 @@ A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
 A: bcdDevice=0100\n
 A: bmAttributes=a0\n
-A: busnum=3\n
+A: busnum=1\n
-A: configuration=UID4C77C784_XXXX_MOC_B0\n
+A: configuration=XXXX_MOC_B0\n
-H: descriptors=12010002EF000040C627AC6300010102030109022000010103A0320904000002FF0000040705830240000007050102400000
+H: descriptors=12010002EF000040C627966400010102030109022000010103A0320904000002FF0000040705830240000007050102400000
-A: dev=189:259\n
+A: dev=189:52\n
-A: devnum=4\n
+A: devnum=53\n
-A: devpath=9\n
+A: devpath=3\n
 L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:13/device:14/device:1f
+L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d/device:20
-A: idProduct=63ac\n
+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=../3-0:1.0/usb3-port9
+L: port=../1-0:1.0/usb1-port3
-A: power/active_duration=702588\n
+A: power/active_duration=29262\n
 A: power/async=enabled\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=78973756\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_kids=0\n
+A: power/runtime_active_time=29308\n
 A: power/runtime_active_time=707156\n
 A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
-A: power/runtime_suspended_time=78265226\n
+A: power/runtime_suspended_time=27850\n
 A: power/runtime_usage=0\n
 A: power/wakeup=disabled\n
 A: power/wakeup_abort_count=\n
 A: power/wakeup_active=\n
@@ -76,34 +72,34 @@ 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=fixed\n
+A: removable=removable\n
 A: rx_lanes=1\n
-A: serial=UID4C77C784_XXXX_MOC_B0\n
+A: serial=XXXX_MOC_B0\n
 A: speed=12\n
 A: tx_lanes=1\n
-A: urbnum=5759\n
+A: urbnum=394\n
 A: version= 2.00\n
-P: /devices/pci0000:00/0000:00:14.0/usb3
+P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/003/001=12010002090001406B1D020015050302010109021900010100E0000904000001090000000705810304000C
+N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/003/001
+E: DEVNAME=/dev/bus/usb/001/001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=1d6b/2/515
+E: PRODUCT=1d6b/2/513
 E: TYPE=9/0/1
-E: BUSNUM=003
+E: BUSNUM=001
 E: DEVNUM=001
 E: MAJOR=189
-E: MINOR=256
+E: MINOR=0
 E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.15.0-57-generic_xhci-hcd
+E: ID_VENDOR=Linux_5.13.15-200.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.15.0-57-generic\x20xhci-hcd
+E: ID_VENDOR_ENC=Linux\x205.13.15-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=0515
+E: ID_REVISION=0513
-E: ID_SERIAL=Linux_5.15.0-57-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_SERIAL=Linux_5.13.15-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:
@@ -126,35 +122,31 @@ A: bMaxPacketSize0=64\n
 A: bMaxPower=0mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=0515\n
+A: bcdDevice=0513\n
 A: bmAttributes=e0\n
-A: busnum=3\n
+A: busnum=1\n
-A: configuration=
+A: configuration=\n
-H: descriptors=12010002090001406B1D020015050302010109021900010100E0000904000001090000000705810304000C
+H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:256\n
+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:13/device:14
+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.15.0-57-generic xhci-hcd\n
+A: manufacturer=Linux 5.13.15-200.fc34.x86_64 xhci-hcd\n
 A: maxchild=12\n
-A: power/active_duration=78971960\n
+A: power/active_duration=219578717\n
 A: power/async=enabled\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=78974992\n
+A: power/connected_duration=219649620\n
 A: power/control=auto\n
 A: power/level=auto\n
-A: power/runtime_active_kids=2\n
+A: power/runtime_active_time=219589127\n
 A: power/runtime_active_time=78973899\n
 A: power/runtime_enabled=enabled\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
@@ -171,52 +163,48 @@ A: rx_lanes=1\n
 A: serial=0000:00:14.0\n
 A: speed=480\n
 A: tx_lanes=1\n
-A: urbnum=1824\n
+A: urbnum=4325\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:51ED
+E: PCI_ID=8086:9DED
-E: PCI_SUBSYS_ID=1028:0B00
+E: PCI_SUBSYS_ID=17AA:2292\n
 E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d000051EDsv00001028sd00000B00bc0Csc03i30
+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=8680ED51060490020130030C0000800004002A8F6200000000000000000000000000000000000000000000002810000B000000007000000000000000FF010000FD0134A089C27F8000000000000000003F6DD80F000000000000000000000000316000000000000000000000000000000180C2C1080000000000000000000000059087003808E0FE000000000000000009B014F01000400100000000C10A080000080E00001800008F50020000010000090000018680C00009001014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B50F100112000000
+H: config=8680ED9D060490021130030C00008000040022EA000000000000000000000000000000000000000000000000AA179222000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F000000004C084B0100000000316000000000000000000000000000000180C2C1080000000000000000000000059087001803E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000000000000000000008000000040000000000000000000000000000000000000000000000000000000800000004000000000000000000000000000000000000000000000000000000B50F320112000000
 A: consistent_dma_mask_bits=64\n
 A: d3cold_allowed=1\n
 A: dbc=disabled\n
-A: device=0x51ed\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:13
+L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c
-L: iommu=../../virtual/iommu/dmar1
+A: irq=128\n
-L: iommu_group=../../../kernel/iommu_groups/13
+A: local_cpulist=0-7\n
-A: irq=167\n
+A: local_cpus=ff\n
-A: local_cpulist=0-19\n
+A: modalias=pci:v00008086d00009DEDsv000017AAsd00002292bc0Csc03i30\n
 A: local_cpus=fffff\n
 A: modalias=pci:v00008086d000051EDsv00001028sd00000B00bc0Csc03i30\n
 A: msi_bus=1\n
-A: msi_irqs/167=msi\n
+A: msi_irqs/128=msi\n
 A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   13   14 2112 14\nxHCI ring segments   38   42 4096 42\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          3   32  128  1\nbuffer-32           0    0   32  0\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/async=enabled\n
+A: power/control=on\n
-A: power/control=auto\n
+A: power/runtime_active_time=219589302\n
 A: power/runtime_active_kids=1\n
 A: power/runtime_active_time=78974886\n
 A: power/runtime_enabled=enabled\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
@@ -227,9 +215,9 @@ 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=0x000000628f2a0000 0x000000628f2affff 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: 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=0x01\n
+A: revision=0x11\n
-A: subsystem_device=0x0b00\n
+A: subsystem_device=0x2292\n
-A: subsystem_vendor=0x1028\n
+A: subsystem_vendor=0x17aa\n
 A: vendor=0x8086\n
--- a/tests/libfprint.supp
+++ b/tests/libfprint.supp
@@ -1,26 +0,0 @@
 {
   <ignore_dl_open_leaks>
   Memcheck:Leak
   fun:malloc
   ...
   fun:dlopen*
 }
 {
   <ignore-gusb-get-string-desc-uninitialized-memory>
   Memcheck:Param
   socketcall.sendto(msg)
   ...
   fun:send
   ...
   fun:g_usb_device_get_string_descriptor
   ...
 }
 {
   <ignore-g-thread-new-leak>
   Memcheck:Leak
   fun:calloc
   ...
   fun:g_thread_new
 }
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -4,34 +4,23 @@ envs.set('G_DEBUG', 'fatal-warnings')
 envs.set('G_MESSAGES_DEBUG', 'all')
 # Setup paths
-envs.set('MESON_SOURCE_ROOT', meson.project_source_root())
+envs.set('MESON_SOURCE_ROOT', meson.source_root())
-envs.set('MESON_BUILD_ROOT', meson.project_build_root())
+envs.set('MESON_BUILD_ROOT', meson.build_root())
-envs.set('G_TEST_SRCDIR', meson.current_source_dir())
+envs.prepend('LD_LIBRARY_PATH', join_paths(meson.build_root(), 'libfprint'))
 envs.set('G_TEST_BUILDDIR', meson.current_build_dir())
 envs.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libfprint')
 # Set FP_DEVICE_EMULATION so that drivers can adapt (e.g. to use fixed
 # random numbers rather than proper ones)
 envs.set('FP_DEVICE_EMULATION', '1')
 # Set a colon-separated list of native drivers we enable in tests
-envs.set('FP_DRIVERS_ALLOWLIST', ':'.join([
+envs.set('FP_DRIVERS_WHITELIST', ':'.join([
    'virtual_image',
    'virtual_device',
    'virtual_device_storage',
 ]))
 envs.set('FP_PRINTS_PATH', meson.project_source_root() / 'examples' / 'prints')
 envs.set('NO_AT_BRIDGE', '1')
 python3 = find_program('python3')
 installed_tests = get_option('installed-tests')
 installed_tests_execdir = libexecdir / 'installed-tests' / versioned_libname
 installed_tests_testdir = datadir / 'installed-tests' / versioned_libname
 installed_tests_libdir = libdir
 drivers_tests = [
    'aes2501',
    'aes3500',
@@ -41,7 +30,6 @@ drivers_tests = [
    'elanspi',
    'synaptics',
    'upektc_img',
    'upektc_img-tcs1s',
    'uru4000-msv2',
    'uru4000-4500',
    'vfs0050',
@@ -51,56 +39,34 @@ drivers_tests = [
    'goodixmoc',
    'nb1010',
    'egis0570',
    'egismoc',
    'egismoc-05a1',
    'fpcmoc',
    'realtek',
    'focaltech_moc',
 ]
 if get_option('introspection')
  conf = configuration_data()
-  conf.set('SRCDIR', meson.project_source_root())
+  conf.set('SRCDIR', meson.source_root())
-  conf.set('BUILDDIR', meson.project_build_root())
+  conf.set('BUILDDIR', meson.build_root())
  configure_file(configuration: conf,
      input: 'create-driver-test.py.in',
      output: 'create-driver-test.py')
 endif
 env_parser_cmd = '''
 import os;
 print(" ".join([f"{k}={v}" for k, v in os.environ.items()
    if k.startswith("FP_") or k.startswith("G_")]))
 '''
 envs_str = run_command(python3, '-c', env_parser_cmd,
    env: envs,
    check: installed_tests).stdout().strip()
 envs_str = ' '.join([
    envs_str,
    'G_TEST_SRCDIR=' + installed_tests_testdir,
    'G_TEST_BUILDDIR=' + installed_tests_execdir,
 ])
 if get_option('introspection')
-    envs.prepend('GI_TYPELIB_PATH', meson.project_build_root() / 'libfprint')
+    envs.prepend('GI_TYPELIB_PATH', join_paths(meson.build_root(), 'libfprint'))
    virtual_devices_tests = [
        'virtual-image',
        'virtual-device',
    ]
    unittest_inspector = find_program('unittest_inspector.py')
    umockdev_test_name = 'umockdev-test.py'
    umockdev_test = find_program(umockdev_test_name)
    foreach vdtest: virtual_devices_tests
        driver_name = '_'.join(vdtest.split('-'))
        if driver_name in drivers
            python3 = find_program('python3')
            base_args = files(vdtest + '.py')
            suite = ['virtual-driver']
-            r = run_command(unittest_inspector, files(vdtest + '.py'), check: true)
+            r = run_command(unittest_inspector, files(vdtest + '.py'))
            unit_tests = r.stdout().strip().split('\n')
            if r.returncode() == 0 and unit_tests.length() > 0
@@ -124,31 +90,6 @@ if get_option('introspection')
                    env: envs,
                )
            endforeach
            if installed_tests
                install_data(base_args,
                    install_dir: installed_tests_execdir,
                    install_mode: 'rwxr-xr-x',
                )
                configure_file(
                    input: 'test.in',
                    output: vdtest + '.test',
                    install_dir: installed_tests_testdir,
                    configuration: {
                        # FIXME: use fs.name() on meson 0.58
                        'exec': installed_tests_execdir / '@0@'.format(base_args[0]).split('/')[-1],
                        'env': ' '.join([
                            envs_str,
                            'LD_LIBRARY_PATH=' + installed_tests_libdir,
                            'FP_PRINTS_PATH=' + installed_tests_testdir / 'prints',
                            # FIXME: Adding this requires gnome-desktop-testing!12
                            # 'GI_TYPELIB_PATH=' + installed_tests_libdir / 'girepository-1.0',
                        ]),
                        'extra_content': '',
                    },
                )
            endif
        else
            test(vdtest,
                find_program('sh'),
@@ -157,52 +98,21 @@ if get_option('introspection')
        endif
    endforeach
    driver_tests_enabled = false
    foreach driver_test: drivers_tests
        driver_name = driver_test.split('-')[0]
        driver_envs = envs
-        driver_envs.set('FP_DRIVERS_ALLOWLIST', driver_name)
+        driver_envs.set('FP_DRIVERS_WHITELIST', driver_name)
        if (driver_name in supported_drivers and
            gusb_dep.version().version_compare('>= 0.3.0'))
            driver_tests_enabled = true
            test(driver_test,
-                python3,
+                find_program('umockdev-test.py'),
-                args: [
+                args: join_paths(meson.current_source_dir(), driver_test),
                    umockdev_test.full_path(),
                    meson.current_source_dir() / driver_test,
                ],
                env: driver_envs,
                suite: ['drivers'],
                timeout: 15,
                depends: libfprint_typelib,
            )
            if installed_tests
                driver_envs_str = run_command(python3, '-c', env_parser_cmd,
                    env: driver_envs,
                    check: true).stdout().strip()
                configure_file(
                    input: 'driver.test.in',
                    output: 'driver-' + driver_test + '.test',
                    install_dir: installed_tests_testdir,
                    configuration: {
                        'installed_tests_execdir': installed_tests_execdir,
                        'installed_tests_testdir': installed_tests_testdir,
                        'umockdev_test_name': umockdev_test_name,
                        'driver_test': driver_test,
                        'driver_env': ' '.join([
                            driver_envs_str,
                            'LD_LIBRARY_PATH=' + installed_tests_libdir,
                            # FIXME: Adding this requires gnome-desktop-testing!12
                            # 'GI_TYPELIB_PATH=' + installed_tests_libdir / 'girepository-1.0',
                        ]),
                    },
                )
                install_subdir(driver_test, install_dir: installed_tests_testdir)
            endif
        else
            test(driver_test,
                find_program('sh'),
@@ -210,17 +120,6 @@ if get_option('introspection')
            )
        endif
    endforeach
    if  installed_tests and driver_tests_enabled
        install_data(umockdev_test.full_path(),
            install_dir: installed_tests_execdir,
            install_mode: 'rwxr-xr-x',
        )
        install_data('capture.py',
            install_dir: installed_tests_execdir,
            install_mode: 'rwxr-xr-x',
        )
    endif
 else
    warning('Skipping all driver tests as introspection bindings are missing')
    test('virtual-image',
@@ -259,6 +158,10 @@ endif
 unit_tests_deps = { 'fpi-assembling' : [cairo_dep] }
 test_config = configuration_data()
 test_config.set_quoted('SOURCE_ROOT', meson.source_root())
 test_config_h = configure_file(output: 'test-config.h', configuration: test_config)
 foreach test_name: unit_tests
    if unit_tests_deps.has_key(test_name)
        missing_deps = false
@@ -286,31 +189,16 @@ foreach test_name: unit_tests
    basename = 'test-' + test_name
    test_exe = executable(basename,
-        sources: basename + '.c',
+        sources: [basename + '.c', test_config_h],
        dependencies: [ libfprint_private_dep ] + extra_deps,
        c_args: common_cflags,
-        link_whole: test_utils,
+        link_with: test_utils,
        install: installed_tests,
        install_dir: installed_tests_execdir,
    )
    test(test_name,
        test_exe,
        suite: ['unit-tests'],
        env: envs,
    )
    configure_file(
        input: 'test.in',
        output: test_name + '.test',
        install: installed_tests,
        install_dir: installed_tests_testdir,
        configuration: {
            'exec': installed_tests_execdir / basename,
            'env': envs_str,
            'extra_content': 'TestEnvironment=LD_LIBRARY_PATH=' +
                installed_tests_libdir,
        },
    )
 endforeach
 # Run udev rule generator with fatal warnings
@@ -318,13 +206,12 @@ envs.set('UDEV_HWDB', udev_hwdb.full_path())
 envs.set('UDEV_HWDB_CHECK_CONTENTS', default_drivers_are_enabled ? '1' : '0')
 test('udev-hwdb',
     find_program('test-generated-hwdb.sh'),
     depends: udev_hwdb,
     env: envs)
 gdb = find_program('gdb', required: false)
 if gdb.found()
    libfprint_wrapper = [
-        gdb.full_path(),
+        gdb.path(),
        '-batch',
        '-ex', 'run',
        '--args',
@@ -339,29 +226,19 @@ endif
 valgrind = find_program('valgrind', required: false)
 if valgrind.found()
-    glib_share = glib_dep.get_variable(pkgconfig: 'prefix') / 'share' / glib_dep.name()
+    glib_share = glib_dep.get_pkgconfig_variable('prefix') / 'share' / glib_dep.name()
    glib_suppressions = glib_share + '/valgrind/glib.supp'
-    libfprint_suppressions = '@0@/@1@'.format(meson.project_source_root(),
+    python_suppressions = '@0@/@1@'.format(meson.source_root(),
        files('libfprint.supp')[0])
    python_suppressions = '@0@/@1@'.format(meson.project_source_root(),
        files('valgrind-python.supp')[0])
    libfprint_wrapper = [
-        valgrind.full_path(),
+        valgrind.path(),
        '--tool=memcheck',
        '--leak-check=full',
        '--leak-resolution=high',
        '--error-exitcode=1',
        '--errors-for-leak-kinds=definite',
        '--track-origins=yes',
        '--show-leak-kinds=definite,possible',
        '--show-error-list=yes',
        '--gen-suppressions=all',
        '--suppressions=' + libfprint_suppressions,
        '--suppressions=' + glib_suppressions,
        '--suppressions=' + python_suppressions,
    ]
    add_test_setup('valgrind',
-        timeout_multiplier: 15,
+        timeout_multiplier: 10,
        exe_wrapper: libfprint_wrapper,
        env: [
            'G_SLICE=always-malloc',
--- a/tests/realtek/custom.pcapng
+++ b/tests/realtek/custom.pcapng
--- a/tests/realtek/custom.py
+++ b/tests/realtek/custom.py
@@ -1,110 +0,0 @@
 #!/usr/bin/python3
 import traceback
 import sys
 import gi
 gi.require_version('FPrint', '2.0')
 from gi.repository import FPrint, GLib
 # Exit with error on any exception, included those happening in async callbacks
 sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
 ctx = GLib.main_context_default()
 c = FPrint.Context()
 c.enumerate()
 devices = c.get_devices()
 d = devices[0]
 del devices
 assert d.get_driver() == "realtek"
 assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
 assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
 assert d.has_feature(FPrint.DeviceFeature.VERIFY)
 assert not d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
 d.open_sync()
 # 1. verify clear storage command, 2. make sure later asserts are good
 d.clear_storage_sync()
 template = FPrint.Print.new(d)
 def enroll_progress(*args):
    # assert d.get_finger_status() & FPrint.FingerStatusFlags.NEEDED
    print('enroll progress: ' + str(args))
 def identify_done(dev, res):
    global identified
    identified = True
    try:
        identify_match, identify_print = dev.identify_finish(res)
    except gi.repository.GLib.GError as e:
        print("Please try again")
    else:
        print('indentification_done: ', identify_match, identify_print)
        assert identify_match.equal(identify_print)
 def start_identify_async(prints):
    global identified
    print('async identifying')
    d.identify(prints, callback=identify_done)
    del prints
    while not identified:
        ctx.iteration(True)
    identified = False
 # List, enroll, list, verify, identify, delete
 print("enrolling")
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 p = d.enroll_sync(template, None, enroll_progress, None)
 assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 print("enroll done")
 print("listing")
 stored = d.list_prints_sync()
 print("listing done")
 assert len(stored) == 1
 assert stored[0].equal(p)
 print("verifying")
 try:
    assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
    verify_res, verify_print = d.verify_sync(p)
    assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
 except gi.repository.GLib.GError as e:
    print("Please try again")
 else:
    print("verify done")
    del p
    assert verify_res == True
 identified = False
 deserialized_prints = []
 for p in stored:
    deserialized_prints.append(FPrint.Print.deserialize(p.serialize()))
    assert deserialized_prints[-1].equal(p)
 del stored
 print('async identifying')
 d.identify(deserialized_prints, callback=identify_done)
 del deserialized_prints
 while not identified:
    ctx.iteration(True)
 print("deleting")
 d.delete_print_sync(p)
 print("delete done")
 d.close_sync()
 del d
 del c
--- a/tests/realtek/device
+++ b/tests/realtek/device
@@ -1,240 +0,0 @@
 P: /devices/pci0000:00/0000:00:14.0/usb1/1-4
 N: bus/usb/001/005=12010102EF020140DA0B135801210301020109022E00010104A0FA0904000004FF02000507050102000200070583031000080705840310000807058202000200
 E: DEVNAME=/dev/bus/usb/001/005
 E: DEVTYPE=usb_device
 E: DRIVER=usb
 E: PRODUCT=bda/5813/2101
 E: TYPE=239/2/1
 E: BUSNUM=001
 E: DEVNUM=005
 E: MAJOR=189
 E: MINOR=4
 E: SUBSYSTEM=usb
 E: ID_VENDOR=Generic
 E: ID_VENDOR_ENC=Generic
 E: ID_VENDOR_ID=0bda
 E: ID_MODEL=Realtek_USB2.0_Finger_Print_Bridge
 E: ID_MODEL_ENC=Realtek\x20USB2.0\x20Finger\x20Print\x20Bridge
 E: ID_MODEL_ID=5813
 E: ID_REVISION=2101
 E: ID_SERIAL=Generic_Realtek_USB2.0_Finger_Print_Bridge_201801010001
 E: ID_SERIAL_SHORT=201801010001
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:ff0200:
 E: ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Corp.
 E: ID_PATH=pci-0000:00:14.0-usb-0:4
 E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_4
 A: authorized=1\n
 A: avoid_reset_quirk=0\n
 A: bConfigurationValue=1\n
 A: bDeviceClass=ef\n
 A: bDeviceProtocol=01\n
 A: bDeviceSubClass=02\n
 A: bMaxPacketSize0=64\n
 A: bMaxPower=500mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
 A: bcdDevice=2101\n
 A: bmAttributes=a0\n
 A: busnum=1\n
 A: configuration=Realtek USB2.0 Finger Print Bridge\n
 H: descriptors=12010102EF020140DA0B135801210301020109022E00010104A0FA0904000004FF02000507050102000200070583031000080705840310000807058202000200
 A: dev=189:4\n
 A: devnum=5\n
 A: devpath=4\n
 L: driver=../../../../../bus/usb/drivers/usb
 L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4b/device:4c/device:50
 A: idProduct=5813\n
 A: idVendor=0bda\n
 A: ltm_capable=no\n
 A: manufacturer=Generic\n
 A: maxchild=0\n
 A: physical_location/dock=no\n
 A: physical_location/horizontal_position=left\n
 A: physical_location/lid=no\n
 A: physical_location/panel=top\n
 A: physical_location/vertical_position=upper\n
 L: port=../1-0:1.0/usb1-port4
 A: power/active_duration=91232868\n
 A: power/async=enabled\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
 A: power/connected_duration=91232868\n
 A: power/control=on\n
 A: power/level=on\n
 A: power/persist=1\n
 A: power/runtime_active_kids=0\n
 A: power/runtime_active_time=91232594\n
 A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
 A: power/runtime_usage=7\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=Realtek USB2.0 Finger Print Bridge\n
 A: quirks=0x0\n
 A: removable=removable\n
 A: rx_lanes=1\n
 A: serial=201801010001\n
 A: speed=480\n
 A: tx_lanes=1\n
 A: urbnum=15076313\n
 A: version= 2.01\n
 P: /devices/pci0000:00/0000:00:14.0/usb1
 N: bus/usb/001/001=12010002090001406B1D020002060302010109021900010100E0000904000001090000000705810304000C
 E: DEVNAME=/dev/bus/usb/001/001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
 E: PRODUCT=1d6b/2/602
 E: TYPE=9/0/1
 E: BUSNUM=001
 E: DEVNUM=001
 E: MAJOR=189
 E: MINOR=0
 E: SUBSYSTEM=usb
 E: ID_VENDOR=Linux_6.2.0-35-generic_xhci-hcd
 E: ID_VENDOR_ENC=Linux\x206.2.0-35-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=0602
 E: ID_SERIAL=Linux_6.2.0-35-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_SERIAL_SHORT=0000:00:14.0
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:090000:
 E: ID_VENDOR_FROM_DATABASE=Linux Foundation
 E: ID_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=0602\n
 A: bmAttributes=e0\n
 A: busnum=1\n
 A: configuration=
 H: descriptors=12010002090001406B1D020002060302010109021900010100E0000904000001090000000705810304000C
 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:4b/device:4c
 A: idProduct=0002\n
 A: idVendor=1d6b\n
 A: interface_authorized_default=1\n
 A: ltm_capable=no\n
 A: manufacturer=Linux 6.2.0-35-generic xhci-hcd\n
 A: maxchild=16\n
 A: power/active_duration=264747968\n
 A: power/async=enabled\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
 A: power/connected_duration=264747968\n
 A: power/control=auto\n
 A: power/level=auto\n
 A: power/runtime_active_kids=3\n
 A: power/runtime_active_time=264747968\n
 A: power/runtime_enabled=enabled\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
 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=3177\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=1028:085C
 E: PCI_SLOT_NAME=0000:00:14.0
 E: MODALIAS=pci:v00008086d0000A36Dsv00001028sd0000085Cbc0Csc03i30
 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=86806DA3060590021030030C00008000040030D200000000000000000000000000000000000000000000000028105C08000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F000000005919041B00000000316000000000000000000000000000000180C2C108000000000000000000000005908700D802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000030000000C00000000000000C000000000000000000100003000000000000000030000000C0000000000000000000000000000000000000000000000000000000000000000000000B50F120112000000
 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:4b
 A: index=4\n
 A: irq=125\n
 A: label=Onboard - Other\n
 A: local_cpulist=0-3\n
 A: local_cpus=f\n
 A: modalias=pci:v00008086d0000A36Dsv00001028sd0000085Cbc0Csc03i30\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    6    7 2112  7\nxHCI ring segments   24   24 4096 24\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128         12   32  128  1\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=264748677\n
 A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\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: power_state=D0\n
 A: resource=0x00000000d2300000 0x00000000d230ffff 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=0x085c\n
 A: subsystem_vendor=0x1028\n
 A: vendor=0x8086\n
--- a/tests/synaptics/custom.py
+++ b/tests/synaptics/custom.py
@@ -51,7 +51,7 @@ d.clear_storage_sync()
 template = FPrint.Print.new(d)
 def enroll_progress(*args):
-    assert d.get_finger_status() & FPrint.FingerStatusFlags.NEEDED
+    #assert d.get_finger_status() == FPrint.FingerStatusFlags.NEEDED
    print('enroll progress: ' + str(args))
 # List, enroll, list, verify, delete, list
--- a/tests/test-device-fake.c
+++ b/tests/test-device-fake.c
@@ -20,7 +20,6 @@
 #define FP_COMPONENT "fake_test_dev"
 #include "fpi-log.h"
 #include "test-device-fake.h"
 G_DEFINE_TYPE (FpiDeviceFake, fpi_device_fake, FP_TYPE_DEVICE)
@@ -30,28 +29,12 @@ static const FpIdEntry driver_ids[] = {
  { .virtual_envvar = NULL }
 };
 static void
  (debug_action) (FpDevice * device,
                  const gchar *func)
 {
  g_autofree char *action_str = NULL;
  action_str = g_enum_to_string (FPI_TYPE_DEVICE_ACTION,
                                 fpi_device_get_current_action (device));
  fp_dbg ("%s: Device %s in action %s\n",
          func, fp_device_get_name (device), action_str);
 }
 #define debug_action(d) (debug_action) ((d), G_STRFUNC)
 static void
 fpi_device_fake_probe (FpDevice *device)
 {
  FpDeviceClass *dev_class = FP_DEVICE_GET_CLASS (device);
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_probe;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_PROBE);
@@ -72,7 +55,6 @@ fpi_device_fake_open (FpDevice *device)
 {
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_open;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_OPEN);
@@ -90,7 +72,6 @@ fpi_device_fake_close (FpDevice *device)
 {
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_close;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CLOSE);
@@ -109,7 +90,6 @@ fpi_device_fake_enroll (FpDevice *device)
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  FpPrint *print = fake_dev->ret_print;
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_enroll;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_ENROLL);
@@ -138,7 +118,6 @@ fpi_device_fake_verify (FpDevice *device)
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  FpPrint *print = fake_dev->ret_print;
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_verify;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_VERIFY);
@@ -170,7 +149,6 @@ fpi_device_fake_identify (FpDevice *device)
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  FpPrint *match = fake_dev->ret_match;
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_identify;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_IDENTIFY);
@@ -209,7 +187,6 @@ fpi_device_fake_identify (FpDevice *device)
  else
    {
      fpi_device_identify_complete (device, fake_dev->ret_error);
      g_clear_object (&fake_dev->ret_print);
    }
 }
@@ -219,7 +196,6 @@ fpi_device_fake_capture (FpDevice *device)
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  gboolean wait_for_finger;
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_capture;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CAPTURE);
@@ -239,7 +215,6 @@ fpi_device_fake_list (FpDevice *device)
 {
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_list;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_LIST);
@@ -257,7 +232,6 @@ fpi_device_fake_delete (FpDevice *device)
 {
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_delete;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_DELETE);
@@ -276,7 +250,6 @@ fpi_device_fake_clear_storage (FpDevice *device)
 {
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_clear_storage;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CLEAR_STORAGE);
@@ -294,7 +267,6 @@ fpi_device_fake_cancel (FpDevice *device)
 {
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_cancel;
  g_assert_cmpuint (fpi_device_get_current_action (device), !=, FPI_DEVICE_ACTION_NONE);
 }
@@ -304,7 +276,6 @@ fpi_device_fake_suspend (FpDevice *device)
 {
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_suspend;
  fpi_device_suspend_complete (device, g_steal_pointer (&fake_dev->ret_suspend));
@@ -315,7 +286,6 @@ fpi_device_fake_resume (FpDevice *device)
 {
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
  debug_action (device);
  fake_dev->last_called_function = fpi_device_fake_resume;
  fpi_device_resume_complete (device, g_steal_pointer (&fake_dev->ret_resume));
--- a/tests/test-fp-device.c
+++ b/tests/test-fp-device.c
@@ -232,36 +232,6 @@ test_device_has_storage (void)
  G_GNUC_END_IGNORE_DEPRECATIONS
 }
 static void
 test_device_identify_cancelled (void)
 {
  g_autoptr(GCancellable) cancellable = NULL;
  g_autoptr(GPtrArray) prints = NULL;
  g_autoptr(GError) error = NULL;
  g_autoptr(FptContext) tctx = fpt_context_new_with_virtual_device (FPT_VIRTUAL_DEVICE_IMAGE);
  fp_device_open_sync (tctx->device, NULL, NULL);
  prints = g_ptr_array_new ();
  cancellable = g_cancellable_new ();
  g_cancellable_cancel (cancellable);
  g_assert_false (fp_device_identify_sync (tctx->device, prints, cancellable,
                                           NULL, NULL, NULL, NULL, &error));
  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
 }
 static void
 test_device_identify_null_prints (void)
 {
  g_autoptr(GError) error = NULL;
  g_autoptr(FptContext) tctx = fpt_context_new_with_virtual_device (FPT_VIRTUAL_DEVICE_IMAGE);
  fp_device_open_sync (tctx->device, NULL, NULL);
  g_assert_false (fp_device_identify_sync (tctx->device, NULL, NULL, NULL,
                                           NULL, NULL, NULL, &error));
  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_DATA_INVALID);
 }
 int
 main (int argc, char *argv[])
 {
@@ -282,8 +252,6 @@ main (int argc, char *argv[])
  g_test_add_func ("/device/sync/supports_identify", test_device_supports_identify);
  g_test_add_func ("/device/sync/supports_capture", test_device_supports_capture);
  g_test_add_func ("/device/sync/has_storage", test_device_has_storage);
  g_test_add_func ("/device/sync/identify/cancelled", test_device_identify_cancelled);
  g_test_add_func ("/device/sync/identify/null-prints", test_device_identify_null_prints);
  return g_test_run ();
 }
--- a/tests/test-fpi-assembling.c
+++ b/tests/test-fpi-assembling.c
@@ -22,6 +22,7 @@
 #include <cairo.h>
 #include "fpi-assembling.h"
 #include "fpi-image.h"
 #include "test-config.h"
 typedef struct
 {
@@ -66,7 +67,8 @@ test_frame_assembling (void)
  g_autoptr(FpImage) fp_img = NULL;
  GSList *frames = NULL;
-  path = g_test_build_filename (G_TEST_DIST, "vfs5011", "capture.png", NULL);
+  g_assert_false (SOURCE_ROOT == NULL);
  path = g_build_path (G_DIR_SEPARATOR_S, SOURCE_ROOT, "tests", "vfs5011", "capture.png", NULL);
  img = cairo_image_surface_create_from_png (path);
  data = cairo_image_surface_get_data (img);
--- a/tests/test-fpi-device.c
+++ b/tests/test-fpi-device.c
@@ -30,10 +30,8 @@
 #include "fp-print-private.h"
 /* gcc 12.0.1 is complaining about dangling pointers in the auto_close* functions */
 #if G_GNUC_CHECK_VERSION (12, 0)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-pointer"
 #endif
 /* Utility functions */
@@ -71,9 +69,7 @@ auto_close_fake_device_free (FpAutoCloseDevice *device)
 }
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FpAutoCloseDevice, auto_close_fake_device_free)
 #if G_GNUC_CHECK_VERSION (12, 0)
 #pragma GCC diagnostic pop
 #endif
 typedef FpDeviceClass FpAutoResetClass;
 static FpAutoResetClass default_fake_dev_class = {0};
@@ -1116,7 +1112,6 @@ test_driver_enroll_update_nbis_wrong_device (void)
  fake_dev = FPI_DEVICE_FAKE (device);
  template_print = make_fake_nbis_print (device);
  g_clear_pointer (&template_print->device_id, g_free);
  template_print->device_id = g_strdup ("wrong_device");
  fake_dev->ret_print = template_print;
@@ -1143,7 +1138,6 @@ test_driver_enroll_update_nbis_wrong_driver (void)
  fake_dev = FPI_DEVICE_FAKE (device);
  template_print = make_fake_nbis_print (device);
  g_clear_pointer (&template_print->driver, g_free);
  template_print->driver = g_strdup ("wrong_driver");
  fake_dev->ret_print = template_print;
@@ -2392,11 +2386,6 @@ test_driver_identify_warmup_cooldown (void)
  g_assert_true (identify_data->called);
  g_assert_error (identify_data->error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_TOO_HOT);
  /* Try to identify again, and ensure that we fail early */
  fp_device_identify_sync (device, prints, NULL, NULL, NULL, NULL, NULL, &error);
  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_TOO_HOT);
  g_clear_error (&error);
  /* Now, wait for it to cool down again;
   * WARM should be reached after about 2s
   * COLD after 5s but give it some more slack. */
--- a/tests/test-generated-hwdb.sh
+++ b/tests/test-generated-hwdb.sh
@@ -1,21 +1,15 @@
-#!/bin/sh -e
+#!/usr/bin/env bash
 set -e
-if [ ! -x "$UDEV_HWDB" ]; then
+[ -x "$UDEV_HWDB" ] || exit 1
    echo "E: UDEV_HWDB (${UDEV_HWDB}) unset or not executable."
    exit 1
 fi
-if [ "$UDEV_HWDB_CHECK_CONTENTS" = 1 ]; then
+if [ "$UDEV_HWDB_CHECK_CONTENTS" == 1 ]; then
-    generated_rules=$(mktemp "${TMPDIR:-/tmp}/libfprint.hwdb.XXXXXX")
+    generated_rules=$(mktemp "${TMPDIR:-/tmp}/libfprint-XXXXXX.hwdb")
 else
    generated_rules=/dev/null
 fi
 $UDEV_HWDB > "$generated_rules"
 if [ $? != 0 ]; then
    echo "E: UDEV_HWDB (${UDEV_HWDB}) failed to run without error."
    exit 1
 fi
 if [ "$UDEV_HWDB_CHECK_CONTENTS" != 1 ]; then
    exit 77
@@ -23,7 +17,7 @@ fi
 if ! diff -u "$MESON_SOURCE_ROOT/data/autosuspend.hwdb" "$generated_rules"; then
    echo "E: Autosuspend file needs to be re-generated!"
-    echo "   ninja -C $MESON_BUILD_ROOT sync-udev-hwdb"
+    echo "   ninja -C $MESON_BUILD_ROOT libfprint/sync-udev-hwdb"
    exit 1
 fi
--- a/tests/test.in
+++ b/tests/test.in
@@ -1,6 +0,0 @@
 [Test]
 Type=session
 # We can't use TestEnvironment as per
 #  https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1
 Exec=env @env@ @exec@
@extra_content@
--- a/tests/umockdev-test.py
+++ b/tests/umockdev-test.py
@@ -14,7 +14,7 @@ if len(sys.argv) != 2:
 # Check that umockdev is available
 try:
    umockdev_version = subprocess.check_output(['umockdev-run', '--version'])
-    version = tuple(int(_) for _ in umockdev_version.split(b'.')[:3])
+    version = tuple(int(_) for _ in umockdev_version.split(b'.'))
    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.')
--- a/tests/upektc_img-tcs1s/capture.pcapng
+++ b/tests/upektc_img-tcs1s/capture.pcapng
--- a/tests/upektc_img-tcs1s/capture.png
+++ b/tests/upektc_img-tcs1s/capture.png
--- a/tests/upektc_img-tcs1s/device
+++ b/tests/upektc_img-tcs1s/device
--- a/Show More
+++ b/Show More