Upload to noble

libfprint (1:1.94.7+tod1-0ubuntu5~24.04.5) noble; urgency=medium
.
  * d/p: synaptics: add new PID 0x019F, 0x0109 and 0x010A. (LP: #2133704)

.ci/check-abi

@@ -68,8 +68,8 @@ def build_install(revision):
         subprocess.check_call(['meson', build_dir,
                                '--prefix=/usr', '--libdir=lib',
                                '-Dx11-examples=false', '-Ddoc=false', '-Dgtk-examples=false'])
-        subprocess.check_call(['meson', 'compile', '-v', '-C', build_dir])
-        subprocess.check_call(['meson', 'install', '-v', '-C', build_dir],
+        subprocess.check_call(['ninja', '-v', '-C', build_dir])
+        subprocess.check_call(['ninja', '-v', '-C', build_dir, 'install'],
                               env={'DESTDIR': dest_dir})
 
     return dest_dir

.gitlab-ci.yml

@@ -4,10 +4,9 @@ include:
   - project: 'freedesktop/ci-templates'
     ref: master
     file: '/templates/fedora.yml'
-  - remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/71e636e012ae0ab04c5e0fe40ca73ada91ae6bde/flatpak/flatpak_ci_initiative.yml'
+  - remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/master/flatpak/flatpak_ci_initiative.yml'
 
 default:
-  interruptible: true
   # Auto-retry jobs in case of infra failures
   retry:
     max: 1
@@ -22,16 +21,13 @@ variables:
   FDO_DISTRIBUTION_TAG: $LIBFPRINT_IMAGE_TAG
   FDO_DISTRIBUTION_VERSION: rawhide
   FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
-  FEDORA_IMAGE: "registry.freedesktop.org/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
-  FEDORA_IMAGE_S390X: "registry.freedesktop.org/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION-s390x:$LIBFPRINT_IMAGE_TAG"
+  FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
   LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
 
 workflow:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'push'
-    - if: $CI_PIPELINE_SOURCE == 'schedule'
-    - if: $CI_PROJECT_NAMESPACE == 'libfprint' && $LIBFPRINT_CI_ACTION != ''
 
 stages:
   - image-build
@@ -39,13 +35,12 @@ stages:
   - build
   - test
   - flatpak
-  - deploy
 
 image: $FEDORA_IMAGE
 
 .build_one_driver_template: &build_one_driver
   script:
-    # Build with a driver that doesn't need imaging, or openssl
+    # Build with a driver that doesn't need imaging, or nss
     - meson setup _build --werror -Ddrivers=$driver
     - meson compile -C _build
     - rm -rf _build/
@@ -61,16 +56,11 @@ image: $FEDORA_IMAGE
   script:
     - ./.ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
 
-.standard_job:
-  rules:
-    - when: on_success
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: never
-
 build:
   stage: build
-  extends:
-    - .standard_job
+  except:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule"
   variables:
     driver: virtual_image
   <<: *build_one_driver
@@ -85,12 +75,12 @@ build:
 
 test:
   stage: test
-  extends:
-    - .standard_job
+  except:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule"
   script:
     - meson setup _build --werror -Ddrivers=all -Db_coverage=true
     - meson test -C _build --print-errorlogs --no-stdsplit --timeout-multiplier 3
-    # We can't use `meson compile` https://github.com/mesonbuild/meson/issues/7895
     - ninja -C _build coverage
     - cat _build/meson-logs/coverage.txt || true
   artifacts:
@@ -109,8 +99,10 @@ test:
 
 test_valgrind:
   stage: test
-  extends:
-    - .standard_job
+  allow_failure: true
+  except:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule"
   script:
     - meson setup _build -Ddrivers=all
     - meson compile -C _build
@@ -125,27 +117,11 @@ test_valgrind:
       - _build/meson-logs/testlog-valgrind.txt
     expire_in: 1 week
 
-test_asan:
-  stage: test
-  extends:
-    - .standard_job
-  script:
-    - meson setup _build -Ddrivers=all -Db_sanitize=address,undefined
-    - meson test -C _build --print-errorlogs --no-stdsplit
-  artifacts:
-    reports:
-      junit: "_build/meson-logs/testlog.junit.xml"
-    expose_as: 'Sanitizers test logs'
-    when: always
-    paths:
-      - _build/meson-logs
-      - _build/meson-logs/testlog.txt
-    expire_in: 1 week
-
 test_installed:
   stage: test
-  extends:
-    - .standard_job
+  except:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule"
   script:
     - meson setup _build --prefix=/usr -Ddrivers=all
     - meson install -C _build
@@ -167,8 +143,9 @@ test_installed:
 
 test_scan_build:
   stage: test
-  extends:
-    - .standard_job
+  except:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule"
   allow_failure: true
   script:
     - meson setup _build -Ddrivers=all
@@ -183,29 +160,22 @@ test_scan_build:
 
 test_indent:
   stage: check-source
-  extends:
-    - .standard_job
+  except:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule"
   script:
     - scripts/uncrustify.sh
     - git diff
     - git diff-index --name-only --exit-code HEAD
-  rules:
-    - changes:
-        compare_to: 'refs/heads/master'
-        paths:
-          - '**/*.c'
-          - '**/*.h'
 
 test_unsupported_list:
   stage: check-source
-  extends:
-    - .standard_job
+  except:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule"
   allow_failure: true
-  variables:
-    FPRINT_HWDB_LIST: libfprint/fprint-list-udev-hwdb.c
   script:
-    - scripts/sync-unsupported-devices.py $FPRINT_HWDB_LIST
-    - git diff --color=always --exit-code $FPRINT_HWDB_LIST
+    - tests/hwdb-check-unsupported.py
 
 flatpak:
   stage: flatpak
@@ -222,7 +192,7 @@ flatpak:
     - if: '$CI_PROJECT_PATH != "libfprint/libfprint"'
       when: manual
       allow_failure: true
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - if: '$CI_COMMIT_BRANCH == "master"'
       allow_failure: true
@@ -243,6 +213,9 @@ flatpak:
 .container_fedora_build_base:
   extends: .fdo.container-build@fedora
   stage: image-build
+  only:
+    variables:
+      - $CI_PIPELINE_SOURCE == "never"
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
     # a list of packages to install
@@ -253,8 +226,6 @@ flatpak:
       libudev-devel
     FDO_DISTRIBUTION_EXEC: |
       $LIBFPRINT_EXEC
-  rules:
-    - when: never
 
 .container_fedora_build_forced:
   variables:
@@ -264,132 +235,25 @@ container_fedora_build_schedule:
   extends:
     - .container_fedora_build_base
     - .container_fedora_build_forced
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
-      when: always
+  only:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
 
 container_fedora_build_manual:
   extends:
     - .container_fedora_build_base
     - .container_fedora_build_forced
-  rules:
-    - if: $LIBFPRINT_CI_ACTION == "build-image"
-      when: always
-
-.container_fedora_build_on_deps_changed_rules:
-  rules:
-    - if: $CI_PROJECT_NAMESPACE == "libfprint" && $CI_PIPELINE_SOURCE != "schedule"
-      changes:
-        compare_to: 'refs/heads/master'
-        paths:
-          - '.gitlab-ci/libfprint-image-variables.yaml'
-          - '.gitlab-ci/libfprint-templates.yaml'
+  only:
+    variables:
+      - $LIBFPRINT_CI_ACTION == "build-image"
 
 container_fedora_build_on_deps_changed:
-  extends:
-    - .container_fedora_build_base
-    - .container_fedora_build_on_deps_changed_rules
-
-.container_fedora_image_build_base_s390x:
-  stage: image-build
-  image: quay.io/freedesktop.org/ci-templates:container-build-base-2026-05-19.0
-  variables:
-    GIT_STRATEGY: none
-    S390X_TAG: $LIBFPRINT_IMAGE_TAG-s390x
-    STORAGE_DRIVER: vfs
-  script:
-    - |
-      if [ -z "${FDO_FORCE_REBUILD:-}" ]; then
-        if skopeo inspect --no-tags --retry-times 3 "docker://$FEDORA_IMAGE_S390X" 2>/dev/null; then
-          echo "Image $FEDORA_IMAGE_S390X already exists, skipping build."
-          exit 0
-        fi
-      fi
-
-    - buildah from --name s390x-container --platform linux/s390x
-        registry.fedoraproject.org/fedora:$FDO_DISTRIBUTION_VERSION
-    - ROOTFS=$(buildah mount s390x-container)
-    - dnf install -y --installroot=$ROOTFS --forcearch=s390x
-        --use-host-config
-        --setopt=tsflags=noscripts --releasever=$FDO_DISTRIBUTION_VERSION
-        --setopt=install_weak_deps=False
-        $LIBFPRINT_DEPENDENCIES
-
-    - dnf clean all --installroot=$ROOTFS || true
-    - buildah commit s390x-container "$FEDORA_IMAGE_S390X"
-    - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - buildah push "$FEDORA_IMAGE_S390X"
-
-container_fedora_build_schedule_s390x:
-  extends:
-    - .container_fedora_image_build_base_s390x
-    - .container_fedora_build_forced
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
-      when: always
-
-container_fedora_build_manual_s390x:
-  extends:
-    - .container_fedora_image_build_base_s390x
-    - .container_fedora_build_forced
-  rules:
-    - if: $LIBFPRINT_CI_ACTION == "build-image"
-      when: always
-
-container_fedora_build_on_deps_changed_s390x:
-  extends:
-    - .container_fedora_image_build_base_s390x
-    - .container_fedora_build_on_deps_changed_rules
-
-test_s390x:
-  stage: test
-  allow_failure: true
-  needs:
-    - job: container_fedora_build_manual_s390x
-      optional: true
-  variables:
-    STORAGE_DRIVER: vfs
-    QEMU_CPU: max
-  before_script:
-    # The s390x binaries are executed via the qemu-s390x-static registered in
-    # the *host* kernel's binfmt_misc. Use $FEDORA_IMAGE qemu-user-static
-    # (and systemd-binfmt), and run it privileged to re-register its handlers
-    # and make every run use the same emulator.
-    - podman run --rm --privileged
-        --security-opt label=filetype:container_file_t
-        --security-opt label=level:s0
-        --security-opt label=type:spc_t
-        -v $CI_PROJECT_DIR/.gitlab-ci/qemu-user-static/container-entrypoint:/container-entrypoint:z
-        $FEDORA_IMAGE /container-entrypoint
-  script:
-    - podman run --rm --platform linux/s390x -e QEMU_CPU -v $CI_PROJECT_DIR:/build:z -w /build "$FEDORA_IMAGE_S390X" /bin/bash -c \
-      "meson setup _build --werror -Ddrivers=all && meson test -C _build --print-errorlogs --no-stdsplit --timeout-multiplier 4 --suite=drivers --suite=virtual-driver"
-  artifacts:
-    when: always
-    paths:
-      - _build/meson-logs/
-    reports:
-      junit: "_build/meson-logs/testlog.junit.xml"
-  rules:
-    - if: $LIBFPRINT_CI_ACTION == "test-s390x"
-      when: always
-    - when: manual
-
-pages:
-  image: alpine:latest
-  stage: deploy
-  needs:
-    - job: test
-      artifacts: true
-    - job: build
-      artifacts: true
-  script:
-    - mkdir public
-    - mv _build/meson-logs/coveragereport public/coverage || true
-    - mv _build/doc/html public/doc
-  artifacts:
-    paths:
-      - public
-  rules:
-    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"
-    - if: $CI_COMMIT_TAG
+  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

.gitlab-ci/libfprint-image-variables.yaml

@@ -1,2 +1,2 @@
 variables:
-  LIBFPRINT_IMAGE_TAG: v8
+  LIBFPRINT_IMAGE_TAG: v3

.gitlab-ci/libfprint-templates.yaml

@@ -3,7 +3,6 @@
 
 .libfprint_common_variables:
   LIBFPRINT_DEPENDENCIES:
-    appstream
     doxygen
     dnf-plugins-core
     flatpak-builder
@@ -18,17 +17,13 @@
     gtk-doc
     gtk3-devel
     libabigail
-    libasan
     libgusb-devel
     libgudev-devel
-    libubsan
     libX11-devel
     libXv-devel
     meson
-    openssl-devel
+    nss-devel
     pixman-devel
-    podman
-    qemu-user-static
     python3-cairo
     python3-gobject
     systemd
@@ -45,7 +40,10 @@
       glibc \
       libgusb \
       libusb \
-      openssl \
-      pixman \
-      python3-gobject \
-      python3-gobject-base
+      nss \
+      pixman
+
+    git clone https://github.com/martinpitt/umockdev.git && \
+        cd umockdev && \
+        meson _build --prefix=/usr && \
+        ninja -C _build && ninja -C _build install

.gitlab-ci/qemu-user-static/container-entrypoint

@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Unregister any stale qemu-*-static binfmt handlers and (re-)register the ones
-# shipped by this image via systemd-binfmt, so the host always uses the recent
-# qemu-user-static built into this image (registered with the "F" fix-binary
-# flag from /usr/lib/binfmt.d).
-#
-# Based on https://www.itix.fr/blog/qemu-user-static-with-podman/
-
-set -Eeuo pipefail
-
-if [ ! -d /proc/sys/fs/binfmt_misc ]; then
-    echo "No binfmt support in the kernel."
-    echo "  Try: '/sbin/modprobe binfmt_misc' from the host"
-    exit 1
-fi
-
-if [ ! -f /proc/sys/fs/binfmt_misc/register ]; then
-    echo "Mounting /proc/sys/fs/binfmt_misc..."
-    mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
-fi
-
-echo "Cleaning up..."
-find /proc/sys/fs/binfmt_misc -type f -name 'qemu-*' -exec sh -c 'echo -1 > {}' \;
-
-echo "Registering..."
-exec /usr/lib/systemd/systemd-binfmt

.gitlab-ci/scan-build

@@ -1,7 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 # This wrapper just disables the malloc checker
-exec /usr/bin/scan-build --status-bugs -disable-checker unix.Malloc \
-    --exclude "$PWD/_build/meson-private" \
-    --exclude "$PWD/meson-private" \
-    "$@"
+exec /usr/bin/scan-build --status-bugs -disable-checker unix.Malloc "$@"

NEWS

@@ -1,75 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.
 
-2026-07-25: v1.94.100 release
-
-Highlights:
-  * bump meson dependency to 0.62
-  * egis_etu905: New driver supporting PIDs 0x05AE and 0x9201
-  * synaptics: New PIDs 0x010D, 0x010E and 0x01A4
-  * goodixmoc: Support 27c6:6382, 27c6:6984 and 27c6:6090
-  * nb1010: Support the NB-2020-U fingerprint reader
-  * focaltech_moc: New PID 0xA97A
-  * elanmoc: New PID 0x0CB2
-  * fpcmoc: New PID 0x9B24
-  * aes2550: Handle tapping without swiping and fix deactivation after errors
-  * fp-device: Implement verify using identification, improving driver
-    consistency and reducing duplicated driver code
-  * fpcmoc, egis_etu905, elan, elanspi, goodixmoc and mafpmoc: Improve
-    big-endian support
-  * goodixmoc: Fix malformed payload, CRC and invalid finger handling
-  * synaptics, realtek, vfs101, vfs301, upekts, elan and egismoc: Fix
-    memory safety, bounds checking and error handling issues
-  * aes1610, aes2510, aesx660, fpcmoc and uru4000: Fix resource leaks and
-    cancellation or device deactivation issues
-  * Expanded USB replay coverage for aes2550 and egis_etu905, and improved
-    virtual-image testing with transformed fingerprint images
-
-2026-02-10: v1.94.10 release
-
-Highlights:
-  * synaptics: Add USB reset in probe to recover stall condition
-  * synaptics: New PIDs 0x0169, 0x019F, 0x00E9, 0x01A0, 0x0109, 0x010A
-  * goodixmoc: New PID 0x66A9
-  * goodixmoc: Fix crash in exit callback handler
-  * fpcmoc: New PID 0xA306
-  * fpcmoc: Fix interrupt cancellable leak
-  * elanmoc: New PIDs 0x0CA7, 0x0CA8, 0x0CB0
-  * egismoc: New PIDs 0x0584, 0x0588
-  * focaltech_moc: New PIDs 0xA27A, 0x1579
-  * realtek: New PID 0xFA03
-  * fp-device: Clarify getter for open property
-  * libfprint: Use fatal-warnings on g-i-scanner
-
-2025-02-20: v1.94.9 release
-
-Highlights:
-  * uru4000: Use OpenSSL to perform AES-ECB encryption, as per this libfprint
-    does not support on NSS, but on openssl (>= 3.0).
-  * goodixmoc: New PIDs 0x60C2, 0x689A
-  * synaptics: New PIDs 0x016C, 0x0174, 0x0107, 0x0108, 0x00C2, 0x00F0
-  * fpcmoc: New PID 0xC844
-  * focaltech_moc: New PIDs 0xA99A, 0xA57A, 0xA78A
-  * elanmoc: New PIDs 0x0C98, 0x0C9D, 0x0CA3
-  * elanspi: New PIDs 0x3128, 0x2766
-  * fp-device: Add FP_DEVICE_RETRY_TOO_FAST retry error
-  * data: AppStream meta info listing supported USB devices.
-  * fixed various memory issues in multiple devices
-
-2024-09-03: v1.94.8 release
-
-Highlights:
- * build: Support building in non-linux unix environments (tested in FreeBSD)
- * egismoc: New PIDs 0x0583, 0x0586, 0x0587.
- * elanmoc: New PID 0x0C9F.
- * fpcmoc: New PIDs 0x9524, 0x9544.
- * goodixmoc: New PIDs 0x609A, 0x650A, 0x650C, 0x6512.
- * realtek: New PID 0x5816.
- * synaptics: New PIDs 0x00C4, 0x019D, 0x00C6.
- * fpcmoc: fix incorrect immobile handling during enrollment.
- * fpcmoc: fixed jumping to wrong state at end of custom enroll.
- * egismoc: various code cleanups.
-
 2024-02-20: v1.94.7 release
 
 Highlights:

NEWS.tod.md

@@ -0,0 +1,25 @@
+### libfprint-TOD v1
+
+- First public release
+- Based on [libfprint 1.90.1](https://gitlab.freedesktop.org/libfprint/libfprint/-/releases#v1.90.1)
+- Bumped TOD version to 1
+
+### Highlights of the Drivers API changes
+
+Both the driver and external APIs have changed, as both the verify and the identify functions now have early reporting mechanisms.
+
+- Added API for early report of matching results or retry errors
+- Verify and identification completion functions have been simplified
+- Support variadic arguments in error functions
+- Various re-definitions of ownership handling
+- Add convenience API to change state after a timeout
+- Add unit tests for all the drivers API
+
+### Drivers required changes
+As per the early report mechanism, drivers need to adapt, in particular:
+ - New pkg-config dependency name is `libfprint-2-tod-1`
+ - Verification and Identification API for non-image drivers has changed and drivers need to both `report` the result of the action and complete it:
+   - `fpi_device_{verify,identify}_report` must inform whether a match/no-match or identification happened or report a *retry error*.
+   - `fpi_device_{verify,identify}_complete` must be called once the device has completed the verification / identification process,  in case reporting device errors (not retry ones!)
+
+You can see examples of changes needed in the [reference example driver](https://gitlab.freedesktop.org/3v1n0/libfprint-tod-example-driver/-/commit/8308f84f7d1cfd1b9ed0936c13c73b43a4a46772) or the [upstream synaptics driver](https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/112/diffs)

README.md

@@ -19,6 +19,10 @@
 
 </div>
 
+## TOD Informations
+
+See https://gitlab.freedesktop.org/3v1n0/libfprint/-/blob/tod/README.tod.md
+
 ## History
 
 **LibFPrint** was originally developed as part of an
@@ -46,12 +50,6 @@ We include **Bozorth3** from the **[US Export Controlled]**
 distribution, which we have determined to be fine
 being shipped in an open source project.
 
-## Get in *touch*
-
- - [IRC] - `#fprint` @ `irc.oftc.net`
- - [Matrix] - `#fprint:matrix.org` bridged to the IRC channel
- - [MailingList] - low traffic, not much used these days
-
 <br/>
 
 <div align="right">
@@ -68,9 +66,6 @@ being shipped in an open source project.
 [Unsupported]: https://gitlab.freedesktop.org/libfprint/wiki/-/wikis/Unsupported-Devices
 [Supported]: https://fprint.freedesktop.org/supported-devices.html
 [Website]: https://fprint.freedesktop.org/
-[MailingList]: https://lists.freedesktop.org/mailman/listinfo/fprint
-[IRC]: ircs://irc.oftc.net:6697/#fprint
-[Matrix]: https://matrix.to/#/#fprint:matrix.org
 
 [Contribute]: ./HACKING.md
 [License]: ./COPYING

README.tod.md

@@ -0,0 +1,9 @@
+### libfprint-TOD - libfprint for Touch OEM Drivers
+
+This is a light fork of libfprint to expose internal Drivers API in order to
+create drivers as shared libraries.
+
+Fork is hosted at: https://gitlab.freedesktop.org/3v1n0/libfprint/tree/tod
+
+An example driver implementation is available:
+ - https://gitlab.freedesktop.org/3v1n0/libfprint-tod-example-driver

data/autosuspend.hwdb

@@ -77,19 +77,8 @@ usb:v1C7Ap0571*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
-# Supported by libfprint driver egis_etu905
-usb:v1C7Ap05AE*
-usb:v1C7Ap9201*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
 # Supported by libfprint driver egismoc
 usb:v1C7Ap0582*
-usb:v1C7Ap0583*
-usb:v1C7Ap0584*
-usb:v1C7Ap0586*
-usb:v1C7Ap0587*
-usb:v1C7Ap0588*
 usb:v1C7Ap05A1*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
@@ -166,16 +155,7 @@ usb:v04F3p0C82*
 usb:v04F3p0C88*
 usb:v04F3p0C8C*
 usb:v04F3p0C8D*
-usb:v04F3p0C98*
 usb:v04F3p0C99*
-usb:v04F3p0C9C*
-usb:v04F3p0C9D*
-usb:v04F3p0C9F*
-usb:v04F3p0CA3*
-usb:v04F3p0CA7*
-usb:v04F3p0CA8*
-usb:v04F3p0CB0*
-usb:v04F3p0CB2*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -187,59 +167,38 @@ usb:v1C7Ap0603*
 # Supported by libfprint driver focaltech_moc
 usb:v2808p9E48*
 usb:v2808pD979*
-usb:v2808pA27A*
 usb:v2808pA959*
-usb:v2808pA99A*
-usb:v2808pA57A*
-usb:v2808pA78A*
-usb:v2808pA97A*
-usb:v2808p1579*
-usb:v2808p077A*
-usb:v2808p079A*
-usb:v2808p5158*
-usb:v2808p6553*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
 # Supported by libfprint driver fpcmoc
 usb:v10A5pFFE0*
 usb:v10A5pA305*
-usb:v10A5pA306*
 usb:v10A5pDA04*
 usb:v10A5pD805*
 usb:v10A5pD205*
-usb:v10A5p9524*
-usb:v10A5p9544*
-usb:v10A5pC844*
-usb:v10A5p9B24*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
 # Supported by libfprint driver goodixmoc
 usb:v27C6p5840*
 usb:v27C6p6014*
-usb:v27C6p6090*
 usb:v27C6p6092*
 usb:v27C6p6094*
-usb:v27C6p609A*
 usb:v27C6p609C*
 usb:v27C6p60A2*
 usb:v27C6p60A4*
 usb:v27C6p60BC*
-usb:v27C6p60C2*
 usb:v27C6p6304*
 usb:v27C6p631C*
 usb:v27C6p633C*
 usb:v27C6p634C*
-usb:v27C6p6382*
 usb:v27C6p6384*
 usb:v27C6p639C*
 usb:v27C6p63AC*
 usb:v27C6p63BC*
 usb:v27C6p63CC*
 usb:v27C6p6496*
-usb:v27C6p650A*
-usb:v27C6p650C*
 usb:v27C6p6582*
 usb:v27C6p6584*
 usb:v27C6p658C*
@@ -248,72 +207,37 @@ usb:v27C6p6594*
 usb:v27C6p659A*
 usb:v27C6p659C*
 usb:v27C6p6A94*
-usb:v27C6p6512*
-usb:v27C6p6890*
-usb:v27C6p689A*
-usb:v27C6p66A9*
-usb:v27C6p6984*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver mafpmoc
-usb:v3274p8012*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
 # Supported by libfprint driver nb1010
 usb:v298Dp1010*
-usb:v298Dp2020*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
 # Supported by libfprint driver realtek
 usb:v0BDAp5813*
-usb:v0BDAp5816*
-usb:v2541pFA03*
-usb:v3274p9003*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver secugen
-usb:v1162p2200*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
 # Supported by libfprint driver synaptics
 usb:v06CBp00BD*
-usb:v06CBp00C2*
-usb:v06CBp00C4*
-usb:v06CBp00C6*
 usb:v06CBp00DF*
-usb:v06CBp00E9*
-usb:v06CBp00F0*
 usb:v06CBp00F9*
 usb:v06CBp00FC*
+usb:v06CBp00C2*
 usb:v06CBp0100*
+usb:v06CBp00F0*
 usb:v06CBp0103*
-usb:v06CBp0104*
-usb:v06CBp0106*
-usb:v06CBp0107*
-usb:v06CBp0108*
-usb:v06CBp0109*
-usb:v06CBp010A*
-usb:v06CBp010D*
-usb:v06CBp010E*
 usb:v06CBp0123*
 usb:v06CBp0124*
 usb:v06CBp0126*
 usb:v06CBp0129*
-usb:v06CBp015F*
 usb:v06CBp0168*
-usb:v06CBp0169*
-usb:v06CBp016C*
+usb:v06CBp015F*
+usb:v06CBp0104*
 usb:v06CBp0173*
-usb:v06CBp0174*
-usb:v06CBp019D*
-usb:v06CBp019F*
-usb:v06CBp01A0*
-usb:v06CBp01A4*
+usb:v06CBp0106*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -382,80 +306,45 @@ usb:v138Ap0091*
  ID_PERSIST=0
 
 # Known unsupported devices
-usb:v006Bp00DA*
-usb:v0413p2766*
-usb:v045Ep0815*
 usb:v047Dp00F2*
-usb:v047Dp8054*
-usb:v047Dp8055*
 usb:v04E8p730B*
-usb:v04F2pB61E*
 usb:v04F3p036B*
 usb:v04F3p0C00*
 usb:v04F3p0C4C*
 usb:v04F3p0C57*
-usb:v04F3p0C5A*
 usb:v04F3p0C5E*
-usb:v04F3p0C60*
+usb:v04F3p0C5A*
 usb:v04F3p0C6C*
 usb:v04F3p0C70*
 usb:v04F3p0C72*
 usb:v04F3p0C77*
-usb:v04F3p0C7C*
-usb:v04F3p0C7F*
-usb:v04F3p0C80*
-usb:v04F3p0C85*
-usb:v04F3p0C8A*
-usb:v04F3p0C8E*
-usb:v04F3p0C90*
-usb:v04F3p0CA2*
-usb:v04F3p24CC*
 usb:v04F3p2706*
 usb:v04F3p3032*
 usb:v04F3p3057*
-usb:v04F3p3058*
-usb:v04F3p3066*
-usb:v04F3p3087*
-usb:v04F3p309F*
-usb:v04F3p30C6*
 usb:v04F3p3104*
 usb:v04F3p310D*
 usb:v04F3p3128*
-usb:v04F3p3195*
-usb:v04F3p31FC*
-usb:v04F3p3201*
-usb:v04F3p3212*
-usb:v05BAp000E*
-usb:v05C8p03C0*
-usb:v06CBp0051*
 usb:v06CBp0081*
 usb:v06CBp0088*
 usb:v06CBp008A*
 usb:v06CBp009A*
 usb:v06CBp009B*
-usb:v06CBp00A1*
 usb:v06CBp00A2*
 usb:v06CBp00A8*
 usb:v06CBp00B7*
 usb:v06CBp00BB*
-usb:v06CBp00BC*
 usb:v06CBp00BE*
-usb:v06CBp00C7*
-usb:v06CBp00C9*
+usb:v06CBp00C4*
 usb:v06CBp00CB*
+usb:v06CBp00C9*
 usb:v06CBp00D8*
 usb:v06CBp00DA*
 usb:v06CBp00DC*
 usb:v06CBp00E4*
 usb:v06CBp00E7*
+usb:v06CBp00E9*
 usb:v06CBp00FD*
-usb:v06CBp00FF*
-usb:v06CBp0102*
-usb:v06CBpCE67*
-usb:v06CBpCEEF*
-usb:v08FFp3400*
 usb:v0A5Cp5801*
-usb:v0A5Cp5802*
 usb:v0A5Cp5805*
 usb:v0A5Cp5834*
 usb:v0A5Cp5840*
@@ -464,24 +353,12 @@ usb:v0A5Cp5842*
 usb:v0A5Cp5843*
 usb:v0A5Cp5844*
 usb:v0A5Cp5845*
-usb:v0A5Cp5860*
-usb:v0A5Cp5863*
-usb:v0A5Cp5864*
-usb:v0A5Cp5865*
-usb:v0A5Cp5866*
-usb:v0A5Cp5867*
-usb:v0BDAp0129*
 usb:v0BDAp5812*
 usb:v10A5p0007*
 usb:v10A5p9200*
-usb:v10A5p9201*
 usb:v10A5p9800*
-usb:v10A5pA120*
-usb:v10A5pA900*
-usb:v10A5pA921*
 usb:v10A5pE340*
 usb:v1188p9545*
-usb:v138Ap0006*
 usb:v138Ap0007*
 usb:v138Ap003A*
 usb:v138Ap003C*
@@ -492,8 +369,8 @@ usb:v138Ap0092*
 usb:v138Ap0094*
 usb:v138Ap0097*
 usb:v138Ap009D*
-usb:v138Ap00A6*
 usb:v138Ap00AB*
+usb:v138Ap00A6*
 usb:v147Ep1002*
 usb:v1491p0088*
 usb:v16D1p1027*
@@ -501,12 +378,6 @@ usb:v1C7Ap0300*
 usb:v1C7Ap0575*
 usb:v1C7Ap0576*
 usb:v1C7Ap0577*
-usb:v1C7Ap057E*
-usb:v1C7Ap05A5*
-usb:v1C7Ap05AA*
-usb:v1C7Ap0801*
-usb:v2541p0236*
-usb:v2541p9711*
 usb:v27C6p5042*
 usb:v27C6p5110*
 usb:v27C6p5117*
@@ -532,25 +403,14 @@ usb:v27C6p55A2*
 usb:v27C6p55A4*
 usb:v27C6p55B4*
 usb:v27C6p5740*
+usb:v27C6p5E0A*
 usb:v27C6p581A*
 usb:v27C6p589A*
-usb:v27C6p5E0A*
-usb:v27C6p5F10*
-usb:v27C6p5F91*
-usb:v2808p06FC*
-usb:v2808p6652*
+usb:v27C6p6382*
 usb:v2808p9338*
-usb:v2808p9348*
 usb:v2808p93A9*
-usb:v2808pA553*
-usb:v2808pA573*
-usb:v2808pA658*
-usb:v2808pC652*
+usb:v298Dp2020*
 usb:v298Dp2033*
-usb:v2DF0p0003*
-usb:v3274p9008*
-usb:v3274pB012*
-usb:v33A7p2388*
 usb:v3538p0930*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0

data/meson.build

@@ -1,6 +1,6 @@
 if udev_hwdb_dir != ''
     # This file has to be updated using
-    # meson compile -C <builddir> sync-udev-hwdb
+    # ninja -C <builddir> libfprint/sync-udev-hwdb
     # Note that the unsupported device list needs to be manually synced from
     # the wiki. See comment in libfprint/fprint-list-uev-hwdb.c
 

debian/README.source

@@ -0,0 +1,10 @@
+The libfprint-2-2 postinst script calls udevadmin trigger for all the supported
+USB readers. The list of readers used in that file is generated using the gbp
+import hook when `gbp import-orig` (via --uscan or with a tarball) is used.
+
+Alternatively it can be called manually by using:
+
+  GBP_SOURCES_DIR=. debian/update-udev-triggers.sh
+
+When preparing a new upstream release, this script should be called against the
+upstream provided .hwdb file.

debian/README.tod.md

@@ -0,0 +1,14 @@
+### libfprint-TOD - libfprint for Touch OEM Drivers
+
+This is a light fork of libfprint to expose internal Drivers API in order to
+create drivers as shared libraries.
+
+Fork is hosted at: https://gitlab.freedesktop.org/3v1n0/libfprint/tree/tod
+
+Packaging for this is handled via gbp, so you need to make sure that you have
+added the remote:
+
+    git remote add origin-tod https://gitlab.freedesktop.org/3v1n0/libfprint.git
+    git fetch origin-tod --tags
+
+To get the latest tod release, just use `gbp import-orig --uscan`.

debian/control

@@ -0,0 +1,203 @@
+Source: libfprint
+Priority: optional
+Section: libs
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: FingerForce Team <fingerforce-devel@lists.alioth.debian.org>
+Uploaders: Marco Trevisan <marco@ubuntu.com>
+Build-Depends: debhelper-compat (= 13),
+               gir1.2-gobject-2.0-dev <!nogir>,
+               gir1.2-gio-2.0-dev <!nogir>,
+               gobject-introspection,
+               gtk-doc-tools,
+               libcairo-dev <!nocheck>,
+               libgirepository1.0-dev,
+               libglib2.0-dev,
+               libgudev-1.0-dev,
+               libgusb-dev,
+               libnss3-dev,
+               libpixman-1-dev,
+               meson,
+               python3 <!nocheck>,
+               python3-cairo <!nocheck>,
+               python3-gi <!nocheck>,
+               systemd-dev,
+               umockdev <!nocheck>
+Build-Depends-Indep: libglib2.0-doc <!nodoc>, libgusb-doc <!nodoc>
+Standards-Version: 4.6.2
+Homepage: https://www.freedesktop.org/wiki/Software/fprint/libfprint
+Vcs-Browser: https://salsa.debian.org/ubuntu-dev-team/libfprint/tree/noble
+Vcs-Git: https://salsa.debian.org/ubuntu-dev-team/libfprint.git -b noble
+
+Package: libfprint-2-2
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: async fingerprint library of fprint project, shared libraries
+ The fprint project aims to support for consumer fingerprint reader devices.
+ .
+ Previously, Linux support for such devices has been scattered amongst different
+ projects (many incomplete) and inconsistent in that application developers
+ would have to implement support for each type of fingerprint reader separately.
+ The idea is to change that by providing a central system to support all the
+ fingerprint readers as it's possible to get hands on.
+ .
+ libfprint is the centre of efforts, this component does the dirty job of
+ talking to fingerprint reading devices, and processing fingerprint data.
+ .
+ This library depends on the new libusb, which performs asynchronous callbacks,
+ allowing fprint to perform non-blocking device tasks.
+ .
+ This package provides shared libraries.
+
+Package: libfprint-2-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: gir1.2-fprint-2.0 (= ${binary:Version}),
+         libfprint-2-2 (= ${binary:Version}),
+         ${misc:Depends},
+         ${gir:Depends},
+Provides: ${gir:Provides},
+Suggests: libfprint-2-doc
+Description: async fingerprint library of fprint project, development headers
+ The fprint project aims to support for consumer fingerprint reader devices.
+ .
+ Previously, Linux support for such devices has been scattered amongst different
+ projects (many incomplete) and inconsistent in that application developers
+ would have to implement support for each type of fingerprint reader separately.
+ The idea is to change that by providing a central system to support all the
+ fingerprint readers as it's possible to get hands on.
+ .
+ libfprint is the centre of efforts, this component does the dirty job of
+ talking to fingerprint reading devices, and processing fingerprint data.
+ .
+ This library depends on the new libusb, which performs asynchronous callbacks,
+ allowing fprint to perform non-blocking device tasks.
+ .
+ This package provides development headers.
+
+Package: libfprint-2-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: async fingerprint library of fprint project, API documentation
+ The fprint project aims to support for consumer fingerprint reader devices.
+ .
+ Previously, Linux support for such devices has been scattered amongst different
+ projects (many incomplete) and inconsistent in that application developers
+ would have to implement support for each type of fingerprint reader separately.
+ The idea is to change that by providing a central system to support all the
+ fingerprint readers as it's possible to get hands on.
+ .
+ libfprint is the centre of efforts, this component does the dirty job of
+ talking to fingerprint reading devices, and processing fingerprint data.
+ .
+ This library depends on the new libusb, which performs asynchronous callbacks,
+ allowing fprint to perform non-blocking device tasks.
+ .
+ This package provides the API documentation.
+
+Package: gir1.2-fprint-2.0
+Architecture: any
+Multi-Arch: same
+Section: introspection
+Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: async fingerprint library of fprint project, gir bindings
+ The fprint project aims to support for consumer fingerprint reader devices.
+ .
+ Previously, Linux support for such devices has been scattered amongst different
+ projects (many incomplete) and inconsistent in that application developers
+ would have to implement support for each type of fingerprint reader separately.
+ The idea is to change that by providing a central system to support all the
+ fingerprint readers as it's possible to get hands on.
+ .
+ libfprint is the centre of efforts, this component does the dirty job of
+ talking to fingerprint reading devices, and processing fingerprint data.
+ .
+ This library depends on the new libusb, which performs asynchronous callbacks,
+ allowing fprint to perform non-blocking device tasks.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
+
+Package: libfprint-2-tod1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: async fingerprint library of fprint project, drivers shared libraries
+ The fprint project aims to support for consumer fingerprint reader devices.
+ .
+ Previously, Linux support for such devices has been scattered amongst different
+ projects (many incomplete) and inconsistent in that application developers
+ would have to implement support for each type of fingerprint reader separately.
+ The idea is to change that by providing a central system to support all the
+ fingerprint readers as it's possible to get hands on.
+ .
+ libfprint is the centre of efforts, this component does the dirty job of
+ talking to fingerprint reading devices, and processing fingerprint data.
+ .
+ This library depends on the new libusb, which performs asynchronous callbacks,
+ allowing fprint to perform non-blocking device tasks.
+ .
+ This package provides shared libraries for the TOD drivers.
+
+Package: libfprint-2-tod-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: libfprint-2-tod1 (= ${binary:Version}),
+         libfprint-2-dev (= ${binary:Version}),
+         libglib2.0-dev (>= 2.56),
+         libgudev-1.0-dev,
+         libgusb-dev (>= 0.2.0),
+         libpixman-1-dev,
+         libnss3-dev,
+         ${misc:Depends}
+Description: async fingerprint library of fprint project, drivers development headers
+ The fprint project aims to support for consumer fingerprint reader devices.
+ .
+ Previously, Linux support for such devices has been scattered amongst different
+ projects (many incomplete) and inconsistent in that application developers
+ would have to implement support for each type of fingerprint reader separately.
+ The idea is to change that by providing a central system to support all the
+ fingerprint readers as it's possible to get hands on.
+ .
+ libfprint is the centre of efforts, this component does the dirty job of
+ talking to fingerprint reading devices, and processing fingerprint data.
+ .
+ This library depends on the new libusb, which performs asynchronous callbacks,
+ allowing fprint to perform non-blocking device tasks.
+ .
+ This package provides development headers for creating device drivers.
+ An example driver is available at:
+ https://gitlab.freedesktop.org/3v1n0/libfprint-tod-example-driver
+
+Package: libfprint-2-tests
+Architecture: any
+Depends: gir1.2-fprint-2.0 (= ${binary:Version}),
+         libfprint-2-2 (= ${binary:Version}),
+         python3,
+         python3-cairo,
+         python3-gi,
+         umockdev,
+         ${misc:Depends}, ${shlibs:Depends}
+Description: Tests for async fingerprint library of fprint project
+ The fprint project aims to support for consumer fingerprint reader devices.
+ .
+ Previously, Linux support for such devices has been scattered amongst different
+ projects (many incomplete) and inconsistent in that application developers
+ would have to implement support for each type of fingerprint reader separately.
+ The idea is to change that by providing a central system to support all the
+ fingerprint readers as it's possible to get hands on.
+ .
+ libfprint is the centre of efforts, this component does the dirty job of
+ talking to fingerprint reading devices, and processing fingerprint data.
+ .
+ This library depends on the new libusb, which performs asynchronous callbacks,
+ allowing fprint to perform non-blocking device tasks.
+ .
+ This package contains test programs, designed to be run as part of a
+ regression testsuite.

debian/copyright

@@ -0,0 +1,45 @@
+This package was debianized by Ulises Vitulli <uvitulli@fi.uba.ar>  on
+Fri, 19 Sep 2008 05:14:30 -0300.
+
+It was downloaded from <http://reactivated.net/fprint/wiki/Libfprint>
+
+Upstream Authors, and Copyright:
+
+Copyright © 2007 Daniel Drake <dsd@gentoo.org>
+Copyright © 2006-2007 Timo Hoenig <thoenig@suse.de>
+Copyright © 2006 Pavel Machek <pavel@suse.cz>
+Copyright © 1999 Erik Walthinsen <omega@cse.ogi.edu>
+Copyright © 2004,2006 Thomas Vander Stichele <thomas at apestaart dot org>
+Copyright © 2007 Cyrille Bagard
+Copyright © 2007 Vasily Khoruzhick
+Copyright © 2007 Jan-Michael Brummer <buzz2@gmx.de>
+Copyright © 2007 Anthony Bretaudeau <wxcover@users.sourceforge.net>
+
+
+License:
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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
+
+The files under libfprint/nbis directory has this license:
+
+This software was developed at the National Institute of Standards and
+Technology (NIST) by employees of the Federal Government in the course
+of their official duties. Pursuant to title 17 Section 105 of the
+United States Code, this software is not subject to copyright protection
+and is in the public domain. NIST assumes no responsibility  whatsoever for
+its use by other parties, and makes no guarantees, expressed or implied,
+about its quality, reliability, or any other characteristic.
+
+The Debian packaging is © 2008, Ulises Vitulli <uvitulli@fi.uba.ar> and is
+licensed under the LGPL v2.1, see `/usr/share/common-licenses/LGPL-2.1'.

debian/docs

@@ -0,0 +1,2 @@
+NEWS
+README.md

debian/gbp-post-import-hook.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+dch -v"$GBP_DEBIAN_VERSION" "New upstream release"
+git add debian/changelog
+debcommit
+
+debian/update-udev-triggers.sh

debian/gbp.conf

@@ -0,0 +1,19 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = noble
+upstream-vcs-tag = v%(version)s
+upstream-branch = upstream-tod
+debian-tag=ubuntu/%(version)s
+
+[buildpackage]
+sign-tags = True
+
+[dch]
+multimaint-merge = True
+
+[import-orig]
+postimport = debian/gbp-post-import-hook.sh
+
+[pq]
+patch-numbers = False
+

debian/gir1.2-fprint-2.0.install

@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/girepository-1.0/FPrint-*.typelib

debian/libfprint-2-2.install

@@ -0,0 +1,3 @@
+usr/lib/udev/hwdb.d/
+usr/lib/udev/rules.d/
+usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9].so.*

debian/libfprint-2-2.lintian-overrides

@@ -0,0 +1,3 @@
+# For security reasons, we don't want the fingerprint readers to be accessible
+# by unprivileged users
+udev-rule-missing-uaccess

debian/libfprint-2-2.postinst

@@ -0,0 +1,315 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2>&1; then
+	# apply hwdb rules at package installation, see
+	# <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683863#27>
+	# NOTA BENE: after the DEBHELPER section since dh_installudev
+	# adds stuff there
+	# The devices ID list is auto-generated using the gbp postimport hook
+	# see debian/README.sources for more details.
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1600 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1660 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1680 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1681 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1682 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1683 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1684 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1685 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1686 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1687 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1688 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1689 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168a || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168b || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168c || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168d || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168e || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168f || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2500 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2580 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2550 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2810 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2660 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2680 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2681 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2682 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2683 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2684 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2685 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2686 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2687 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2688 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2689 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268a || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268b || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268c || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268d || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268e || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268f || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2691 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=5731 || true
+	udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=5501 || true
+	udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0570 || true
+	udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0571 || true
+	udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0582 || true
+	udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=05a1 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0903 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0907 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c01 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c02 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c03 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c04 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c05 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c06 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c07 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c08 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c09 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0a || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0b || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0c || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0d || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0e || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0f || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c10 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c11 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c12 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c13 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c14 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c15 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c16 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c17 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c18 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c19 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1a || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1b || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1c || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1d || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1e || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1f || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c20 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c21 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c22 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c23 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c24 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c25 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c26 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c27 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c28 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c29 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2a || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2b || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2c || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2d || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2e || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2f || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c30 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c31 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c32 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c33 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c3d || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c42 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4b || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4d || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4f || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c63 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c6e || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c58 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c7d || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c7e || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c82 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c88 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c8c || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c8d || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c99 || true
+	udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0603 || true
+	udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=9e48 || true
+	udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=d979 || true
+	udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=a959 || true
+	udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=ffe0 || true
+	udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=a305 || true
+	udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=da04 || true
+	udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=d805 || true
+	udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=d205 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5840 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6014 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6092 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6094 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=609c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=60a2 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=60a4 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=60bc || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6304 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=631c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=633c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=634c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6384 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=639c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63ac || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63bc || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63cc || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6496 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6582 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6584 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=658c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6592 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6594 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=659a || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=659c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6a94 || true
+	udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=1010 || true
+	udevadm trigger --action=add --attr-match=idVendor=0bda --attr-match=idProduct=5813 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00bd || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00df || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f9 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00fc || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c2 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0100 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f0 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0103 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0123 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0124 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0126 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0129 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0168 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=015f || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0104 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0173 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0106 || true
+	udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=2016 || true
+	udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1000 || true
+	udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1001 || true
+	udevadm trigger --action=add --attr-match=idVendor=0483 --attr-match=idProduct=2015 || true
+	udevadm trigger --action=add --attr-match=idVendor=0483 --attr-match=idProduct=2017 || true
+	udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=3001 || true
+	udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=2020 || true
+	udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00bc || true
+	udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00bd || true
+	udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00ca || true
+	udevadm trigger --action=add --attr-match=idVendor=05ba --attr-match=idProduct=0007 || true
+	udevadm trigger --action=add --attr-match=idVendor=05ba --attr-match=idProduct=0008 || true
+	udevadm trigger --action=add --attr-match=idVendor=05ba --attr-match=idProduct=000a || true
+	udevadm trigger --action=add --attr-match=idVendor=061a --attr-match=idProduct=0110 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0050 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0001 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0005 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0008 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0010 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0011 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0015 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0017 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0018 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0091 || true
+	udevadm trigger --action=add --attr-match=idVendor=047d --attr-match=idProduct=00f2 || true
+	udevadm trigger --action=add --attr-match=idVendor=04e8 --attr-match=idProduct=730b || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=036b || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c00 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4c || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c57 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c5e || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c5a || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c6c || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c70 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c72 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c77 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=2706 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3032 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3057 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3104 || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=310d || true
+	udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3128 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0081 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0088 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=008a || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=009a || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=009b || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00a2 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00a8 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00b7 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00bb || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00be || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c4 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00cb || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c9 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00d8 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00da || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00dc || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e4 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e7 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e9 || true
+	udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00fd || true
+	udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5801 || true
+	udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5805 || true
+	udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5834 || true
+	udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5840 || true
+	udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5841 || true
+	udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5842 || true
+	udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5843 || true
+	udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5844 || true
+	udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5845 || true
+	udevadm trigger --action=add --attr-match=idVendor=0bda --attr-match=idProduct=5812 || true
+	udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=0007 || true
+	udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=9200 || true
+	udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=9800 || true
+	udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=e340 || true
+	udevadm trigger --action=add --attr-match=idVendor=1188 --attr-match=idProduct=9545 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0007 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003a || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003c || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003d || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003f || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0090 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0092 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0094 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0097 || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=009d || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=00ab || true
+	udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=00a6 || true
+	udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1002 || true
+	udevadm trigger --action=add --attr-match=idVendor=1491 --attr-match=idProduct=0088 || true
+	udevadm trigger --action=add --attr-match=idVendor=16d1 --attr-match=idProduct=1027 || true
+	udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0300 || true
+	udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0575 || true
+	udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0576 || true
+	udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0577 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5042 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5110 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5117 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5120 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5125 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5201 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=521d || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5301 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=530c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=532d || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5335 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=533c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5381 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5385 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=538c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=538d || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5395 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5503 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=550a || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=550c || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5584 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55a2 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55a4 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55b4 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5740 || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5e0a || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=581a || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=589a || true
+	udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6382 || true
+	udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=9338 || true
+	udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=93a9 || true
+	udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=2020 || true
+	udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=2033 || true
+	udevadm trigger --action=add --attr-match=idVendor=3538 --attr-match=idProduct=0930 || true
+
+fi
+
+exit 0

debian/libfprint-2-2.postinst.in

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2>&1; then
+	# apply hwdb rules at package installation, see
+	# <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683863#27>
+	# NOTA BENE: after the DEBHELPER section since dh_installudev
+	# adds stuff there
+	# The devices ID list is auto-generated using the gbp postimport hook
+	# see debian/README.sources for more details.
+@UDEVADM_TRIGGERS@
+fi
+
+exit 0

debian/libfprint-2-2.symbols

@@ -0,0 +1,94 @@
+libfprint-2.so.2 libfprint-2-2 #MINVER#
+* Build-Depends-Package: libfprint-2-dev
+ LIBFPRINT_2.0.0@LIBFPRINT_2.0.0 1:1.90.1
+ fp_context_enumerate@LIBFPRINT_2.0.0 1:1.90.1
+ fp_context_get_devices@LIBFPRINT_2.0.0 1:1.90.1
+ fp_context_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_context_new@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_capture@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_capture_finish@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_capture_sync@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_clear_storage@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_clear_storage_finish@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_clear_storage_sync@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_close@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_close_finish@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_close_sync@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_delete_print@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_delete_print_finish@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_delete_print_sync@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_enroll@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_enroll_finish@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_enroll_sync@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_error_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_error_quark@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_feature_get_type@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_get_device_id@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_get_driver@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_get_features@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_get_finger_status@LIBFPRINT_2.0.0 1:1.90.4
+ fp_device_get_name@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_get_nr_enroll_stages@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_get_scan_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_get_temperature@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_has_feature@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_has_storage@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_identify@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_identify_finish@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_identify_sync@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_is_open@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_list_prints@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_list_prints_finish@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_list_prints_sync@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_open@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_open_finish@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_open_sync@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_resume@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_resume_finish@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_resume_sync@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_retry_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_retry_quark@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_supports_capture@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_supports_identify@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_suspend@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_suspend_finish@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_suspend_sync@LIBFPRINT_2.0.0 1:1.94.1
+ fp_device_type_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_verify@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_verify_finish@LIBFPRINT_2.0.0 1:1.90.1
+ fp_device_verify_sync@LIBFPRINT_2.0.0 1:1.90.1
+ fp_finger_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_finger_status_flags_get_type@LIBFPRINT_2.0.0 1:1.90.4
+ fp_image_detect_minutiae@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_detect_minutiae_finish@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_device_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_get_binarized@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_get_data@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_get_height@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_get_minutiae@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_get_ppmm@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_get_width@LIBFPRINT_2.0.0 1:1.90.1
+ fp_image_new@LIBFPRINT_2.0.0 1:1.90.1
+ fp_minutia_get_coords@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_compatible@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_deserialize@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_equal@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_get_description@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_get_device_id@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_get_device_stored@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_get_driver@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_get_enroll_date@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_get_finger@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_get_image@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_get_username@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_new@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_serialize@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_set_description@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_set_enroll_date@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_set_finger@LIBFPRINT_2.0.0 1:1.90.1
+ fp_print_set_username@LIBFPRINT_2.0.0 1:1.90.1
+ fp_scan_type_get_type@LIBFPRINT_2.0.0 1:1.90.1
+ fp_temperature_get_type@LIBFPRINT_2.0.0 1:1.94.1

debian/libfprint-2-dev.install

@@ -0,0 +1,4 @@
+usr/include/libfprint-[0-9]/*.h
+usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9].so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/libfprint-[0-9].pc
+usr/share/gir-1.0/FPrint-*.gir

debian/libfprint-2-doc.install

@@ -0,0 +1 @@
+usr/share/gtk-doc/*/libfprint-*

debian/libfprint-2-tests.install

@@ -0,0 +1,2 @@
+usr/libexec/installed-tests/libfprint-[0-9]
+usr/share/installed-tests/libfprint-[0-9]

debian/libfprint-2-tod-dev.install

@@ -0,0 +1,3 @@
+usr/include/libfprint-[0-9]/tod-[0-9]/*
+usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9]-tod.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/libfprint-[0-9]-tod-[0-9].pc

debian/libfprint-2-tod1.install

@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9]-tod.so.*

debian/libfprint-2-tod1.symbols

@@ -0,0 +1,239 @@
+libfprint-2-tod.so.1 libfprint-2-tod1 #MINVER#
+ LIBFPRINT_TOD_1.0.0@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ LIBFPRINT_TOD_1_1.92@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ LIBFPRINT_TOD_1_1.94@LIBFPRINT_TOD_1_1.94 1:1.94.1+tod1
+ fpi_assemble_frames@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_assemble_lines@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_dup_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_dup_string_utf16@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_dup_string_utf32@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_dup_string_utf8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_free@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_float32_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_float32_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_float64_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_float64_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_int16_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_int16_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_int24_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_int24_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_int32_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_int32_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_int64_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_int64_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_int8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_pos@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_remaining@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_size@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_string_utf8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_sub_reader@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_uint16_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_uint16_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_uint24_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_uint24_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_uint32_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_uint32_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_uint64_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_uint64_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_get_uint8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_init@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_masked_scan_uint32@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_masked_scan_uint32_peek@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_new@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_float32_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_float32_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_float64_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_float64_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_int16_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_int16_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_int24_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_int24_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_int32_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_int32_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_int64_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_int64_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_int8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_string_utf8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_sub_reader@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_uint16_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_uint16_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_uint24_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_uint24_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_uint32_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_uint32_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_uint64_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_uint64_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_peek_uint8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_set_pos@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_skip@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_skip_string_utf16@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_skip_string_utf32@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_reader_skip_string_utf8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_ensure_free_space@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_fill@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_free@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_free_and_get_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_get_remaining@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_init@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_init_with_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_init_with_size@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_new@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_new_with_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_new_with_size@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_float32_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_float32_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_float64_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_float64_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_int16_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_int16_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_int24_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_int24_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_int32_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_int32_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_int64_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_int64_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_int8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_string_utf16@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_string_utf32@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_string_utf8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_uint16_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_uint16_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_uint24_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_uint24_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_uint32_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_uint32_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_uint64_be@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_uint64_le@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_put_uint8@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_reset@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_byte_writer_reset_and_get_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_action_error@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_action_get_type@LIBFPRINT_TOD_1.0.0 1:1.90.3+tod1
+ fpi_device_action_is_cancelled@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_add_timeout@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_capture_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_class_auto_initialize_features@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_device_clear_storage_complete@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_device_close_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_configure_wakeup@LIBFPRINT_TOD_1.0.0 1:1.94.1+tod1
+ fpi_device_critical_enter@LIBFPRINT_TOD_1_1.94 1:1.94.1+tod1
+ fpi_device_critical_leave@LIBFPRINT_TOD_1_1.94 1:1.94.1+tod1
+ fpi_device_delete_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_enroll_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_enroll_progress@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_error_new@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_error_new_msg@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_cancellable@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_capture_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_current_action@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_delete_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_driver_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_enroll_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_identify_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_udev_data@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_device_get_usb_device@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_verify_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_get_virtual_env@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_identify_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_identify_report@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_list_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_open_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_probe_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_remove@LIBFPRINT_TOD_1.0.0 1:1.90.5+tod1
+ fpi_device_report_finger_status@LIBFPRINT_TOD_1.0.0 1:1.90.5+tod1
+ fpi_device_report_finger_status_changes@LIBFPRINT_TOD_1.0.0 1:1.90.5+tod1
+ fpi_device_resume@LIBFPRINT_TOD_1_1.94 1:1.94.5+tod1
+ fpi_device_resume_complete@LIBFPRINT_TOD_1_1.94 1:1.94.1+tod1
+ fpi_device_retry_new@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_retry_new_msg@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_set_nr_enroll_stages@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_set_scan_type@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_suspend@LIBFPRINT_TOD_1_1.94 1:1.94.5+tod1
+ fpi_device_suspend_complete@LIBFPRINT_TOD_1_1.94 1:1.94.1+tod1
+ fpi_device_udev_subtype_flags_get_type@LIBFPRINT_TOD_1.0.0 1:1.94.1+tod1
+ fpi_device_update_features@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_device_update_temp@LIBFPRINT_TOD_1.0.0 1:1.94.1+tod1
+ fpi_device_verify_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_device_verify_report@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_do_movement_estimation@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_activate@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_activate_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_close_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_deactivate@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_deactivate_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_image_captured@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_open_complete@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_report_finger_status@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_retry_scan@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_session_error@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_set_bz3_threshold@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_image_device_state_get_type@LIBFPRINT_TOD_1.0.0 1:1.90.3+tod1
+ fpi_image_flags_get_type@LIBFPRINT_TOD_1.0.0 1:1.90.3+tod1
+ fpi_image_resize@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_match_result_get_type@LIBFPRINT_TOD_1.0.0 1:1.90.3+tod1
+ fpi_mean_sq_diff_norm@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_print_add_from_image@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_print_add_print@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_print_bz3_match@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_print_fill_from_user_id@LIBFPRINT_TOD_1.0.0 1:1.90.2+tod1
+ fpi_print_generate_user_id@LIBFPRINT_TOD_1.0.0 1:1.90.2+tod1
+ fpi_print_set_device_stored@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_print_set_type@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_print_type_get_type@LIBFPRINT_TOD_1.0.0 1:1.90.3+tod1
+ fpi_spi_transfer_get_type@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_spi_transfer_new@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_spi_transfer_read@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_spi_transfer_read_full@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_spi_transfer_ref@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_spi_transfer_submit@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_spi_transfer_submit_sync@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_spi_transfer_unref@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_spi_transfer_write@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_spi_transfer_write_full@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_ssm_cancel_delayed_state_change@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_dup_error@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_free@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_get_cur_state@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_get_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_get_device@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_ssm_get_error@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_jump_to_state@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_jump_to_state_delayed@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_jump_to_state_delayed@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_ssm_jump_to_state_delayed_1_90@LIBFPRINT_TOD_1.0.0 1:1.94.1+tod1
+ fpi_ssm_mark_completed@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_mark_completed_delayed@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_mark_completed_delayed@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_ssm_mark_completed_delayed_1_90@LIBFPRINT_TOD_1.0.0 1:1.94.1+tod1
+ fpi_ssm_mark_failed@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_new_full@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_new_full@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_ssm_new_full_1_90@LIBFPRINT_TOD_1.0.0 1:1.94.1+tod1
+ fpi_ssm_next_state@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_next_state_delayed@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_next_state_delayed@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_ssm_next_state_delayed_1_90@LIBFPRINT_TOD_1.0.0 1:1.94.1+tod1
+ fpi_ssm_set_data@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_silence_debug@LIBFPRINT_TOD_1_1.94 1:1.94.3+tod1
+ fpi_ssm_spi_transfer_cb@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_ssm_spi_transfer_with_weak_pointer_cb@LIBFPRINT_TOD_1_1.92 1:1.94.1+tod1
+ fpi_ssm_start@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_start_subsm@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_usb_transfer_cb@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_ssm_usb_transfer_with_weak_pointer_cb@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_std_sq_dev@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_transfer_type_get_type@LIBFPRINT_TOD_1.0.0 1:1.90.3+tod1
+ fpi_usb_transfer_fill_bulk@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_fill_bulk_full@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_fill_control@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_fill_interrupt@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_fill_interrupt_full@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_get_type@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_new@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_ref@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_submit@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_submit_sync@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1
+ fpi_usb_transfer_unref@LIBFPRINT_TOD_1.0.0 1:1.90.1+tod1

debian/patches/elanmoc-Add-new-PID-0x0CA8.patch

@@ -0,0 +1,37 @@
+From a603b95786836d27679301ecd4e68e4227ab4c82 Mon Sep 17 00:00:00 2001
+From: herman lin <herman.lin@emc.com.tw>
+Date: Thu, 8 May 2025 15:34:37 +0800
+Subject: [PATCH] elanmoc: Add new PID 0x0CA8
+
+---
+ data/autosuspend.hwdb               | 1 +
+ libfprint/drivers/elanmoc/elanmoc.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
+index 39dd316..43190cb 100644
+--- a/data/autosuspend.hwdb
++++ b/data/autosuspend.hwdb
+@@ -157,6 +157,7 @@ usb:v04F3p0C8C*
+ usb:v04F3p0C8D*
+ usb:v04F3p0C99*
+ usb:v04F3p0C9F*
++usb:v04F3p0CA8*
+  ID_AUTOSUSPEND=1
+  ID_PERSIST=0
+ 
+diff --git a/libfprint/drivers/elanmoc/elanmoc.c b/libfprint/drivers/elanmoc/elanmoc.c
+index 42a84a6..0e99e57 100644
+--- a/libfprint/drivers/elanmoc/elanmoc.c
++++ b/libfprint/drivers/elanmoc/elanmoc.c
+@@ -33,6 +33,7 @@ static const FpIdEntry id_table[] = {
+   { .vid = 0x04f3,  .pid = 0x0c8d,  },
+   { .vid = 0x04f3,  .pid = 0x0c99,  },
+   { .vid = 0x04f3,  .pid = 0x0c9f,  },
++  { .vid = 0x04f3,  .pid = 0x0ca8,  },
+   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
+ };
+ 
+-- 
+2.43.0
+

debian/patches/elanmoc-add-new-pid-0x0c9f.patch

@@ -0,0 +1,28 @@
+Subject: elanmoc: Add new PID 0x0C9F
+Origin: upstream, https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/501
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfprint/+bug/2089367
+
+diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
+index 8e0e6eab12e772058a8957a2b9f2d39e0bdc8e11..342c6d0e6538028d90a11d1607cd9e07086aeb8c 100644
+--- a/data/autosuspend.hwdb
++++ b/data/autosuspend.hwdb
+@@ -156,6 +156,7 @@ usb:v04F3p0C88*
+ usb:v04F3p0C8C*
+ usb:v04F3p0C8D*
+ usb:v04F3p0C99*
++usb:v04F3p0C9F*
+  ID_AUTOSUSPEND=1
+  ID_PERSIST=0
+ 
+diff --git a/libfprint/drivers/elanmoc/elanmoc.c b/libfprint/drivers/elanmoc/elanmoc.c
+index e86b79a28ec2240a303ad602b567d10447e3b09b..42a84a627e68020bb070bce1a6cffa669cffe9ed 100644
+--- a/libfprint/drivers/elanmoc/elanmoc.c
++++ b/libfprint/drivers/elanmoc/elanmoc.c
+@@ -32,6 +32,7 @@ static const FpIdEntry id_table[] = {
+   { .vid = 0x04f3,  .pid = 0x0c8c,  },
+   { .vid = 0x04f3,  .pid = 0x0c8d,  },
+   { .vid = 0x04f3,  .pid = 0x0c99,  },
++  { .vid = 0x04f3,  .pid = 0x0c9f,  },
+   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
+ };
+ 

debian/patches/goodixmoc-add-new-PID-0x66A9.patch

@@ -0,0 +1,37 @@
+From 763b6830006ca88bced7744c219c9a961d1637f4 Mon Sep 17 00:00:00 2001
+From: jialei <jialei@egoodix.com>
+Date: Wed, 29 Oct 2025 14:32:54 +0800
+Subject: [PATCH] goodixmoc:add new PID 0x66A9
+
+---
+ data/autosuspend.hwdb                | 1 +
+ libfprint/drivers/goodixmoc/goodix.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
+index 74ac65b..df18494 100644
+--- a/data/autosuspend.hwdb
++++ b/data/autosuspend.hwdb
+@@ -207,6 +207,7 @@ usb:v27C6p6594*
+ usb:v27C6p659A*
+ usb:v27C6p659C*
+ usb:v27C6p6A94*
++usb:v27C6p66A9*
+  ID_AUTOSUSPEND=1
+  ID_PERSIST=0
+ 
+diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c
+index 5a3ffac..8aea175 100644
+--- a/libfprint/drivers/goodixmoc/goodix.c
++++ b/libfprint/drivers/goodixmoc/goodix.c
+@@ -1632,6 +1632,7 @@ static const FpIdEntry id_table[] = {
+   { .vid = 0x27c6,  .pid = 0x659A,  },
+   { .vid = 0x27c6,  .pid = 0x659C,  },
+   { .vid = 0x27c6,  .pid = 0x6A94,  },
++  { .vid = 0x27c6,  .pid = 0x66A9,  },
+   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
+ };
+ 
+-- 
+2.43.0
+

debian/patches/libfprint-fprint-list-udev-hwdb-Add-new-broadcom-device-I.patch

@@ -0,0 +1,44 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
+Date: Wed, 22 May 2024 17:08:19 +0200
+Subject: libfprint-fprint-list-udev-hwdb: Add new broadcom device IDs
+
+(cherry picked from commit eaec2339ccaee64b2bdb1d1e27f51ada673e4087)
+---
+ data/autosuspend.hwdb             | 6 ++++++
+ libfprint/fprint-list-udev-hwdb.c | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
+index 74ac65b..cb3e74b 100644
+--- a/data/autosuspend.hwdb
++++ b/data/autosuspend.hwdb
+@@ -353,6 +353,12 @@ usb:v0A5Cp5842*
+ usb:v0A5Cp5843*
+ usb:v0A5Cp5844*
+ usb:v0A5Cp5845*
++usb:v0A5Cp5860*
++usb:v0A5Cp5863*
++usb:v0A5Cp5864*
++usb:v0A5Cp5865*
++usb:v0A5Cp5866*
++usb:v0A5Cp5867*
+ usb:v0BDAp5812*
+ usb:v10A5p0007*
+ usb:v10A5p9200*
+diff --git a/libfprint/fprint-list-udev-hwdb.c b/libfprint/fprint-list-udev-hwdb.c
+index bace9f9..4d056ae 100644
+--- a/libfprint/fprint-list-udev-hwdb.c
++++ b/libfprint/fprint-list-udev-hwdb.c
+@@ -76,6 +76,12 @@ static const FpIdEntry allowlist_id_table[] = {
+   { .vid = 0x0a5c, .pid = 0x5843 },
+   { .vid = 0x0a5c, .pid = 0x5844 },
+   { .vid = 0x0a5c, .pid = 0x5845 },
++  { .vid = 0x0a5c, .pid = 0x5860 },
++  { .vid = 0x0a5c, .pid = 0x5863 },
++  { .vid = 0x0a5c, .pid = 0x5864 },
++  { .vid = 0x0a5c, .pid = 0x5865 },
++  { .vid = 0x0a5c, .pid = 0x5866 },
++  { .vid = 0x0a5c, .pid = 0x5867 },
+   { .vid = 0x0bda, .pid = 0x5812 },
+   { .vid = 0x10a5, .pid = 0x0007 },
+   { .vid = 0x10a5, .pid = 0x9200 },

debian/patches/series

@@ -0,0 +1,7 @@
+libfprint-fprint-list-udev-hwdb-Add-new-broadcom-device-I.patch
+elanmoc-add-new-pid-0x0c9f.patch
+synaptics-Add-new-PID-0x0107-and-0x108.patch
+synaptics-Add-new-PID-0x019D.patch
+synaptics-add-new-PID-0x019F-0x109-and-0x10A.patch
+goodixmoc-add-new-PID-0x66A9.patch
+elanmoc-Add-new-PID-0x0CA8.patch

debian/patches/synaptics-Add-new-PID-0x0107-and-0x108.patch

@@ -0,0 +1,39 @@
+From a8ef1672a4ca7e60760349ce320a8f5b778244d5 Mon Sep 17 00:00:00 2001
+From: Aris Lin <aris.lin@synaptics.com>
+Date: Mon, 18 Nov 2024 11:18:29 +0800
+Subject: [PATCH] synaptics: Add new PID 0x0107 and 0x108
+
+---
+ data/autosuspend.hwdb                   | 2 ++
+ libfprint/drivers/synaptics/synaptics.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
+index 74ac65b..386d8bd 100644
+--- a/data/autosuspend.hwdb
++++ b/data/autosuspend.hwdb
+@@ -229,6 +229,8 @@ usb:v06CBp00C2*
+ usb:v06CBp0100*
+ usb:v06CBp00F0*
+ usb:v06CBp0103*
++usb:v06CBp0107*
++usb:v06CBp0108*
+ usb:v06CBp0123*
+ usb:v06CBp0124*
+ usb:v06CBp0126*
+diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
+index 138e734..a5d2990 100644
+--- a/libfprint/drivers/synaptics/synaptics.c
++++ b/libfprint/drivers/synaptics/synaptics.c
+@@ -39,6 +39,8 @@ static const FpIdEntry id_table[] = {
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0100,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00F0,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0103,  },
++  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0107,  },
++  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0108,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0123,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0124,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0126,  },
+-- 
+2.43.0
+

debian/patches/synaptics-Add-new-PID-0x019D.patch

@@ -0,0 +1,40 @@
+From 2e766904f0250873aaa2133f5d0e84440843ec8b Mon Sep 17 00:00:00 2001
+From: Aris Lin <aris.lin@synaptics.com>
+Date: Mon, 13 May 2024 16:21:57 +0800
+Subject: [PATCH] synaptics: Add new PID 0x019D
+Origin: upstream, https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/2e766904f0250873aaa2133f5d0e84440843ec8b
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2114712
+Signed-off-by: Atlas Yu <atlas.yu@canonical.com>
+
+---
+ data/autosuspend.hwdb                   | 1 +
+ libfprint/drivers/synaptics/synaptics.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
+index 342c6d0..ef81674 100644
+--- a/data/autosuspend.hwdb
++++ b/data/autosuspend.hwdb
+@@ -243,6 +243,7 @@ usb:v06CBp015F*
+ usb:v06CBp0104*
+ usb:v06CBp0173*
+ usb:v06CBp0106*
++usb:v06CBp019D*
+  ID_AUTOSUSPEND=1
+  ID_PERSIST=0
+
+diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
+index 138e734..7b7bf73 100644
+--- a/libfprint/drivers/synaptics/synaptics.c
++++ b/libfprint/drivers/synaptics/synaptics.c
+@@ -48,6 +48,7 @@ static const FpIdEntry id_table[] = {
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0104,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0173,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0106,  },
++  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x019D,  },
+   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
+ };
+
+--
+2.43.0
+

debian/patches/synaptics-add-new-PID-0x019F-0x109-and-0x10A.patch

@@ -0,0 +1,54 @@
+From: Aris Lin <aris.lin@synaptics.com>
+Date: Mon, 14 Jul 2025 11:52:56 +0800
+Subject: [PATCH] synaptics: add new PID 0x019F, 0x109 and 0x10A
+
+Origin: upstream, https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/7f5304d6eec37955c8d462e571c3d72af0be4684
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2133704
+Signed-off-by: Bin Li <binli@ubuntu.com>
+---
+ data/autosuspend.hwdb                   | 3 +++
+ libfprint/drivers/synaptics/synaptics.c | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
+index 7a1759e..10e643c 100644
+--- a/data/autosuspend.hwdb
++++ b/data/autosuspend.hwdb
+@@ -232,6 +232,8 @@ usb:v06CBp00F0*
+ usb:v06CBp0103*
+ usb:v06CBp0107*
+ usb:v06CBp0108*
++usb:v06CBp0109*
++usb:v06CBp010A*
+ usb:v06CBp0123*
+ usb:v06CBp0124*
+ usb:v06CBp0126*
+@@ -242,6 +244,7 @@ usb:v06CBp0104*
+ usb:v06CBp0173*
+ usb:v06CBp0106*
+ usb:v06CBp019D*
++usb:v06CBp019F*
+  ID_AUTOSUSPEND=1
+  ID_PERSIST=0
+ 
+diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
+index d272421..29fb5f1 100644
+--- a/libfprint/drivers/synaptics/synaptics.c
++++ b/libfprint/drivers/synaptics/synaptics.c
+@@ -41,6 +41,8 @@ static const FpIdEntry id_table[] = {
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0103,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0107,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0108,  },
++  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0109,  },
++  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x010A,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0123,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0124,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0126,  },
+@@ -51,6 +53,7 @@ static const FpIdEntry id_table[] = {
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0173,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0106,  },
+   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x019D,  },
++  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x019F,  },
+   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
+ };
+ 

debian/rules

@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = optimize=-lto
+export DPKG_GENSYMBOLS_CHECK_LEVEL = 2
+
+BUILDDIR = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
+
+# Configuration arguments
+CONFIG_ARGS = \
+	-Dudev_hwdb=enabled \
+	-Dudev_rules=enabled \
+	-Ddrivers=all \
+	-Dgtk-examples=false
+
+%:
+	dh $@ --with gir
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(CONFIG_ARGS)
+
+override_dh_auto_test:
+	dh_auto_test -- -C $(BUILDDIR) --timeout-multiplier 5
+
+override_dh_auto_clean:
+	rm -rf tests/__pycache__
+	dh_auto_clean

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/source/lintian-overrides

@@ -0,0 +1,3 @@
+# This TOD driver binary is built using sources inside this package
+# but at previous version, see tests/tod-drivers/README.md for more information
+libfprint source: source-is-missing [tests/tod-drivers/tod-*.so]

debian/tests/control

@@ -0,0 +1,6 @@
+Test-Command: gnome-desktop-testing-runner libfprint-2
+Features: test-name=installed-tests
+Classes: desktop
+Depends: gnome-desktop-testing,
+         libfprint-2-tests
+Restrictions: allow-stderr

debian/update-udev-triggers.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -e
+
+srcdir="${GBP_SOURCES_DIR:-.}"
+debpath="$(dirname "$0")"
+autosuspend_file="$srcdir/data/autosuspend.hwdb"
+commands_lines=()
+
+while IFS= read -r line; do
+    if [[ $line =~ ^usb:v([A-Fa-f0-9]{4})p([A-Fa-f0-9]{4}) ]]; then
+        vendor="$(echo "${BASH_REMATCH[1]}" | tr '[:upper:]' '[:lower:]')"
+        product="$(echo "${BASH_REMATCH[2]}" | tr '[:upper:]' '[:lower:]')"
+        commands_lines+=("\tudevadm trigger --action=add --attr-match=idVendor=$vendor --attr-match=idProduct=$product || true")
+    fi
+done < "$autosuspend_file"
+
+UDEVADM_TRIGGERS=$( IFS=$'\n'; echo -e "${commands_lines[*]}" )
+export UDEVADM_TRIGGERS
+
+for i in "$debpath"/libfprint-*.post*.in; do
+    out="${i%.in}"
+    perl -pe 's/\@UDEVADM_TRIGGERS\@/`printenv UDEVADM_TRIGGERS`/e' "$i" > "$out"
+
+    if [ -n "$GBP_BRANCH" ]; then
+        if ! git diff-index --quiet HEAD -- "$out"; then
+            git add "$out"
+            dch "${out#$srcdir}: Devices triggers updated"
+            git add debian/changelog
+            debcommit
+        fi
+    fi
+done

debian/upstream/metadata

@@ -0,0 +1,4 @@
+---
+Bug-Database: https://gitlab.freedesktop.org/3v1n0/libfprint/-/issues
+Bug-Submit: https://gitlab.freedesktop.org/3v1n0/libfprint/-/issues/new
+Repository-Browse: https://gitlab.freedesktop.org/3v1n0/libfprint/tree/tod

debian/watch

@@ -0,0 +1,5 @@
+version=4
+
+opts=versionmangle=s/_/./g \
+  https://gitlab.freedesktop.org/3v1n0/@PACKAGE@/tags \
+  .*\/archive\/[Vv]_?([\d_\+\.]+(?:\+git[0-9]+)?\+tod[0-9]+)\/@PACKAGE@-.*@ARCHIVE_EXT@

demo/gtk-libfprint-test.c

@@ -101,14 +101,11 @@ plot_minutiae (unsigned char *rgbdata,
 {
   int i;
 
-  #define write_pixel(num) \
-    do \
-      { \
-        rgbdata[((num) * 3)] = 0xff; \
-        rgbdata[((num) * 3) + 1] = 0; \
-        rgbdata[((num) * 3) + 2] = 0; \
-      } \
-    while(0)
+#define write_pixel(num) do { \
+            rgbdata[((num) * 3)] = 0xff; \
+            rgbdata[((num) * 3) + 1] = 0; \
+            rgbdata[((num) * 3) + 2] = 0; \
+  } while(0)
 
   for (i = 0; i < minutiae->len; i++)
     {

doc/libfprint-2-sections.txt

@@ -75,7 +75,6 @@ fp_device_clear_storage_sync
 fp_device_suspend_sync
 fp_device_resume_sync
 FpDevice
-FpTemperature
 </SECTION>
 
 <SECTION>
@@ -135,134 +134,6 @@ fpi_line_asmbl_ctx
 fpi_assemble_lines
 </SECTION>
 
-<SECTION>
-<FILE>fpi-byte-reader</FILE>
-<TITLE>FpiByteReader</TITLE>
-FpiByteReader
-fpi_byte_reader_new
-fpi_byte_reader_new_bytes
-fpi_byte_reader_free
-fpi_byte_reader_init
-fpi_byte_reader_init_bytes
-fpi_byte_reader_peek_sub_reader
-fpi_byte_reader_get_sub_reader
-fpi_byte_reader_set_pos
-fpi_byte_reader_get_pos
-fpi_byte_reader_get_remaining
-fpi_byte_reader_get_size
-fpi_byte_reader_skip
-fpi_byte_reader_get_bytes
-fpi_byte_reader_peek_bytes
-fpi_byte_reader_get_uint8
-fpi_byte_reader_get_int8
-fpi_byte_reader_peek_uint8
-fpi_byte_reader_peek_int8
-fpi_byte_reader_get_uint16_le
-fpi_byte_reader_get_int16_le
-fpi_byte_reader_peek_uint16_le
-fpi_byte_reader_peek_int16_le
-fpi_byte_reader_get_uint16_be
-fpi_byte_reader_get_int16_be
-fpi_byte_reader_peek_uint16_be
-fpi_byte_reader_peek_int16_be
-fpi_byte_reader_get_uint24_le
-fpi_byte_reader_get_int24_le
-fpi_byte_reader_peek_uint24_le
-fpi_byte_reader_peek_int24_le
-fpi_byte_reader_get_uint24_be
-fpi_byte_reader_get_int24_be
-fpi_byte_reader_peek_uint24_be
-fpi_byte_reader_peek_int24_be
-fpi_byte_reader_get_uint32_le
-fpi_byte_reader_get_int32_le
-fpi_byte_reader_peek_uint32_le
-fpi_byte_reader_peek_int32_le
-fpi_byte_reader_get_uint32_be
-fpi_byte_reader_get_int32_be
-fpi_byte_reader_peek_uint32_be
-fpi_byte_reader_peek_int32_be
-fpi_byte_reader_get_uint64_le
-fpi_byte_reader_get_int64_le
-fpi_byte_reader_peek_uint64_le
-fpi_byte_reader_peek_int64_le
-fpi_byte_reader_get_uint64_be
-fpi_byte_reader_get_int64_be
-fpi_byte_reader_peek_uint64_be
-fpi_byte_reader_peek_int64_be
-fpi_byte_reader_get_float32_le
-fpi_byte_reader_peek_float32_le
-fpi_byte_reader_get_float32_be
-fpi_byte_reader_peek_float32_be
-fpi_byte_reader_get_float64_le
-fpi_byte_reader_peek_float64_le
-fpi_byte_reader_get_float64_be
-fpi_byte_reader_peek_float64_be
-fpi_byte_reader_get_data
-fpi_byte_reader_peek_data
-fpi_byte_reader_get_data_static
-fpi_byte_reader_peek_data_static
-fpi_byte_reader_dup_data
-fpi_byte_reader_masked_scan_uint32
-fpi_byte_reader_masked_scan_uint32_peek
-fpi_byte_reader_skip_string
-fpi_byte_reader_skip_string_utf8
-fpi_byte_reader_skip_string_utf16
-fpi_byte_reader_skip_string_utf32
-fpi_byte_reader_peek_string
-fpi_byte_reader_peek_string_utf8
-fpi_byte_reader_get_string_utf8
-fpi_byte_reader_dup_string_utf8
-fpi_byte_reader_dup_string_utf16
-fpi_byte_reader_dup_string_utf32
-</SECTION>
-
-<SECTION>
-<FILE>fpi-byte-writer</FILE>
-<TITLE>FpiByteWriter</TITLE>
-FpiByteWriter
-fpi_byte_writer_new
-fpi_byte_writer_new_with_size
-fpi_byte_writer_new_with_data
-fpi_byte_writer_init
-fpi_byte_writer_init_with_size
-fpi_byte_writer_init_with_data
-fpi_byte_writer_reset
-fpi_byte_writer_reset_and_get_bytes
-fpi_byte_writer_reset_and_get_data
-fpi_byte_writer_free
-fpi_byte_writer_free_and_get_data
-fpi_byte_writer_get_remaining
-fpi_byte_writer_ensure_free_space
-fpi_byte_writer_put_bytes
-fpi_byte_writer_put_uint8
-fpi_byte_writer_put_uint16_be
-fpi_byte_writer_put_uint24_be
-fpi_byte_writer_put_uint32_be
-fpi_byte_writer_put_uint64_be
-fpi_byte_writer_put_uint16_le
-fpi_byte_writer_put_uint24_le
-fpi_byte_writer_put_uint32_le
-fpi_byte_writer_put_uint64_le
-fpi_byte_writer_put_int8
-fpi_byte_writer_put_int16_be
-fpi_byte_writer_put_int24_be
-fpi_byte_writer_put_int32_be
-fpi_byte_writer_put_int64_be
-fpi_byte_writer_put_int16_le
-fpi_byte_writer_put_int24_le
-fpi_byte_writer_put_int32_le
-fpi_byte_writer_put_int64_le
-fpi_byte_writer_put_float32_be
-fpi_byte_writer_put_float64_be
-fpi_byte_writer_put_float32_le
-fpi_byte_writer_put_float64_le
-fpi_byte_writer_put_string_utf8
-fpi_byte_writer_put_string_utf16
-fpi_byte_writer_put_string_utf32
-fpi_byte_writer_put_data
-fpi_byte_writer_fill
-</SECTION>
-
 <SECTION>
 <FILE>fpi-context</FILE>
 fpi_get_driver_types
@@ -282,7 +153,6 @@ fpi_device_get_current_action
 fpi_device_retry_new
 fpi_device_error_new
 fpi_device_retry_new_msg
-fpi_device_emulation_mode_enabled
 fpi_device_error_new_msg
 fpi_device_get_driver_data
 fpi_device_get_enroll_data
@@ -348,12 +218,9 @@ fpi_image_device_set_bz3_threshold
 <SECTION>
 <FILE>fpi-log</FILE>
 fp_dbg
-fp_dbg_hex_dump_bytes
-fp_dbg_hex_dump_data
 fp_info
 fp_warn
 fp_err
-fpi_log_is_debug_transfer_enabled
 BUG_ON
 BUG
 </SECTION>

doc/libfprint-docs.xml

@@ -48,12 +48,6 @@
       <xi:include href="xml/fpi-log.xml"/>
     </chapter>
 
-    <chapter id="driver-data">
-      <title>Binary buffer I/O</title>
-      <xi:include href="xml/fpi-byte-reader.xml"/>
-      <xi:include href="xml/fpi-byte-writer.xml"/>
-    </chapter>
-
     <chapter id="driver-img">
       <title>Image manipulation</title>
       <xi:include href="xml/fpi-image.xml"/>

examples/clear-storage.c

@@ -1,208 +0,0 @@
-/*
- * Example storage clearing program, which deletes all the
- * fingers which have been previously enrolled to disk.
- * Copyright (C) 2020 Marco Trevisan <marco.trevisan@canonical.com>
- * Copyright (C) 2024 Abhinav Baid <abhinavbaid@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#define FP_COMPONENT "example-clear-storage"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <libfprint/fprint.h>
-#include <glib-unix.h>
-
-#include "storage.h"
-#include "utilities.h"
-
-typedef struct _ClearStorageData
-{
-  GMainLoop    *loop;
-  GCancellable *cancellable;
-  unsigned int  sigint_handler;
-  int           ret_value;
-} ClearStorageData;
-
-static void
-clear_storage_data_free (ClearStorageData *clear_storage_data)
-{
-  g_clear_handle_id (&clear_storage_data->sigint_handler, g_source_remove);
-  g_clear_object (&clear_storage_data->cancellable);
-  g_main_loop_unref (clear_storage_data->loop);
-  g_free (clear_storage_data);
-}
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClearStorageData, clear_storage_data_free)
-
-static void
-on_device_closed (FpDevice *dev, GAsyncResult *res, void *user_data)
-{
-  g_autoptr(GError) error = NULL;
-  ClearStorageData *clear_storage_data = user_data;
-
-  fp_device_close_finish (dev, res, &error);
-
-  if (error)
-    g_warning ("Failed closing device %s", error->message);
-
-  g_main_loop_quit (clear_storage_data->loop);
-}
-
-static void
-clear_storage_quit (FpDevice         *dev,
-                    ClearStorageData *clear_storage_data)
-{
-  if (!fp_device_is_open (dev))
-    {
-      g_main_loop_quit (clear_storage_data->loop);
-      return;
-    }
-
-  fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed,
-                   clear_storage_data);
-}
-
-static void
-on_clear_storage_completed (FpDevice *dev, GAsyncResult *res, void *user_data)
-{
-  g_autoptr(GError) error = NULL;
-  ClearStorageData *clear_storage_data = user_data;
-
-  if (fp_device_clear_storage_finish (dev, res, &error))
-    {
-      if (!clear_saved_prints (dev, &error))
-        {
-          g_warning ("Clear saved prints from local storage failed: %s",
-                     error->message);
-          clear_storage_data->ret_value = EXIT_FAILURE;
-        }
-      else
-        {
-          g_print ("Clear storage successful!\n");
-          clear_storage_data->ret_value = EXIT_SUCCESS;
-        }
-
-      clear_storage_quit (dev, clear_storage_data);
-      return;
-    }
-
-  g_warning ("Failed to clear storage: %s", error->message);
-  clear_storage_data->ret_value = EXIT_FAILURE;
-
-  if (g_error_matches (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_NOT_SUPPORTED))
-    {
-      g_autoptr(GError) clear_error = NULL;
-
-      if (clear_saved_prints (dev, &clear_error))
-        clear_storage_data->ret_value = EXIT_SUCCESS;
-      else
-        g_warning ("Clear saved prints from local storage failed: %s",
-                   clear_error->message);
-    }
-
-  clear_storage_quit (dev, clear_storage_data);
-}
-
-static void
-start_clear_storage (FpDevice *dev, ClearStorageData *clear_storage_data)
-{
-  char buffer[20];
-
-  g_print ("Clear device storage? [y/N]? ");
-  if (fgets (buffer, sizeof (buffer), stdin) &&
-      (buffer[0] == 'Y' || buffer[0] == 'y'))
-    {
-      fp_device_clear_storage (dev, clear_storage_data->cancellable,
-                               (GAsyncReadyCallback) on_clear_storage_completed,
-                               clear_storage_data);
-      return;
-    }
-
-  clear_storage_quit (dev, clear_storage_data);
-}
-
-static void
-on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
-{
-  g_autoptr(GError) error = NULL;
-  ClearStorageData *clear_storage_data = user_data;
-
-  if (!fp_device_open_finish (dev, res, &error))
-    {
-      g_warning ("Failed to open device: %s", error->message);
-      clear_storage_quit (dev, clear_storage_data);
-      return;
-    }
-
-  g_print ("Opened device. ");
-
-  start_clear_storage (dev, clear_storage_data);
-}
-
-static gboolean
-sigint_cb (void *user_data)
-{
-  ClearStorageData *clear_storage_data = user_data;
-
-  g_cancellable_cancel (clear_storage_data->cancellable);
-
-  return G_SOURCE_CONTINUE;
-}
-
-int
-main (void)
-{
-  g_autoptr(FpContext) ctx = NULL;
-  g_autoptr(ClearStorageData) clear_storage_data = NULL;
-  GPtrArray *devices;
-  FpDevice *dev;
-
-  setenv ("G_MESSAGES_DEBUG", "all", 0);
-  setenv ("LIBUSB_DEBUG", "3", 0);
-
-  ctx = fp_context_new ();
-
-  devices = fp_context_get_devices (ctx);
-  if (!devices)
-    {
-      g_warning ("Impossible to get devices");
-      return EXIT_FAILURE;
-    }
-
-  dev = discover_device (devices);
-  if (!dev)
-    {
-      g_warning ("No devices detected.");
-      return EXIT_FAILURE;
-    }
-
-  clear_storage_data = g_new0 (ClearStorageData, 1);
-  clear_storage_data->ret_value = EXIT_FAILURE;
-  clear_storage_data->loop = g_main_loop_new (NULL, FALSE);
-  clear_storage_data->cancellable = g_cancellable_new ();
-  clear_storage_data->sigint_handler = g_unix_signal_add_full (G_PRIORITY_HIGH,
-                                                               SIGINT,
-                                                               sigint_cb,
-                                                               clear_storage_data,
-                                                               NULL);
-  fp_device_open (dev, clear_storage_data->cancellable,
-                  (GAsyncReadyCallback) on_device_opened,
-                  clear_storage_data);
-
-  g_main_loop_run (clear_storage_data->loop);
-
-  return clear_storage_data->ret_value;
-}

examples/meson.build

@@ -5,7 +5,6 @@ examples = [
     'img-capture',
     'manage-prints',
     'verify',
-    'clear-storage',
 ]
 
 foreach example: examples
@@ -27,3 +26,13 @@ if installed_tests
     install_subdir('prints',
         install_dir: installed_tests_testdir)
 endif
+
+if get_option('tod')
+    executable('tod-inspector',
+        sources: 'tod-inspector.c',
+        dependencies: [
+            libfprint_dep,
+            tod_dep,
+        ],
+    )
+endif

examples/storage.c

@@ -26,7 +26,6 @@
 #include "storage.h"
 
 #include <errno.h>
-#include <glib/gstdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -56,18 +55,6 @@ get_print_data_descriptor (FpPrint *print, FpDevice *dev, FpFinger finger)
                           finger);
 }
 
-static char *
-get_print_prefix_for_device (FpDevice *dev)
-{
-  const char *driver;
-  const char *dev_id;
-
-  driver = fp_device_get_driver (dev);
-  dev_id = fp_device_get_device_id (dev);
-
-  return g_strdup_printf ("%s/%s/", driver, dev_id);
-}
-
 static GVariantDict *
 load_data (void)
 {
@@ -182,6 +169,8 @@ gallery_data_load (FpDevice *dev)
   g_autoptr(GVariant) dict_variant = NULL;
   g_autofree char *dev_prefix = NULL;
   GPtrArray *gallery;
+  const char *driver;
+  const char *dev_id;
   GVariantIter iter;
   GVariant *value;
   gchar *key;
@@ -189,7 +178,9 @@ gallery_data_load (FpDevice *dev)
   gallery = g_ptr_array_new_with_free_func (g_object_unref);
   dict = load_data ();
   dict_variant = g_variant_dict_end (dict);
-  dev_prefix = get_print_prefix_for_device (dev);
+  driver = fp_device_get_driver (dev);
+  dev_id = fp_device_get_device_id (dev);
+  dev_prefix = g_strdup_printf ("%s/%s/", driver, dev_id);
 
   g_variant_iter_init (&iter, dict_variant);
   while (g_variant_iter_loop (&iter, "{sv}", &key, &value))
@@ -217,55 +208,6 @@ gallery_data_load (FpDevice *dev)
   return gallery;
 }
 
-gboolean
-clear_saved_prints (FpDevice *dev,
-                    GError  **error)
-{
-  g_autoptr(GVariantDict) dict = NULL;
-  g_autoptr(GVariantDict) updated_dict = NULL;
-  g_autoptr(GVariant) dict_variant = NULL;
-  g_autofree char *dev_prefix = NULL;
-  GPtrArray *print_keys;
-  GVariantIter iter;
-  GVariant *value;
-  gchar *key;
-
-  print_keys = g_ptr_array_new_with_free_func (g_free);
-  dict = load_data ();
-  dict_variant = g_variant_dict_end (dict);
-  dev_prefix = get_print_prefix_for_device (dev);
-
-  g_variant_iter_init (&iter, dict_variant);
-  while (g_variant_iter_loop (&iter, "{sv}", &key, &value))
-    {
-      if (!g_str_has_prefix (key, dev_prefix))
-        continue;
-
-      g_ptr_array_add (print_keys, g_strdup (key));
-    }
-
-  if (!print_keys->len)
-    return TRUE;
-
-  updated_dict = load_data ();
-
-  for (guint i = 0; i < print_keys->len; ++i)
-    {
-      key = g_ptr_array_index (print_keys, i);
-      if (!g_variant_dict_remove (updated_dict, key))
-        {
-          g_warning ("Print '%s' key not found!", key);
-          continue;
-        }
-
-      g_debug ("Dropping print '%s' from gallery", key);
-    }
-
-  save_data (g_variant_dict_end (updated_dict));
-
-  return TRUE;
-}
-
 FpPrint *
 print_create_template (FpDevice *dev, FpFinger finger, gboolean load_existing)
 {

examples/storage.h

@@ -20,17 +20,12 @@
 
 #pragma once
 
-#include <glib.h>
-#include <libfprint/fprint.h>
-
 int print_data_save (FpPrint *print,
                      FpFinger finger,
                      gboolean update_fingerprint);
 FpPrint * print_data_load (FpDevice *dev,
                            FpFinger  finger);
 GPtrArray * gallery_data_load (FpDevice *dev);
-gboolean clear_saved_prints (FpDevice *dev,
-                             GError  **error);
 FpPrint * print_create_template (FpDevice      *dev,
                                  FpFinger       finger,
                                  const gboolean load_existing);

examples/tod-inspector.c

@@ -0,0 +1,161 @@
+/*
+ * Shared library loader for libfprint
+ * Copyright (C) 2021 Marco Trevisan <marco.trevisan@canonical.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <libfprint/fprint.h>
+
+#include "libfprint/tod/tod-shared-loader.h"
+#include "libfprint/fpi-device.h"
+
+static char *
+id_table_to_string (FpDeviceType     device_type,
+                    const FpIdEntry *id_table)
+{
+  const FpIdEntry *entry;
+  char *str = NULL;
+
+  if (!id_table)
+    return g_strdup ("INVALID: Empty ID table");
+
+  entry = id_table;
+  while (TRUE)
+    {
+      g_autofree char *value = NULL;
+
+      if (device_type == FP_DEVICE_TYPE_VIRTUAL)
+        {
+          if (entry->virtual_envvar)
+            value = g_strdup (entry->virtual_envvar);
+        }
+      else if (device_type == FP_DEVICE_TYPE_USB)
+        {
+          if (entry->vid)
+            value = g_strdup_printf ("%04x:%04x", entry->vid, entry->pid);
+        }
+      else if (device_type == FP_DEVICE_TYPE_UDEV)
+        {
+          if (entry->hid_id.vid)
+            {
+              g_autofree gchar *udev_flags = NULL;
+
+              udev_flags = g_flags_to_string (fpi_device_udev_subtype_flags_get_type (),
+                                              entry->udev_types);
+              value = g_strdup_printf ("%s (%04x:%04x) [%s]",
+                                       entry->spi_acpi_id,
+                                       entry->hid_id.vid, entry->hid_id.pid,
+                                       udev_flags);
+            }
+          else
+            {
+              value = g_strdup (entry->spi_acpi_id);
+            }
+        }
+      else
+        {
+          return g_strdup ("Unsupported device type");
+        }
+
+      if (!value)
+        return str;
+
+      if (!str)
+        {
+          str = g_steal_pointer (&value);
+        }
+      else
+        {
+          g_autofree char *tmp = g_steal_pointer (&str);
+          str = g_strconcat (tmp, ", ", value, NULL);
+        }
+
+      entry++;
+    }
+
+  return str;
+}
+
+static const char *
+device_type_to_string (FpDeviceType device_type)
+{
+  g_autoptr(GEnumClass) device_types = g_type_class_ref (fp_device_type_get_type ());
+  GEnumValue *value = g_enum_get_value (device_types, device_type);
+
+  return value->value_nick;
+}
+
+static const char *
+scan_type_to_string (FpScanType scan_type)
+{
+  g_autoptr(GEnumClass) scan_types = g_type_class_ref (fp_scan_type_get_type ());
+  GEnumValue *value = g_enum_get_value (scan_types, scan_type);
+
+  return value->value_nick;
+}
+
+int
+main (void)
+{
+  g_autoptr(GArray) shared_drivers = NULL;
+  guint i;
+
+  tod_shared_drivers_register ();
+
+  shared_drivers = tod_shared_drivers_get ();
+  g_print ("Found %u drivers\n", shared_drivers->len);
+
+  for (i = 0; i < shared_drivers->len; i++)
+    {
+      GType driver = g_array_index (shared_drivers, GType, i);
+      g_autoptr(FpDeviceClass) cls = g_type_class_ref (driver);
+      g_autofree char *id_table = NULL;
+      g_autofree char *features = NULL;
+
+      id_table = id_table_to_string (cls->type, cls->id_table);
+      features = g_flags_to_string (fp_device_feature_get_type (), cls->features);
+
+      g_print ("ID: %s\n", cls->id);
+      g_print ("Full Name: %s\n", cls->full_name);
+      g_print ("Type: %s\n", device_type_to_string (cls->type));
+      g_print ("Enroll stages: %d\n", cls->nr_enroll_stages);
+      g_print ("Scan type: %s\n", scan_type_to_string (cls->scan_type));
+      g_print ("Seconds to get Hot: %d\n", cls->temp_hot_seconds);
+      g_print ("Seconds to get Cold: %d\n", cls->temp_cold_seconds);
+      g_print ("Supported Devices: %s\n", id_table);
+      g_print ("Supported features: %s\n", features);
+      g_print ("Implemented VFuncs:\n");
+      g_print ("  usb_discover: %s\n", cls->usb_discover ? "true" : "false");
+      g_print ("  probe: %s\n", cls->probe ? "true" : "false");
+      g_print ("  open: %s\n", cls->open ? "true" : "false");
+      g_print ("  close: %s\n", cls->close ? "true" : "false");
+      g_print ("  suspend: %s\n", cls->suspend ? "true" : "false");
+      g_print ("  resume: %s\n", cls->resume ? "true" : "false");
+      g_print ("  enroll: %s\n", cls->enroll ? "true" : "false");
+      g_print ("  verify: %s\n", cls->verify ? "true" : "false");
+      g_print ("  identify: %s\n", cls->identify ? "true" : "false");
+      g_print ("  capture: %s\n", cls->capture ? "true" : "false");
+      g_print ("  list: %s\n", cls->list ? "true" : "false");
+      g_print ("  delete: %s\n", cls->delete ? "true" : "false");
+      g_print ("  clear_storage: %s\n", cls->clear_storage ? "true" : "false");
+      g_print ("  cancel: %s\n", cls->cancel ? "true" : "false");
+
+      if (i < shared_drivers->len - 1)
+        g_print ("------------\n");
+    }
+
+  tod_shared_drivers_unregister ();
+}

gcovr.cfg

@@ -1 +0,0 @@
-gcov-ignore-parse-errors = suspicious_hits.warn

libfprint/drivers/aes1610.c

@@ -791,7 +791,7 @@ complete_deactivation (FpImageDevice *dev)
    * maybe we can do this with a master reset, unconditionally? */
 
   self->deactivating = FALSE;
-  g_slist_free_full (self->strips, g_free);
+  g_slist_free (self->strips);
   self->strips = NULL;
   self->strips_len = 0;
   self->blanks_count = 0;

libfprint/drivers/aes2501.c

@@ -213,8 +213,9 @@ sum_histogram_values (unsigned char *data, guint8 threshold)
   if (threshold > 0x0f)
     return -1;
 
+  /* FIXME endianness */
   for (i = threshold; i < 16; i++)
-    r += GUINT16_FROM_LE (histogram[i]);
+    r += histogram[i];
 
   return r;
 }
@@ -822,7 +823,7 @@ complete_deactivation (FpImageDevice *dev)
    * maybe we can do this with a master reset, unconditionally? */
 
   self->deactivating = FALSE;
-  g_slist_free_full (self->strips, g_free);
+  g_slist_free (self->strips);
   self->strips = NULL;
   self->strips_len = 0;
   fpi_image_device_deactivate_complete (dev, NULL);

libfprint/drivers/aes2550.c

@@ -57,7 +57,6 @@ struct _FpiDeviceAes2550
 
   GSList       *strips;
   size_t        strips_len;
-  gboolean      active;
   gboolean      deactivating;
   int           heartbeat_cnt;
 };
@@ -92,21 +91,11 @@ finger_det_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
                     gpointer user_data, GError *error)
 {
   FpImageDevice *dev = FP_IMAGE_DEVICE (device);
-  FpiDeviceAes2550 *self = FPI_DEVICE_AES2550 (device);
   unsigned char *data = transfer->buffer;
 
   if (error)
     {
-      /* The finger-detect loop is broken; it no longer has a pending
-       * operation. Clear the active flag so that the deactivation
-       * triggered by the session error (or an in-flight cancellation)
-       * can complete. */
-      self->active = FALSE;
-
-      if (self->deactivating)
-        complete_deactivation (dev);
-      else
-        fpi_image_device_session_error (dev, error);
+      fpi_image_device_session_error (FP_IMAGE_DEVICE (device), error);
       return;
     }
 
@@ -133,20 +122,10 @@ finger_det_reqs_cb (FpiUsbTransfer *t, FpDevice *device,
 {
   FpiUsbTransfer *transfer;
   FpImageDevice *dev = FP_IMAGE_DEVICE (device);
-  FpiDeviceAes2550 *self = FPI_DEVICE_AES2550 (device);
 
   if (error)
     {
-      /* The finger-detect loop is broken; it no longer has a pending
-       * operation. Clear the active flag so that the deactivation
-       * triggered by the session error (or an in-flight cancellation)
-       * can complete. */
-      self->active = FALSE;
-
-      if (self->deactivating)
-        complete_deactivation (dev);
-      else
-        fpi_image_device_session_error (dev, error);
+      fpi_image_device_session_error (dev, error);
       return;
     }
 
@@ -260,19 +239,13 @@ capture_set_idle_reqs_cb (FpiUsbTransfer *transfer,
       /* marking machine complete will re-trigger finger detection loop */
       fpi_ssm_mark_completed (transfer->ssm);
     }
-  else if (!error)
-    {
-      /* No image frames were captured (e.g. user tapped without swiping).
-       * Such case is quite easy to happen, since Super RSR is enabled and
-       * thus "Slices with 0-3 pixels of Y motion are discarded" according
-       * to the design specification manual. */
-      fpi_image_device_retry_scan (dev, FP_DEVICE_RETRY_TOO_SHORT);
-      fpi_image_device_report_finger_status (dev, FALSE);
-      fpi_ssm_mark_completed (transfer->ssm);
-    }
   else
     {
-      fpi_ssm_mark_failed (transfer->ssm, error);
+      if (error)
+        fpi_ssm_mark_failed (transfer->ssm, error);
+      else
+        fpi_ssm_mark_failed (transfer->ssm,
+                             fpi_device_error_new (FP_DEVICE_ERROR_PROTO));
     }
 }
 
@@ -398,11 +371,6 @@ capture_sm_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)
     }
   else if (error)
     {
-      /* The capture SSM has terminated, so no completion handler is left
-       * to observe the deactivation that the session error triggers.
-       * Clear the active flag so dev_deactivate() completes it directly.
-       */
-      self->active = FALSE;
       fpi_image_device_session_error (dev, error);
     }
   else
@@ -521,16 +489,12 @@ activate_run_state (FpiSsm *ssm, FpDevice *dev)
 static void
 activate_sm_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)
 {
-  FpiDeviceAes2550 *self = FPI_DEVICE_AES2550 (_dev);
   FpImageDevice *dev = FP_IMAGE_DEVICE (_dev);
 
   fpi_image_device_activate_complete (dev, error);
 
   if (!error)
-    {
-      self->active = TRUE;
-      start_finger_detection (dev);
-    }
+    start_finger_detection (dev);
 }
 
 static void
@@ -547,13 +511,6 @@ dev_deactivate (FpImageDevice *dev)
 {
   FpiDeviceAes2550 *self = FPI_DEVICE_AES2550 (dev);
 
-  if (!self->active)
-    {
-      /* No operation is pending, so complete it right away. */
-      complete_deactivation (dev);
-      return;
-    }
-
   self->deactivating = TRUE;
 }
 
@@ -565,7 +522,6 @@ complete_deactivation (FpImageDevice *dev)
   G_DEBUG_HERE ();
 
   self->deactivating = FALSE;
-  self->active = FALSE;
   g_slist_free (self->strips);
   self->strips = NULL;
   self->strips_len = 0;

libfprint/drivers/aesx660.c

@@ -384,15 +384,6 @@ capture_read_stripe_data_cb (FpiUsbTransfer *transfer,
 
       payload_length = priv->stripe_packet->data[AESX660_RESPONSE_SIZE_LSB_OFFSET] +
                        (priv->stripe_packet->data[AESX660_RESPONSE_SIZE_MSB_OFFSET] << 8);
-
-      if (payload_length > AESX660_BULK_TRANSFER_SIZE)
-        {
-          fp_dbg ("Oversized payload length %" G_GSSIZE_FORMAT ", discarding",
-                  payload_length);
-          g_byte_array_set_size (priv->stripe_packet, 0);
-          break;
-        }
-
       fp_dbg ("Got frame, type %.2x payload of size %.4lx",
               priv->stripe_packet->data[AESX660_RESPONSE_TYPE_OFFSET],
               (long) payload_length);
@@ -731,7 +722,7 @@ complete_deactivation (FpImageDevice *dev)
   G_DEBUG_HERE ();
 
   priv->deactivating = FALSE;
-  g_slist_free_full (priv->strips, g_free);
+  g_slist_free (priv->strips);
   priv->strips = NULL;
   priv->strips_len = 0;
   fpi_image_device_deactivate_complete (dev, NULL);

libfprint/drivers/egismoc/egis_etu905.h

@@ -1,188 +0,0 @@
-/*
- * Driver for Egis Technology (LighTuning) Match-On-Chip sensors
- *
- * 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 (FpiDeviceEgisEtu905, fpi_device_egis_etu905, FPI, DEVICE_EGIS_ETU905, FpDevice)
-
-#define EGIS_ETU905_DRIVER_FULLNAME "Egis Technology (LighTuning) Match-on-Chip"
-
-#define EGIS_ETU905_DRIVER_CHECK_PREFIX_TYPE1 (1 << 0)
-#define EGIS_ETU905_DRIVER_CHECK_PREFIX_TYPE2 (1 << 1)
-#define EGIS_ETU905_DRIVER_MAX_ENROLL_STAGES_20 (1 << 2)
-
-#define EGIS_ETU905_EP_CMD_OUT (0x02 | FPI_USB_ENDPOINT_OUT)
-#define EGIS_ETU905_EP_CMD_IN (0x81 | FPI_USB_ENDPOINT_IN)
-#define EGIS_ETU905_EP_CMD_INTERRUPT_IN 0x83
-
-#define EGIS_ETU905_USB_CONTROL_TIMEOUT 5000
-#define EGIS_ETU905_USB_SEND_TIMEOUT 5000
-#define EGIS_ETU905_USB_RECV_TIMEOUT 5000
-#define EGIS_ETU905_USB_INTERRUPT_TIMEOUT 0 /* No timeout for waiting for finger down */
-
-#define EGIS_ETU905_USB_IN_RECV_LENGTH 4096
-#define EGIS_ETU905_USB_INTERRUPT_IN_RECV_LENGTH 64
-
-#define EGIS_ETU905_MAX_ENROLL_STAGES_DEFAULT 12
-#define EGIS_ETU905_MAX_ENROLL_NUM 12
-#define EGIS_ETU905_FINGERPRINT_DATA_SIZE 32
-#define EGIS_ETU905_LIST_RESPONSE_PREFIX_SIZE 14
-#define EGIS_ETU905_LIST_RESPONSE_SUFFIX_SIZE 2
-
-#define EGIS_ETU905_PARA_4_SIZE 68
-
-#define EGIS_ETU905_PARA_1_VALUE 0
-#define EGIS_ETU905_PARA_2_VALUE 0
-#define EGIS_ETU905_PARA_3_VALUE 32
-
-/* standard prefixes for all read/writes */
-
-static const guchar egis_etu905_write_prefix[] = {'E', 'G', 'I', 'S', 0x00, 0x00, 0x00, 0x01};
-
-static const guchar egis_etu905_read_prefix[] = {'S', 'I', 'G', 'E', 0x00, 0x00, 0x00, 0x01};
-
-
-/* hard-coded command payloads */
-
-static const guchar cmd_fw_version[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x0c};
-static const guchar rsp_fw_version_suffix[] = {0x90, 0x00};
-
-static const guchar cmd_init[] = {0x00, 0x00, 0x00, 0x29, 0x50, 0x81, 0x80, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00,
-                                  0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x12, 0x00, 0x45, 0x67, 0x69, 0x73,
-                                  0x46, 0x50, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x51, 0xc6, 0xbd, 0x71};
-
-static const guchar cmd_list[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x19, 0x04, 0x00, 0x00, 0x01, 0x40};
-
-static const guchar cmd_sensor_reset[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x1a, 0x00, 0x00};
-
-static const guchar cmd_sensor_check[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x02, 0x00};
-
-static const guchar cmd_sensor_identify[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x01, 0x01};
-
-static const guchar rsp_identify_match_suffix[] = {0x90, 0x00};
-
-static const guchar rsp_identify_notmatch_suffix[] = {0x90, 0x04};
-
-static const guchar cmd_enroll_starting[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x01, 0x00, 0x00, 0x00, 0x20};
-static const guchar cmd_enroll_discard[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x04, 0x00, 0x00, 0x00, 0x20};
-
-
-static const guchar cmd_sensor_start_capture[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x16, 0x02, 0x01};
-
-static const guchar cmd_read_capture[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x02, 0x02, 0x00, 0x00, 0x02};
-
-static const guchar cmd_duplicate_check[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x16, 0x05, 0x00};
-
-static const guchar rsp_read_success_prefix[] = {0x00, 0x00, 0x00, 0x04};
-static const guchar rsp_read_success_suffix[] = {0x90, 0x00};
-static const guchar rsp_read_offcenter_prefix[] = {0x00, 0x00, 0x00, 0x04};
-static const guchar rsp_read_offcenter_suffix[] = {0x64, 0x91};
-static const guchar rsp_read_dirty_prefix[] = {0x00, 0x00, 0x00, 0x02, 0x64};
-
-static const guchar cmd_commit_starting[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x05, 0x00, 0x00, 0x00, 0x20};
-
-static const guchar cmd_identify_cancel[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x04, 0x01, 0x00};
-static const guchar cmd_identify_cancel_result[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x04, 0x02, 0x00};
-
-/* prefixes/suffixes and other things for dynamically created command payloads */
-
-#define EGIS_ETU905_CHECK_BYTES_LENGTH 2
-#define EGIS_ETU905_IDENTIFY_RESPONSE_PRINT_ID_OFFSET 46
-#define EGIS_ETU905_CMD_CHECK_SEPARATOR_LENGTH 32
-
-static const guchar cmd_new_print_prefix_type2[] = {0x00, 0x00, 0x00, 0x50, 0x50, 0x16, 0x03, 0x00, 0x00, 0x00, 0x49};
-
-static const guchar cmd_delete_prefix[] = {0x50, 0x18, 0x04, 0x00, 0x00};
-static const guchar rsp_delete_success_prefix[] = {0x00, 0x00, 0x00, 0x02, 0x90, 0x00};
-
-static const guchar cmd_check_prefix_type1[] = {0x50, 0x17, 0x03, 0x00, 0x00};
-static const guchar cmd_check_prefix_type2[] = {0x50, 0x17, 0x03, 0x80, 0x00};
-static const guchar cmd_check_suffix[] = {0x00, 0x40};
-static const guchar rsp_check_not_yet_enrolled_suffix[] = {0x90, 0x04};
-
-
-/* SSM task states and various status enums */
-
-typedef enum {
-  CMD_SEND,
-  CMD_GET,
-  CMD_STATES,
-} CommandStates;
-
-typedef enum {
-  DEV_GET_FW_VERSION,
-  DEV_INIT_CONTROL,
-  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_START,
-  ENROLL_CAPTURE_SENSOR_RESET,
-  ENROLL_CAPTURE_SENSOR_START_CAPTURE,
-  ENROLL_CAPTURE_WAIT_FINGER,
-  ENROLL_CAPTURE_READ_RESPONSE,
-  ENROLL_DUPLICATE_CHECK,
-  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;
-
-typedef enum {
-  CANCEL_SENSOR_RESET,
-  CANCEL_SEND_CANCEL,
-  CANCEL_SEND_CANCEL_RESULT,
-  CANCEL_STATES,
-} CancelStates;

libfprint/drivers/egismoc/egismoc.h

@@ -36,7 +36,6 @@ G_DECLARE_FINAL_TYPE (FpiDeviceEgisMoc, fpi_device_egismoc, FPI, DEVICE_EGISMOC,
 
 #define EGISMOC_DRIVER_CHECK_PREFIX_TYPE1 (1 << 0)
 #define EGISMOC_DRIVER_CHECK_PREFIX_TYPE2 (1 << 1)
-#define EGISMOC_DRIVER_MAX_ENROLL_STAGES_20 (1 << 2)
 
 #define EGISMOC_EP_CMD_OUT (0x02 | FPI_USB_ENDPOINT_OUT)
 #define EGISMOC_EP_CMD_IN (0x81 | FPI_USB_ENDPOINT_IN)
@@ -50,7 +49,7 @@ G_DECLARE_FINAL_TYPE (FpiDeviceEgisMoc, fpi_device_egismoc, FPI, DEVICE_EGISMOC,
 #define EGISMOC_USB_IN_RECV_LENGTH 4096
 #define EGISMOC_USB_INTERRUPT_IN_RECV_LENGTH 64
 
-#define EGISMOC_MAX_ENROLL_STAGES_DEFAULT 10
+#define EGISMOC_ENROLL_TIMES 10
 #define EGISMOC_MAX_ENROLL_NUM 10
 #define EGISMOC_FINGERPRINT_DATA_SIZE 32
 #define EGISMOC_LIST_RESPONSE_PREFIX_SIZE 14
@@ -59,39 +58,59 @@ G_DECLARE_FINAL_TYPE (FpiDeviceEgisMoc, fpi_device_egismoc, FPI, DEVICE_EGISMOC,
 /* 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 guchar rsp_read_success_suffix[] = {0x90, 0x00};
+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 guchar rsp_read_offcenter_suffix[] = {0x64, 0x91};
+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 */
@@ -114,14 +133,21 @@ static guchar cmd_commit_starting[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x05,
 #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 */

libfprint/drivers/elan.c

@@ -146,7 +146,7 @@ elan_save_frame (FpiDeviceElan *self, unsigned short *frame)
           raw_idx = frame_margin + y + x * raw_height;
         frame_idx = x + y * frame_width;
         frame[frame_idx] =
-          GUINT16_FROM_LE (((unsigned short *) self->last_read)[raw_idx]);
+          ((unsigned short *) self->last_read)[raw_idx];
       }
 }
 
@@ -251,12 +251,7 @@ elan_process_frame_linear (unsigned short *raw_frame,
         max = raw_frame[i];
     }
 
-  if (max == min)
-    {
-      memset (frame->data, 0, frame_size);
-      *frames = g_slist_prepend (*frames, frame);
-      g_return_if_reached ();
-    }
+  g_assert (max != min);
 
   unsigned short px;
 
@@ -292,11 +287,6 @@ elan_process_frame_thirds (unsigned short *raw_frame,
   lvl3 = sorted[frame_size - 1];
   g_free (sorted);
 
-  /* Ensure levels are strictly monotonic to prevent division by zero */
-  lvl1 = MAX (lvl1, lvl0 + 1);
-  lvl2 = MAX (lvl2, lvl1 + 1);
-  lvl3 = MAX (lvl3, lvl2 + 1);
-
   unsigned short px;
 
   for (int i = 0; i < frame_size; i++)
@@ -557,17 +547,10 @@ capture_run_state (FpiSsm *ssm, FpDevice *dev)
           fpi_image_device_report_finger_status (idev, TRUE);
           elan_run_cmd (ssm, dev, &get_image_cmd, ELAN_CMD_TIMEOUT);
         }
-      else if (self->dev_type == ELAN_0C58 && self->last_read &&
-               (self->last_read[0] == 0x00 || self->last_read[0] == 0xaf))
-        {
-          /* 0x00 - not ready
-           * 0xaf - finger removed or sensor busy (seen on 0x0c58) */
-          fpi_ssm_jump_to_state_delayed (ssm, CAPTURE_WAIT_FINGER, 10);
-        }
       else
         {
           /* XXX: The timeout is emulated incorrectly, resulting in a zero byte read. */
-          if (fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
+          if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
             fpi_ssm_mark_completed (ssm);
           else
             fpi_ssm_mark_failed (ssm, fpi_device_error_new (FP_DEVICE_ERROR_PROTO));
@@ -812,7 +795,7 @@ elan_calibrate (FpiDeviceElan *self)
 
   g_return_if_fail (!self->active);
   self->active = TRUE;
-  self->calib_atts_left = ELAN_CALIBRATION_ATTEMPTS (self->dev_type);
+  self->calib_atts_left = ELAN_CALIBRATION_ATTEMPTS;
 
   FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (self), calibrate_run_state,
                              CALIBRATE_NUM_STATES);

libfprint/drivers/elan.h

@@ -31,7 +31,6 @@
 #define ELAN_0907 (1 << 0)
 #define ELAN_0C03 (1 << 1)
 #define ELAN_0C42 (1 << 2)
-#define ELAN_0C58 (1 << 3)
 
 /* devices which don't require frame rotation before assembling */
 #define ELAN_NOT_ROTATED ELAN_0C03
@@ -45,9 +44,7 @@
 
 /* times to retry reading calibration status during one session
  * generally prevents calibration from looping indefinitely */
-#define ELAN_DEFAULT_CALIBRATION_ATTEMPTS 10
-#define ELAN_CALIBRATION_ATTEMPTS(dev_type) \
-  ((dev_type) == ELAN_0C58 ? 30 : ELAN_DEFAULT_CALIBRATION_ATTEMPTS)
+#define ELAN_CALIBRATION_ATTEMPTS 10
 
 /* min and max frames in a capture */
 #define ELAN_MIN_FRAMES 7
@@ -223,7 +220,7 @@ static const FpIdEntry elan_id_table[] = {
   {.vid = ELAN_VEND_ID,  .pid = 0x0c4f, .driver_data = ELAN_ALL_DEV},
   {.vid = ELAN_VEND_ID,  .pid = 0x0c63, .driver_data = ELAN_ALL_DEV},
   {.vid = ELAN_VEND_ID,  .pid = 0x0c6e, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c58, .driver_data = ELAN_0C58},
+  {.vid = ELAN_VEND_ID,  .pid = 0x0c58, .driver_data = ELAN_ALL_DEV},
   {.vid = 0,  .pid = 0,  .driver_data = 0},
 };
 

libfprint/drivers/elanmoc/elanmoc.c

@@ -31,16 +31,7 @@ static const FpIdEntry id_table[] = {
   { .vid = 0x04f3,  .pid = 0x0c88,  },
   { .vid = 0x04f3,  .pid = 0x0c8c,  },
   { .vid = 0x04f3,  .pid = 0x0c8d,  },
-  { .vid = 0x04f3,  .pid = 0x0c98,  },
   { .vid = 0x04f3,  .pid = 0x0c99,  },
-  { .vid = 0x04f3,  .pid = 0x0c9c,  },
-  { .vid = 0x04f3,  .pid = 0x0c9d,  },
-  { .vid = 0x04f3,  .pid = 0x0c9f,  },
-  { .vid = 0x04f3,  .pid = 0x0ca3,  },
-  { .vid = 0x04f3,  .pid = 0x0ca7,  },
-  { .vid = 0x04f3,  .pid = 0x0ca8,  },
-  { .vid = 0x04f3,  .pid = 0x0cb0,  },
-  { .vid = 0x04f3,  .pid = 0x0cb2,  },
   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
 
@@ -137,10 +128,10 @@ fp_cmd_receive_cb (FpiUsbTransfer *transfer,
 }
 
 typedef enum {
-  ELAN_MOC_CMD_SEND = 0,
-  ELAN_MOC_CMD_GET,
-  ELAN_MOC_CMD_NUM_STATES,
-} ElanMocCmdState;
+  FP_CMD_SEND = 0,
+  FP_CMD_GET,
+  FP_CMD_NUM_STATES,
+} FpCmdState;
 
 static void
 fp_cmd_run_state (FpiSsm   *ssm,
@@ -151,7 +142,7 @@ fp_cmd_run_state (FpiSsm   *ssm,
 
   switch (fpi_ssm_get_cur_state (ssm))
     {
-    case ELAN_MOC_CMD_SEND:
+    case FP_CMD_SEND:
       if (self->cmd_transfer)
         {
           self->cmd_transfer->ssm = ssm;
@@ -167,7 +158,7 @@ fp_cmd_run_state (FpiSsm   *ssm,
         }
       break;
 
-    case ELAN_MOC_CMD_GET:
+    case FP_CMD_GET:
       if (self->cmd_len_in == 0)
         {
           CommandData *data = fpi_ssm_get_data (ssm);
@@ -234,7 +225,7 @@ elanmoc_get_cmd (FpDevice *device, guint8 *buffer_out,
 
   self->cmd_ssm = fpi_ssm_new (FP_DEVICE (self),
                                fp_cmd_run_state,
-                               ELAN_MOC_CMD_NUM_STATES);
+                               FP_CMD_NUM_STATES);
 
   fpi_ssm_set_data (self->cmd_ssm, data, (GDestroyNotify) fp_cmd_ssm_done_data_free);
 
@@ -390,20 +381,11 @@ elanmoc_enroll_cb (FpiDeviceElanmoc *self,
         }
 
       if (self->num_frames == self->max_moc_enroll_time && buffer_in[1] == ELAN_MSG_OK)
-        {
-          fpi_ssm_next_state (self->task_ssm);
-        }
+        fpi_ssm_next_state (self->task_ssm);
       else if (self->num_frames < self->max_moc_enroll_time)
-        {
-          fpi_ssm_jump_to_state (self->task_ssm, MOC_ENROLL_WAIT_FINGER);
-        }
+        fpi_ssm_jump_to_state (self->task_ssm, MOC_ENROLL_WAIT_FINGER);
       else
-        {
-          fpi_ssm_mark_failed (self->task_ssm,
-                               fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                         "Enrollment failed (status 0x%02x)",
-                                                         buffer_in[1]));
-        }
+        fpi_ssm_mark_failed (self->task_ssm, error);
     }
 }
 
@@ -648,6 +630,7 @@ elanmoc_match_report_cb (FpiDeviceElanmoc *self,
 {
   FpDevice *device = FP_DEVICE (self);
   FpPrint *print = NULL;
+  FpPrint *verify_print = NULL;
   GPtrArray *prints;
   gboolean found = FALSE;
   guint index;
@@ -676,18 +659,31 @@ elanmoc_match_report_cb (FpiDeviceElanmoc *self,
 
   fp_info ("Verify/Identify successful for: %s", fp_print_get_description (print));
 
-  fpi_device_get_identify_data (device, &prints);
-  found = g_ptr_array_find_with_equal_func (prints,
-                                            print,
-                                            (GEqualFunc) fp_print_equal,
-                                            &index);
+  if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_IDENTIFY)
+    {
+      fpi_device_get_identify_data (device, &prints);
+      found = g_ptr_array_find_with_equal_func (prints,
+                                                print,
+                                                (GEqualFunc) fp_print_equal,
+                                                &index);
 
-  if (found)
-    fpi_device_identify_report (device, g_ptr_array_index (prints, index), print, NULL);
+      if (found)
+        fpi_device_identify_report (device, g_ptr_array_index (prints, index), print, NULL);
+      else
+        fpi_device_identify_report (device, NULL, print, NULL);
+
+      fpi_device_identify_complete (device, NULL);
+    }
   else
-    fpi_device_identify_report (device, NULL, print, NULL);
+    {
+      fpi_device_get_verify_data (device, &verify_print);
 
-  fpi_device_identify_complete (device, NULL);
+      if (fp_print_equal (verify_print, print))
+        fpi_device_verify_report (device, FPI_MATCH_SUCCESS, print, NULL);
+      else
+        fpi_device_verify_report (device, FPI_MATCH_FAIL, print, NULL);
+      fpi_device_verify_complete (device, NULL);
+    }
 }
 
 static void
@@ -699,7 +695,10 @@ identify_status_report (FpiDeviceElanmoc *self, int verify_status_id,
 
   if (error)
     {
-      fpi_device_identify_complete (device, error);
+      if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_VERIFY)
+        fpi_device_verify_complete (device, error);
+      else
+        fpi_device_identify_complete (device, error);
       return;
     }
 
@@ -709,8 +708,16 @@ identify_status_report (FpiDeviceElanmoc *self, int verify_status_id,
       {
         if (data == ELAN_MSG_VERIFY_ERR)
           {
-            fpi_device_identify_report (device, NULL, NULL, NULL);
-            fpi_device_identify_complete (device, NULL);
+            if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_VERIFY)
+              {
+                fpi_device_verify_report (device, FPI_MATCH_FAIL, NULL, NULL);
+                fpi_device_verify_complete (device, NULL);
+              }
+            else
+              {
+                fpi_device_identify_report (device, NULL, NULL, NULL);
+                fpi_device_identify_complete (device, NULL);
+              }
           }
         else
           {
@@ -729,15 +736,23 @@ identify_status_report (FpiDeviceElanmoc *self, int verify_status_id,
                 retry_error = fpi_device_retry_new (FP_DEVICE_RETRY_GENERAL);
               }
 
-            fpi_device_identify_report (device, NULL, NULL, retry_error);
-            fpi_device_identify_complete (device, NULL);
+            if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_VERIFY)
+              {
+                fpi_device_verify_report (device, FPI_MATCH_ERROR, NULL, retry_error);
+                fpi_device_verify_complete (device, NULL);
+              }
+            else
+              {
+                fpi_device_identify_report (device, NULL, NULL, retry_error);
+                fpi_device_identify_complete (device, NULL);
+              }
           }
         break;
       }
 
     case RSP_VERIFY_OK:
       {
-        fp_dbg ("Identify was successful! for user: %d mesg_code: %d ", data, verify_status_id);
+        fp_dbg ("Verify was successful! for user: %d mesg_code: %d ", data, verify_status_id);
         cmd_buf = elanmoc_compose_cmd (&elanmoc_get_userid_cmd);
         cmd_buf[2] = data;
         elanmoc_get_cmd (device, cmd_buf, elanmoc_get_userid_cmd.cmd_len, elanmoc_get_userid_cmd.resp_len, 0, elanmoc_match_report_cb);
@@ -791,7 +806,7 @@ elan_identify_run_state (FpiSsm *ssm, FpDevice *dev)
       break;
 
     case IDENTIFY_WAIT_FINGER:
-      fp_info ("elanmoc %s IDENTIFY_WAIT_FINGER", __func__);
+      fp_info ("elanmoc %s VERIFY_WAIT_FINGER", __func__);
       cmd_buf = elanmoc_compose_cmd (&elanmoc_verify_cmd);
       elanmoc_get_cmd (dev, cmd_buf, elanmoc_verify_cmd.cmd_len, elanmoc_verify_cmd.resp_len, 1, elanmoc_identify_cb);
       break;
@@ -1151,6 +1166,7 @@ fpi_device_elanmoc_class_init (FpiDeviceElanmocClass *klass)
 
   dev_class->open = elanmoc_open;
   dev_class->close = elanmoc_close;
+  dev_class->verify = elanmoc_identify;
   dev_class->enroll = elanmoc_enroll;
   dev_class->identify = elanmoc_identify;
   dev_class->delete = elanmoc_delete_print;

libfprint/drivers/elanspi.c

@@ -23,9 +23,9 @@
 #include "drivers_api.h"
 #include "elanspi.h"
 
-#include <fcntl.h>
 #include <linux/hidraw.h>
 #include <sys/ioctl.h>
+#include <sys/fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <linux/types.h>
@@ -94,7 +94,7 @@ static void
 elanspi_do_hwreset (FpiDeviceElanSpi *self, GError **err)
 {
   /* Skip in emulation mode, since we don't mock hid devices */
-  if (fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
+  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
     return;
 
   /*
@@ -485,8 +485,7 @@ elanspi_capture_old_handler (FpiSsm *ssm, FpDevice *dev)
       if (!(self->sensor_status & 4))
         {
           /* has the timeout expired? -- disabled in testing since valgrind is very slow */
-          if (g_get_monotonic_time () > self->capture_timeout &&
-              !fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
+          if (g_get_monotonic_time () > self->capture_timeout && g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") != 0)
             {
               /* end with a timeout */
               fpi_ssm_mark_failed (ssm, g_error_new (G_IO_ERROR, G_IO_ERROR_TIMED_OUT, "timed out waiting for new line"));

libfprint/drivers/elanspi.h

@@ -340,11 +340,9 @@ static const struct elanspi_regtable elanspi_calibration_table_new_page1 = {
 
 // using checkargs ACPI:HIDPID
 static const FpIdEntry elanspi_id_table[] = {
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x2766}, .driver_data = ELANSPI_NO_ROTATE},
   {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x3057}, .driver_data = ELANSPI_180_ROTATE},
   {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x3087}, .driver_data = ELANSPI_180_ROTATE},
   {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x30c6}, .driver_data = ELANSPI_180_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x3128}, .driver_data = ELANSPI_90LEFT_ROTATE},
   {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN70A1", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x3134}, .driver_data = ELANSPI_90LEFT_ROTATE},
   {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x3148}, .driver_data = ELANSPI_180_ROTATE},
   {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x30b2}, .driver_data = ELANSPI_NO_ROTATE},

libfprint/drivers/etes603.c

@@ -338,14 +338,7 @@ msg_parse_regs (FpiDeviceEtes603 *dev)
   struct egis_msg *msg_req = dev->req;
   struct egis_msg *msg_ans = dev->ans;
 
-  g_return_val_if_fail (dev->ans_len >= MSG_HDR_SIZE, -1);
-
   n_args = dev->ans_len - MSG_HDR_SIZE;
-  if (n_args > REG_MAX)
-    {
-      g_warn_if_reached ();
-      n_args = REG_MAX;
-    }
 
   if (msg_header_check (msg_ans))
     return -1;
@@ -582,24 +575,12 @@ static void
 process_removefpi_end (FpiDeviceEtes603 *dev)
 {
   unsigned int i;
-
-  /* Need at least the 2-line empty pattern to compare against. */
-  if (dev->fp_height < 2)
-    g_return_if_reached ();
-
   /* 2 last lines with Fly-Estimation are the empty pattern. */
   guint8 *pattern = dev->fp + (dev->fp_height - 2) * FE_WIDTH / 2;
 
   for (i = 2; i < dev->fp_height; i += 2)
     if (memcmp (pattern, pattern - (i * FE_WIDTH / 2), FE_WIDTH))
       break;
-
-  if (i > dev->fp_height)
-    {
-      g_warn_if_reached ();
-      i = dev->fp_height;
-    }
-
   dev->fp_height -= i;
   fp_dbg ("Removing %d empty lines from image", i - 2);
 }

libfprint/drivers/focaltech_moc/focaltech_moc.c

@@ -22,9 +22,6 @@
 
 #define FP_COMPONENT "focaltech_moc"
 
-#define FOCALTECH_QUIRK_SINGLE_SLOT 1
-#define FOCALTECH_MOC_STATIC_USER_ID "focaltech_moc_static_id"
-
 #include "drivers_api.h"
 
 G_DEFINE_TYPE (FpiDeviceFocaltechMoc, fpi_device_focaltech_moc, FP_TYPE_DEVICE)
@@ -32,17 +29,7 @@ G_DEFINE_TYPE (FpiDeviceFocaltechMoc, fpi_device_focaltech_moc, FP_TYPE_DEVICE)
 static const FpIdEntry id_table[] = {
   { .vid = 0x2808,  .pid = 0x9e48,  },
   { .vid = 0x2808,  .pid = 0xd979,  },
-  { .vid = 0x2808,  .pid = 0xa27a,  },
   { .vid = 0x2808,  .pid = 0xa959,  },
-  { .vid = 0x2808,  .pid = 0xa99a,  },
-  { .vid = 0x2808,  .pid = 0xa57a,  },
-  { .vid = 0x2808,  .pid = 0xa78a,  },
-  { .vid = 0x2808,  .pid = 0xa97a,  },
-  { .vid = 0x2808,  .pid = 0x1579,  },
-  { .vid = 0x2808,  .pid = 0x077A,  },
-  { .vid = 0x2808,  .pid = 0x079A,  },
-  { .vid = 0x2808,  .pid = 0x5158,  },
-  { .vid = 0x2808,  .pid = 0x6553,  .driver_data = FOCALTECH_QUIRK_SINGLE_SLOT, },
   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
 
@@ -199,22 +186,6 @@ focaltech_moc_check_cmd (uint8_t *response_buf, uint16_t len)
   return ret;
 }
 
-static gboolean
-focaltech_moc_require_response_len (FpiDeviceFocaltechMoc *self,
-                                    gsize                  length_in,
-                                    gsize                  minimum_length,
-                                    const char            *context)
-{
-  if (length_in >= minimum_length)
-    return TRUE;
-
-  fpi_ssm_mark_failed (self->task_ssm,
-                       fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                 "%s: short response (%zu < %zu)",
-                                                 context, length_in, minimum_length));
-  return FALSE;
-}
-
 static void
 fp_cmd_receive_cb (FpiUsbTransfer *transfer,
                    FpDevice       *device,
@@ -261,10 +232,10 @@ fp_cmd_receive_cb (FpiUsbTransfer *transfer,
 }
 
 typedef enum {
-  FOCALTECH_CMD_SEND = 0,
-  FOCALTECH_CMD_GET,
-  FOCALTECH_CMD_NUM_STATES,
-} FocaltechCmdState;
+  FP_CMD_SEND = 0,
+  FP_CMD_GET,
+  FP_CMD_NUM_STATES,
+} FpCmdState;
 
 static void
 fp_cmd_run_state (FpiSsm   *ssm,
@@ -275,7 +246,7 @@ fp_cmd_run_state (FpiSsm   *ssm,
 
   switch (fpi_ssm_get_cur_state (ssm))
     {
-    case FOCALTECH_CMD_SEND:
+    case FP_CMD_SEND:
       if (self->cmd_transfer)
         {
           self->cmd_transfer->ssm = ssm;
@@ -292,7 +263,7 @@ fp_cmd_run_state (FpiSsm   *ssm,
 
       break;
 
-    case FOCALTECH_CMD_GET:
+    case FP_CMD_GET:
       if (self->cmd_len_in == 0)
         {
           CommandData *data = fpi_ssm_get_data (ssm);
@@ -360,7 +331,7 @@ focaltech_moc_get_cmd (FpDevice *device, guint8 *buffer_out,
 
   self->cmd_ssm = fpi_ssm_new (FP_DEVICE (self),
                                fp_cmd_run_state,
-                               FOCALTECH_CMD_NUM_STATES);
+                               FP_CMD_NUM_STATES);
 
   fpi_ssm_set_data (self->cmd_ssm, data, (GDestroyNotify) fp_cmd_ssm_done_data_free);
 
@@ -460,16 +431,15 @@ get_g_usb_device_direction_des (GUsbDeviceDirection dir)
     }
 }
 
-static gboolean
-usb_claim_interface_probe (FpDevice *device, gboolean claim, GError **error)
+static int
+usb_claim_interface_probe (FpDevice *device, int claim, GError **error)
 {
   g_autoptr(GPtrArray) interfaces = NULL;
   FpiDeviceFocaltechMoc *self = FPI_DEVICE_FOCALTECH_MOC (device);
+  int ret = -1;
   int i;
 
   interfaces = g_usb_device_get_interfaces (fpi_device_get_usb_device (device), error);
-  if (interfaces == NULL)
-    return FALSE;
 
   for (i = 0; i < interfaces->len; i++)
     {
@@ -481,9 +451,11 @@ usb_claim_interface_probe (FpDevice *device, gboolean claim, GError **error)
               g_usb_interface_get_subclass (cur_iface),
               g_usb_interface_get_protocol (cur_iface));
 
-      if (claim)
+      if (claim == 1)
         {
-          for (int j = 0; j < endpoints->len; j++)
+          int j;
+
+          for (j = 0; j < endpoints->len; j++)
             {
               GUsbEndpoint *endpoint = g_ptr_array_index (endpoints, j);
               GBytes *bytes = g_usb_endpoint_get_extra (endpoint);
@@ -510,17 +482,21 @@ usb_claim_interface_probe (FpDevice *device, gboolean claim, GError **error)
           if (!g_usb_device_claim_interface (fpi_device_get_usb_device (device),
                                              g_usb_interface_get_number (cur_iface),
                                              0, error))
-            return FALSE;
+            return ret;
         }
       else if (!g_usb_device_release_interface (fpi_device_get_usb_device (device),
                                                 g_usb_interface_get_number (cur_iface),
                                                 0, error))
         {
-          return FALSE;
+          return ret;
         }
+
+
     }
 
-  return TRUE;
+  ret = 0;
+
+  return ret;
 }
 
 static void
@@ -529,7 +505,7 @@ task_ssm_init_done (FpiSsm *ssm, FpDevice *device, GError *error)
   FpiDeviceFocaltechMoc *self = FPI_DEVICE_FOCALTECH_MOC (device);
 
   if (error)
-    usb_claim_interface_probe (device, FALSE, NULL);
+    usb_claim_interface_probe (device, 0, &error);
 
   fpi_device_open_complete (FP_DEVICE (self), g_steal_pointer (&error));
 }
@@ -644,8 +620,8 @@ dev_init_handler (FpiSsm *ssm, FpDevice *device)
 static void
 focaltech_moc_open (FpDevice *device)
 {
-  g_autoptr(GError) error = NULL;
   FpiDeviceFocaltechMoc *self = FPI_DEVICE_FOCALTECH_MOC (device);
+  GError *error = NULL;
 
   if (!g_usb_device_reset (fpi_device_get_usb_device (device), &error))
     {
@@ -653,7 +629,7 @@ focaltech_moc_open (FpDevice *device)
       return;
     }
 
-  if (!usb_claim_interface_probe (device, TRUE, &error))
+  if (usb_claim_interface_probe (device, 1, &error) != 0)
     {
       fpi_device_open_complete (FP_DEVICE (self), g_steal_pointer (&error));
       return;
@@ -669,7 +645,12 @@ task_ssm_exit_done (FpiSsm *ssm, FpDevice *device, GError *error)
   FpiDeviceFocaltechMoc *self = FPI_DEVICE_FOCALTECH_MOC (device);
 
   if (!error)
-    usb_claim_interface_probe (device, FALSE, &error);
+    {
+      GError *local_error = NULL;
+
+      if (usb_claim_interface_probe (device, 0, &local_error) < 0)
+        g_propagate_error (&error, g_steal_pointer (&local_error));
+    }
 
   fpi_device_close_complete (FP_DEVICE (self), error);
   self->task_ssm = NULL;
@@ -807,8 +788,16 @@ focaltech_moc_identify_capture_cb (FpiDeviceFocaltechMoc *self,
         }
       else
         {
-          fpi_device_identify_report (FP_DEVICE (self), NULL, NULL, error);
-          fpi_device_identify_complete (FP_DEVICE (self), NULL);
+          if (fpi_device_get_current_action (FP_DEVICE (self)) == FPI_DEVICE_ACTION_VERIFY)
+            {
+              fpi_device_verify_report (FP_DEVICE (self), FPI_MATCH_ERROR, NULL, error);
+              fpi_device_verify_complete (FP_DEVICE (self), NULL);
+            }
+          else
+            {
+              fpi_device_identify_report (FP_DEVICE (self), NULL, NULL, error);
+              fpi_device_identify_complete (FP_DEVICE (self), NULL);
+            }
 
           fpi_ssm_mark_failed (self->task_ssm, fpi_device_retry_new (FP_DEVICE_RETRY_GENERAL));
         }
@@ -822,27 +811,50 @@ identify_status_report (FpiDeviceFocaltechMoc *self, FpPrint *print, GError *err
 
   if (print == NULL)
     {
-      fpi_device_identify_report (device, NULL, NULL, NULL);
-      fpi_device_identify_complete (device, NULL);
+      if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_IDENTIFY)
+        {
+          fpi_device_identify_report (device, NULL, NULL, NULL);
+          fpi_device_identify_complete (device, NULL);
+        }
+      else
+        {
+          fpi_device_verify_report (device, FPI_MATCH_FAIL, NULL, NULL);
+          fpi_device_verify_complete (device, NULL);
+        }
     }
   else
     {
-      GPtrArray *prints;
-      gboolean found = FALSE;
-      guint index;
+      if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_IDENTIFY)
+        {
+          GPtrArray *prints;
+          gboolean found = FALSE;
+          guint index;
 
-      fpi_device_get_identify_data (device, &prints);
-      found = g_ptr_array_find_with_equal_func (prints,
-                                                print,
-                                                (GEqualFunc) fp_print_equal,
-                                                &index);
+          fpi_device_get_identify_data (device, &prints);
+          found = g_ptr_array_find_with_equal_func (prints,
+                                                    print,
+                                                    (GEqualFunc) fp_print_equal,
+                                                    &index);
 
-      if (found)
-        fpi_device_identify_report (device, g_ptr_array_index (prints, index), print, NULL);
+          if (found)
+            fpi_device_identify_report (device, g_ptr_array_index (prints, index), print, NULL);
+          else
+            fpi_device_identify_report (device, NULL, print, NULL);
+
+          fpi_device_identify_complete (device, NULL);
+        }
       else
-        fpi_device_identify_report (device, NULL, print, NULL);
+        {
+          FpPrint *verify_print = NULL;
+          fpi_device_get_verify_data (device, &verify_print);
 
-      fpi_device_identify_complete (device, NULL);
+          if (fp_print_equal (verify_print, print))
+            fpi_device_verify_report (device, FPI_MATCH_SUCCESS, print, NULL);
+          else
+            fpi_device_verify_report (device, FPI_MATCH_FAIL, print, NULL);
+
+          fpi_device_verify_complete (device, NULL);
+        }
     }
 }
 
@@ -1023,15 +1035,10 @@ focaltech_moc_get_enrolled_info_cb (FpiDeviceFocaltechMoc *self,
       return;
     }
 
-  if (!focaltech_moc_require_response_len (self, length_in,
-                                           sizeof (FpCmd) + sizeof (uint8_t),
-                                           "get enrolled info"))
-    return;
-
   fp_cmd = (FpCmd *) buffer_in;
   items = (struct EnrolledInfoItem *) (fp_cmd + 1);
 
-  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
+  if (fp_cmd->code != 0x04)
     {
       fpi_ssm_mark_failed (self->task_ssm,
                            fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1039,25 +1046,8 @@ focaltech_moc_get_enrolled_info_cb (FpiDeviceFocaltechMoc *self,
     }
   else
     {
-      if (fp_cmd->code == 0x04)
-        {
-          if (!focaltech_moc_require_response_len (self, length_in,
-                                                   sizeof (FpCmd) +
-                                                   FOCALTECH_MOC_MAX_FINGERS * sizeof (struct EnrolledInfoItem) +
-                                                   sizeof (uint8_t),
-                                                   "get enrolled info"))
-            return;
-          memcpy (&data->enrolled_info->items[0], items,
-                  FOCALTECH_MOC_MAX_FINGERS * sizeof (struct EnrolledInfoItem));
-
-        }
-      else if (fp_cmd->code == 0x09)
-        {
-          memset (data->enrolled_info->actived, 0, FOCALTECH_MOC_MAX_FINGERS);
-          memset (&data->enrolled_info->items[0], 0,
-                  FOCALTECH_MOC_MAX_FINGERS * sizeof (struct EnrolledInfoItem));
-        }
-
+      memcpy (&data->enrolled_info->items[0], items,
+              FOCALTECH_MOC_MAX_FINGERS * sizeof (struct EnrolledInfoItem));
       fpi_ssm_next_state (self->task_ssm);
     }
 }
@@ -1109,15 +1099,10 @@ focaltech_moc_get_enrolled_list_cb (FpiDeviceFocaltechMoc *self,
       return;
     }
 
-  if (!focaltech_moc_require_response_len (self, length_in,
-                                           sizeof (FpCmd) + sizeof (uint8_t),
-                                           "get enrolled list"))
-    return;
-
   fp_cmd = (FpCmd *) buffer_in;
   uid_list = (struct UidList *) (fp_cmd + 1);
 
-  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
+  if (fp_cmd->code != 0x04)
     {
       fpi_ssm_mark_failed (self->task_ssm,
                            fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1126,59 +1111,48 @@ focaltech_moc_get_enrolled_list_cb (FpiDeviceFocaltechMoc *self,
   else
     {
       FpActionData *data = fpi_ssm_get_data (self->task_ssm);
+      int i;
 
-      if (fp_cmd->code == 0x04)
+      for (i = 0; i < FOCALTECH_MOC_MAX_FINGERS; i++)
         {
-          if (!focaltech_moc_require_response_len (self, length_in,
-                                                   sizeof (FpCmd) +
-                                                   sizeof (struct UidList) +
-                                                   sizeof (uint8_t),
-                                                   "get enrolled list"))
-            return;
-          for (size_t i = 0; i < FOCALTECH_MOC_MAX_FINGERS; i++)
+          if (uid_list->actived[i] != 0)
             {
-              if (uid_list->actived[i] != 0)
+              struct UserId *user_id = &uid_list->uid[i];
+              FpPrint *print = fp_print_new (FP_DEVICE (self));
+              struct EnrolledInfoItem *item = NULL;
+              int index;
+
+              fp_info ("focaltechmoc add slot: %d", i);
+
+              fprint_set_uid (print, user_id->uid, sizeof (user_id->uid));
+
+              if (focaltech_moc_get_enrolled_info_item (self, user_id->uid, &item, &index) == 0)
                 {
-                  struct UserId *user_id = &uid_list->uid[i];
-                  FpPrint *print = fp_print_new (FP_DEVICE (self));
-                  struct EnrolledInfoItem *item = NULL;
-                  int index;
+                  g_autofree gchar *userid_safe = NULL;
+                  const gchar *username;
+                  userid_safe = g_strndup ((const char *) &item->user_id, FOCALTECH_MOC_USER_ID_LENGTH);
+                  fp_dbg ("%s", userid_safe);
+                  fpi_print_fill_from_user_id (print, userid_safe);
+                  memcpy (data->enrolled_info->user_id[index].uid, user_id->uid, 32);
+                  data->enrolled_info->user_des[index].finger = fp_print_get_finger (print);
+                  username = fp_print_get_username (print);
 
-                  fp_info ("focaltechmoc add slot: %zu", i);
-
-                  fprint_set_uid (print, user_id->uid, sizeof (user_id->uid));
-
-                  if (focaltech_moc_get_enrolled_info_item (self, user_id->uid, &item, &index) == 0)
-                    {
-                      g_autofree gchar *userid_safe = NULL;
-                      const gchar *username;
-
-                      userid_safe = g_strndup ((const char *) &item->user_id, FOCALTECH_MOC_USER_ID_LENGTH);
-                      fp_dbg ("%s", userid_safe);
-                      fpi_print_fill_from_user_id (print, userid_safe);
-                      memcpy (data->enrolled_info->user_id[index].uid, user_id->uid, 32);
-                      data->enrolled_info->user_des[index].finger = fp_print_get_finger (print);
-                      username = fp_print_get_username (print);
-
-                      if (username != NULL)
-                        g_strlcpy (data->enrolled_info->user_des[index].username,
-                                   username,
-                                   sizeof (data->enrolled_info->user_des[index].username));
-                    }
-
-                  g_ptr_array_add (data->list_result, g_object_ref_sink (print));
+                  if (username != NULL)
+                    strncpy (data->enrolled_info->user_des[index].username, username, 64);
                 }
-            }
 
-          for (size_t i = 0; i < FOCALTECH_MOC_MAX_FINGERS; i++)
-            {
-              struct EnrolledInfoItem *item = &data->enrolled_info->items[i];
-
-              if (data->enrolled_info->actived[i] == 0)
-                memset (item, 0, sizeof (struct EnrolledInfoItem));
+              g_ptr_array_add (data->list_result, g_object_ref_sink (print));
             }
         }
 
+      for (i = 0; i < FOCALTECH_MOC_MAX_FINGERS; i++)
+        {
+          struct EnrolledInfoItem *item = &data->enrolled_info->items[i];
+
+          if (data->enrolled_info->actived[i] == 0)
+            memset (item, 0, sizeof (struct EnrolledInfoItem));
+        }
+
       fpi_ssm_next_state (self->task_ssm);
     }
 }
@@ -1298,21 +1272,9 @@ focaltech_moc_start_enroll_cb (FpiDeviceFocaltechMoc *self,
         }
       else
         {
-          guint64 quirk = fpi_device_get_driver_data (FP_DEVICE (self));
-
           fpi_device_get_enroll_data (FP_DEVICE (self), &print);
           fprint_set_uid (print, user_id->uid, sizeof (user_id->uid));
-
-          if (quirk == FOCALTECH_QUIRK_SINGLE_SLOT)
-            {
-              fp_info ("Applying SINGLE_SLOT quirk: Forcing static User ID");
-              userid_safe = g_strdup (FOCALTECH_MOC_STATIC_USER_ID);
-            }
-          else
-            {
-              userid_safe = fpi_print_generate_user_id (print);
-            }
-
+          userid_safe = fpi_print_generate_user_id (print);
           userid_len = strlen (userid_safe);
           userid_len = MIN (FOCALTECH_MOC_USER_ID_LENGTH, userid_len);
           fp_info ("focaltechmoc user id: %s", userid_safe);
@@ -1381,14 +1343,9 @@ focaltech_moc_set_enrolled_info_cb (FpiDeviceFocaltechMoc *self,
       return;
     }
 
-  if (!focaltech_moc_require_response_len (self, length_in,
-                                           sizeof (FpCmd) + sizeof (uint8_t),
-                                           "set enrolled info"))
-    return;
-
   fp_cmd = (FpCmd *) buffer_in;
 
-  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
+  if (fp_cmd->code != 0x04)
     {
       fpi_ssm_mark_failed (self->task_ssm,
                            fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1413,14 +1370,9 @@ focaltech_moc_commit_cb (FpiDeviceFocaltechMoc *self,
       return;
     }
 
-  if (!focaltech_moc_require_response_len (self, length_in,
-                                           sizeof (FpCmd) + sizeof (uint8_t),
-                                           "commit"))
-    return;
-
   fp_cmd = (FpCmd *) buffer_in;
 
-  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
+  if (fp_cmd->code != 0x04)
     {
       fpi_ssm_mark_failed (self->task_ssm,
                            fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1613,14 +1565,9 @@ focaltech_moc_delete_cb (FpiDeviceFocaltechMoc *self,
       return;
     }
 
-  if (!focaltech_moc_require_response_len (self, length_in,
-                                           sizeof (FpCmd) + sizeof (uint8_t),
-                                           "delete"))
-    return;
-
   fp_cmd = (FpCmd *) buffer_in;
 
-  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
+  if (fp_cmd->code != 0x04)
     {
       fpi_ssm_mark_failed (self->task_ssm,
                            fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1815,9 +1762,8 @@ static void
 focaltech_moc_delete_print (FpDevice *device)
 {
   FpiDeviceFocaltechMoc *self = FPI_DEVICE_FOCALTECH_MOC (device);
-  FpActionData *data = NULL;
+  FpActionData *data = g_new0 (FpActionData, 1);
 
-  data = g_new0 (FpActionData, 1);
   data->enrolled_info = g_new0 (struct EnrolledInfo, 1);
   data->list_result = g_ptr_array_new_with_free_func (g_object_unref);
 
@@ -1828,87 +1774,6 @@ focaltech_moc_delete_print (FpDevice *device)
   fpi_ssm_start (self->task_ssm, task_ssm_done);
 }
 
-enum moc_clear_storage_states {
-  MOC_CLEAR_STORAGE_SEND,
-  MOC_CLEAR_STORAGE_NUM_STATES,
-};
-
-static void
-focaltech_moc_clear_storage_cb (FpiDeviceFocaltechMoc *self,
-                                uint8_t               *buffer_in,
-                                gsize                  length_in,
-                                GError                *error)
-{
-  FpCmd *fp_cmd = NULL;
-
-  if (error)
-    {
-      fp_warn ("Mass erase command completed with warning: %s", error->message);
-      fpi_ssm_mark_failed (self->task_ssm, error);
-      return;
-    }
-
-  if (length_in == 0)
-    {
-      fpi_device_clear_storage_complete (FP_DEVICE (self), NULL);
-      fpi_ssm_next_state (self->task_ssm);
-      return;
-    }
-
-  if (!focaltech_moc_require_response_len (self, length_in,
-                                           sizeof (FpCmd) + sizeof (uint8_t),
-                                           "clear storage"))
-    return;
-
-  fp_cmd = (FpCmd *) buffer_in;
-
-  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
-    {
-      fpi_ssm_mark_failed (self->task_ssm,
-                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                     "Clear storage failed: unexpected response code 0x%02x",
-                                                     fp_cmd->code));
-      return;
-    }
-
-  fpi_device_clear_storage_complete (FP_DEVICE (self), NULL);
-  fpi_ssm_next_state (self->task_ssm);
-}
-
-static void
-focaltech_clear_storage_run_state (FpiSsm *ssm, FpDevice *device)
-{
-  guint64 quirk = fpi_device_get_driver_data (device);
-  guint8 *cmd_buf = NULL;
-  uint16_t cmd_len = 0;
-  uint16_t resp_len = 0;
-
-  switch (fpi_ssm_get_cur_state (ssm))
-    {
-    case MOC_CLEAR_STORAGE_SEND:
-      resp_len = quirk == FOCALTECH_QUIRK_SINGLE_SLOT ? 0 : sizeof (uint8_t);
-      cmd_buf = focaltech_moc_compose_cmd (0xac, NULL, cmd_len);
-
-      focaltech_moc_get_cmd (device, cmd_buf,
-                             sizeof (FpCmd) + cmd_len + sizeof (uint8_t),
-                             sizeof (FpCmd) + resp_len + sizeof (uint8_t),
-                             FALSE,
-                             focaltech_moc_clear_storage_cb);
-      break;
-    }
-}
-
-static void
-focaltech_moc_clear_storage (FpDevice *device)
-{
-  FpiDeviceFocaltechMoc *self = FPI_DEVICE_FOCALTECH_MOC (device);
-
-  self->task_ssm = fpi_ssm_new (device,
-                                focaltech_clear_storage_run_state,
-                                MOC_CLEAR_STORAGE_NUM_STATES);
-  fpi_ssm_start (self->task_ssm, task_ssm_done);
-}
-
 enum moc_list_states {
   MOC_LIST_GET_ENROLLED_INFO,
   MOC_LIST_GET_ENROLLED_LIST,
@@ -1984,17 +1849,6 @@ fpi_device_focaltech_moc_init (FpiDeviceFocaltechMoc *self)
   G_DEBUG_HERE ();
 }
 
-static void
-focaltech_moc_probe (FpDevice *device)
-{
-  guint64 quirk = fpi_device_get_driver_data (device);
-
-  if (quirk == FOCALTECH_QUIRK_SINGLE_SLOT)
-    fpi_device_update_features (device, FP_DEVICE_FEATURE_STORAGE_DELETE, 0);
-
-  fpi_device_probe_complete (device, NULL, NULL, NULL);
-}
-
 static void
 fpi_device_focaltech_moc_class_init (FpiDeviceFocaltechMocClass *klass)
 {
@@ -2009,13 +1863,12 @@ fpi_device_focaltech_moc_class_init (FpiDeviceFocaltechMocClass *klass)
   dev_class->nr_enroll_stages = FOCALTECH_MOC_MAX_FINGERS;
   dev_class->temp_hot_seconds = -1;
 
-  dev_class->probe = focaltech_moc_probe;
   dev_class->open = focaltech_moc_open;
   dev_class->close = focaltech_moc_close;
+  dev_class->verify = focaltech_moc_identify;
   dev_class->enroll = focaltech_moc_enroll;
   dev_class->identify = focaltech_moc_identify;
   dev_class->delete = focaltech_moc_delete_print;
-  dev_class->clear_storage = focaltech_moc_clear_storage;
   dev_class->list = focaltech_moc_list;
 
   fpi_device_class_auto_initialize_features (dev_class);

libfprint/drivers/fpcmoc/fpc.h

@@ -178,44 +178,44 @@ typedef enum {
 } FpcCmdType;
 
 typedef enum {
-  FPC_CMD_SEND = 0,
-  FPC_CMD_GET_DATA,
-  FPC_CMD_SUSPENDED,
-  FPC_CMD_RESUME,
-  FPC_CMD_NUM_STATES,
-} FpcCmdState;
+  FP_CMD_SEND = 0,
+  FP_CMD_GET_DATA,
+  FP_CMD_SUSPENDED,
+  FP_CMD_RESUME,
+  FP_CMD_NUM_STATES,
+} FpCmdState;
 
 typedef enum {
-  FPC_INIT = 0,
-  FPC_INIT_LOAD_DB,
-  FPC_INIT_NUM_STATES,
-} FpcInitState;
+  FP_INIT = 0,
+  FP_LOAD_DB,
+  FP_INIT_NUM_STATES,
+} FpInitState;
 
 typedef enum {
-  FPC_ENROLL_ENUM = 0,
-  FPC_ENROLL_CREATE,
-  FPC_ENROLL_CAPTURE,
-  FPC_ENROLL_GET_IMG,
-  FPC_ENROLL_UPDATE,
-  FPC_ENROLL_COMPLETE,
-  FPC_ENROLL_CHECK_DUPLICATE,
-  FPC_ENROLL_BINDID,
-  FPC_ENROLL_COMMIT,
-  FPC_ENROLL_DICARD,
-  FPC_ENROLL_CLEANUP,
-  FPC_ENROLL_NUM_STATES,
-} FpcEnrollState;
+  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 {
-  FPC_IDENTIFY_CAPTURE = 0,
-  FPC_IDENTIFY_GET_IMG,
-  FPC_IDENTIFY_IDENTIFY,
-  FPC_IDENTIFY_CANCEL,
-  FPC_IDENTIFY_NUM_STATES,
-} FpcVerifyState;
+  FP_VERIFY_CAPTURE = 0,
+  FP_VERIFY_GET_IMG,
+  FP_VERIFY_IDENTIFY,
+  FP_VERIFY_CANCEL,
+  FP_VERIFY_NUM_STATES,
+} FpVerifyState;
 
 typedef enum {
-  FPC_CLEAR_DELETE_DB = 0,
-  FPC_CLEAR_CREATE_DB,
-  FPC_CLEAR_NUM_STATES,
+  FP_CLEAR_DELETE_DB = 0,
+  FP_CLEAR_CREATE_DB,
+  FP_CLEAR_NUM_STATES,
 } FpClearState;

libfprint/drivers/goodixmoc/goodix.c

@@ -19,7 +19,6 @@
 
 
 
-#include "glib.h"
 #define FP_COMPONENT "goodixmoc"
 
 #include "drivers_api.h"
@@ -129,13 +128,11 @@ fp_cmd_receive_cb (FpiUsbTransfer *transfer,
                    GError         *error)
 {
   FpiDeviceGoodixMoc *self = FPI_DEVICE_GOODIXMOC (device);
-  FpiByteReader reader = {0};
   CommandData *data = user_data;
-  int ssm_state = 0;
+  int ret = -1, ssm_state = 0;
   gxfp_cmd_response_t cmd_reponse = {0, };
   pack_header header;
   guint32 crc32_calc = 0;
-  guint32 crc32 = 0;
   guint16 cmd = 0;
 
   if (error)
@@ -157,9 +154,8 @@ fp_cmd_receive_cb (FpiUsbTransfer *transfer,
       return;
     }
 
-  fpi_byte_reader_init (&reader, transfer->buffer, transfer->actual_length);
-
-  if (gx_proto_parse_header (&reader, &header) != 0)
+  ret = gx_proto_parse_header (transfer->buffer, transfer->actual_length, &header);
+  if (ret != 0)
     {
       fpi_ssm_mark_failed (transfer->ssm,
                            fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -167,25 +163,8 @@ fp_cmd_receive_cb (FpiUsbTransfer *transfer,
       return;
     }
 
-  if (header.len < PACKAGE_CRC_SIZE ||
-      !fpi_byte_reader_set_pos (&reader, PACKAGE_HEADER_SIZE + header.len - PACKAGE_CRC_SIZE))
-    {
-      fpi_ssm_mark_failed (transfer->ssm,
-                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                     "Package crc read failed"));
-      return;
-    }
-
-  /* Exclude the CRC from the package length */
-  header.len -= PACKAGE_CRC_SIZE;
-
-  /* The reader is positioned right at the CRC, i.e. at the end of the data the
-   * CRC is computed over, so use its position as the length. */
-  gx_proto_crc32_calc (transfer->buffer, fpi_byte_reader_get_pos (&reader),
-                       (uint8_t *) &crc32_calc);
-
-  if (!fpi_byte_reader_get_uint32_le (&reader, &crc32) ||
-      GUINT32_FROM_LE (crc32_calc) != crc32)
+  gx_proto_crc32_calc (transfer->buffer, PACKAGE_HEADER_SIZE + header.len, (uint8_t *) &crc32_calc);
+  if(crc32_calc != GUINT32_FROM_LE (*(uint32_t *) (transfer->buffer + PACKAGE_HEADER_SIZE + header.len)))
     {
       fpi_ssm_mark_failed (transfer->ssm,
                            fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -195,9 +174,8 @@ fp_cmd_receive_cb (FpiUsbTransfer *transfer,
 
   cmd = MAKE_CMD_EX (header.cmd0, header.cmd1);
 
-  fpi_byte_reader_init (&reader, &transfer->buffer[PACKAGE_HEADER_SIZE], header.len);
-
-  if (gx_proto_parse_body (cmd, &reader, &cmd_reponse) != 0)
+  ret = gx_proto_parse_body (cmd, &transfer->buffer[PACKAGE_HEADER_SIZE], header.len, &cmd_reponse);
+  if (ret != 0)
     {
       fpi_ssm_mark_failed (transfer->ssm,
                            fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -244,7 +222,7 @@ fp_cmd_run_state (FpiSsm   *ssm,
 
   switch (fpi_ssm_get_cur_state (ssm))
     {
-    case GOODIX_CMD_SEND:
+    case FP_CMD_SEND:
       if (self->cmd_transfer)
         {
           self->cmd_transfer->ssm = ssm;
@@ -260,7 +238,7 @@ fp_cmd_run_state (FpiSsm   *ssm,
         }
       break;
 
-    case GOODIX_CMD_GET_ACK:
+    case FP_CMD_GET_ACK:
       transfer = fpi_usb_transfer_new (dev);
       transfer->ssm = ssm;
       fpi_usb_transfer_fill_bulk (transfer, EP_IN, EP_IN_MAX_BUF_SIZE);
@@ -272,7 +250,7 @@ fp_cmd_run_state (FpiSsm   *ssm,
 
       break;
 
-    case GOODIX_CMD_GET_DATA:
+    case FP_CMD_GET_DATA:
       transfer = fpi_usb_transfer_new (dev);
       transfer->ssm = ssm;
       fpi_usb_transfer_fill_bulk (transfer, EP_IN, EP_IN_MAX_BUF_SIZE);
@@ -360,7 +338,7 @@ goodix_sensor_cmd (FpiDeviceGoodixMoc *self,
 
   self->cmd_ssm = fpi_ssm_new (FP_DEVICE (self),
                                fp_cmd_run_state,
-                               GOODIX_CMD_NUM_STATES);
+                               FP_CMD_NUM_STATES);
 
   fpi_ssm_set_data (self->cmd_ssm, data, (GDestroyNotify) fp_cmd_ssm_done_data_free);
 
@@ -399,13 +377,13 @@ fp_pwr_btn_shield_cb (FpiDeviceGoodixMoc  *self,
 }
 /******************************************************************************
  *
- *  fp_identify_xxxx Function
+ *  fp_verify_xxxx Function
  *
  *****************************************************************************/
 static void
-fp_identify_capture_cb (FpiDeviceGoodixMoc  *self,
-                        gxfp_cmd_response_t *resp,
-                        GError              *error)
+fp_verify_capture_cb (FpiDeviceGoodixMoc  *self,
+                      gxfp_cmd_response_t *resp,
+                      GError              *error)
 {
   if (error)
     {
@@ -438,9 +416,9 @@ fp_identify_capture_cb (FpiDeviceGoodixMoc  *self,
 }
 
 static void
-fp_identify_cb (FpiDeviceGoodixMoc  *self,
-                gxfp_cmd_response_t *resp,
-                GError              *error)
+fp_verify_cb (FpiDeviceGoodixMoc  *self,
+              gxfp_cmd_response_t *resp,
+              GError              *error)
 {
   FpDevice *device = FP_DEVICE (self);
   FpPrint *new_scan = NULL;
@@ -451,57 +429,43 @@ fp_identify_cb (FpiDeviceGoodixMoc  *self,
       fpi_ssm_mark_failed (self->task_ssm, error);
       return;
     }
-
   if (resp->verify.match)
     {
-      GPtrArray *templates = NULL;
-      guint matching_index;
-
-      fpi_device_get_identify_data (device, &templates);
       new_scan = fp_print_from_template (self, &resp->verify.template);
 
-      if (g_ptr_array_find_with_equal_func (templates, new_scan,
-                                            (GEqualFunc) fp_print_equal,
-                                            &matching_index))
-        matching = g_ptr_array_index (templates, matching_index);
+      if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_VERIFY)
+        {
+          fpi_device_get_verify_data (device, &matching);
+          if (!fp_print_equal (matching, new_scan))
+            matching = NULL;
+        }
+      else
+        {
+          GPtrArray *templates = NULL;
+          fpi_device_get_identify_data (device, &templates);
+
+          for (gint i = 0; i < templates->len; i++)
+            {
+              if (fp_print_equal (g_ptr_array_index (templates, i), new_scan))
+                {
+                  matching = g_ptr_array_index (templates, i);
+                  break;
+                }
+            }
+        }
     }
 
-  fpi_device_identify_report (device, matching, new_scan, error);
+  if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_VERIFY)
+    fpi_device_verify_report (device, matching ? FPI_MATCH_SUCCESS : FPI_MATCH_FAIL, new_scan, error);
+  else
+    fpi_device_identify_report (device, matching, new_scan, error);
 
   fpi_ssm_next_state (self->task_ssm);
+
 }
 
 static void
-fp_identify_finger_mode_cb (FpiDeviceGoodixMoc  *self,
-                            gxfp_cmd_response_t *resp,
-                            GError              *error)
-{
-  if (error)
-    {
-      fpi_ssm_mark_failed (self->task_ssm, error);
-      return;
-    }
-  /* if reach max timeout(5sec) finger not up, try again */
-  if (resp->finger_status.status == GX_ERROR_WAIT_FINGER_UP_TIMEOUT)
-    {
-      fpi_ssm_jump_to_state (self->task_ssm, GOODIX_IDENTIFY_WAIT_FINGER_UP);
-      return;
-    }
-  else if (resp->finger_status.status != GX_SUCCESS)
-    {
-      fpi_ssm_mark_failed (self->task_ssm,
-                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                     "Switch finger mode failed"));
-      return;
-    }
-  fpi_device_report_finger_status_changes (FP_DEVICE (self),
-                                           FP_FINGER_STATUS_NONE,
-                                           FP_FINGER_STATUS_PRESENT);
-  fpi_ssm_next_state (self->task_ssm);
-}
-
-static void
-fp_identify_sm_run_state (FpiSsm *ssm, FpDevice *device)
+fp_verify_sm_run_state (FpiSsm *ssm, FpDevice *device)
 {
   FpiDeviceGoodixMoc *self = FPI_DEVICE_GOODIXMOC (device);
   guint8 param[3] = { 0 };
@@ -513,7 +477,7 @@ fp_identify_sm_run_state (FpiSsm *ssm, FpDevice *device)
 
   switch (fpi_ssm_get_cur_state (ssm))
     {
-    case GOODIX_IDENTIFY_PWR_BTN_SHIELD_ON:
+    case FP_VERIFY_PWR_BTN_SHIELD_ON:
       goodix_sensor_cmd (self, MOC_CMD0_PWR_BTN_SHIELD, MOC_CMD1_PWR_BTN_SHIELD_ON,
                          false,
                          NULL,
@@ -521,7 +485,7 @@ fp_identify_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          fp_pwr_btn_shield_cb);
       break;
 
-    case GOODIX_IDENTIFY_CAPTURE:
+    case FP_VERIFY_CAPTURE:
       fpi_device_report_finger_status_changes (device,
                                                FP_FINGER_STATUS_NEEDED,
                                                FP_FINGER_STATUS_NONE);
@@ -529,29 +493,18 @@ fp_identify_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          true,
                          (const guint8 *) &param,
                          G_N_ELEMENTS (param),
-                         fp_identify_capture_cb);
+                         fp_verify_capture_cb);
       break;
 
-    case GOODIX_IDENTIFY_IDENTIFY:
+    case FP_VERIFY_IDENTIFY:
       goodix_sensor_cmd (self, MOC_CMD0_IDENTIFY, MOC_CMD1_DEFAULT,
                          false,
                          (const guint8 *) nonce,
                          TEMPLATE_ID_SIZE,
-                         fp_identify_cb);
+                         fp_verify_cb);
       break;
 
-    case GOODIX_IDENTIFY_WAIT_FINGER_UP:
-      {
-        guint8 dummy = 0;
-        goodix_sensor_cmd (self, MOC_CMD0_FINGER_MODE, MOC_CMD1_SET_FINGER_UP,
-                           true,
-                           &dummy,
-                           1,
-                           fp_identify_finger_mode_cb);
-      }
-      break;
-
-    case GOODIX_IDENTIFY_PWR_BTN_SHIELD_OFF:
+    case FP_VERIFY_PWR_BTN_SHIELD_OFF:
       goodix_sensor_cmd (self, MOC_CMD0_PWR_BTN_SHIELD, MOC_CMD1_PWR_BTN_SHIELD_OFF,
                          false,
                          NULL,
@@ -563,16 +516,25 @@ fp_identify_sm_run_state (FpiSsm *ssm, FpDevice *device)
 }
 
 static void
-fp_identify_ssm_done (FpiSsm *ssm, FpDevice *dev, GError *error)
+fp_verify_ssm_done (FpiSsm *ssm, FpDevice *dev, GError *error)
 {
   FpiDeviceGoodixMoc *self = FPI_DEVICE_GOODIXMOC (dev);
 
   fp_info ("Verify complete!");
 
   if (error && error->domain == FP_DEVICE_RETRY)
-    fpi_device_identify_report (dev, NULL, NULL, g_steal_pointer (&error));
+    {
+      if (fpi_device_get_current_action (dev) == FPI_DEVICE_ACTION_VERIFY)
+        fpi_device_verify_report (dev, FPI_MATCH_ERROR, NULL, g_steal_pointer (&error));
+      else
+        fpi_device_identify_report (dev, NULL, NULL, g_steal_pointer (&error));
+    }
 
-  fpi_device_identify_complete (dev, error);
+  if (fpi_device_get_current_action (dev) == FPI_DEVICE_ACTION_VERIFY)
+    fpi_device_verify_complete (dev, error);
+
+  else
+    fpi_device_identify_complete (dev, error);
 
   self->task_ssm = NULL;
 }
@@ -704,7 +666,7 @@ fp_enroll_capture_cb (FpiDeviceGoodixMoc  *self,
                                   self->enroll_stage,
                                   NULL,
                                   fpi_device_retry_new (FP_DEVICE_RETRY_GENERAL));
-      fpi_ssm_jump_to_state (self->task_ssm, GOODIX_ENROLL_CAPTURE);
+      fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_CAPTURE);
       return;
     }
   fpi_device_report_finger_status_changes (FP_DEVICE (self),
@@ -722,7 +684,7 @@ fp_enroll_capture_cb (FpiDeviceGoodixMoc  *self,
                                   self->enroll_stage,
                                   NULL,
                                   fpi_device_retry_new (FP_DEVICE_RETRY_CENTER_FINGER));
-      fpi_ssm_jump_to_state (self->task_ssm, GOODIX_ENROLL_CAPTURE);
+      fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_CAPTURE);
       return;
     }
   else
@@ -753,7 +715,7 @@ fp_enroll_update_cb (FpiDeviceGoodixMoc  *self,
                                   NULL,
                                   fpi_device_retry_new (FP_DEVICE_RETRY_REMOVE_FINGER));
     }
-  else if (resp->enroll_update.rollback || resp->result == 0x73)
+  else if (resp->enroll_update.rollback)
     {
       fpi_device_enroll_progress (FP_DEVICE (self),
                                   self->enroll_stage,
@@ -768,7 +730,7 @@ fp_enroll_update_cb (FpiDeviceGoodixMoc  *self,
   /* if enroll complete, no need to wait finger up */
   if (self->enroll_stage >= self->max_enroll_stage)
     {
-      fpi_ssm_jump_to_state (self->task_ssm, GOODIX_ENROLL_CHECK_DUPLICATE);
+      fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_CHECK_DUPLICATE);
       return;
     }
 
@@ -834,7 +796,7 @@ fp_finger_mode_cb (FpiDeviceGoodixMoc  *self,
   /* if reach max timeout(5sec) finger not up, switch to finger up again */
   if (resp->finger_status.status == GX_ERROR_WAIT_FINGER_UP_TIMEOUT)
     {
-      fpi_ssm_jump_to_state (self->task_ssm, GOODIX_ENROLL_WAIT_FINGER_UP);
+      fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_WAIT_FINGER_UP);
       return;
     }
   else if (resp->finger_status.status != GX_SUCCESS)
@@ -849,7 +811,7 @@ fp_finger_mode_cb (FpiDeviceGoodixMoc  *self,
                                            FP_FINGER_STATUS_PRESENT);
   if (self->enroll_stage < self->max_enroll_stage)
     {
-      fpi_ssm_jump_to_state (self->task_ssm, GOODIX_ENROLL_CAPTURE);
+      fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_CAPTURE);
       return;
     }
   fpi_ssm_next_state (self->task_ssm);
@@ -875,7 +837,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
 
   switch (fpi_ssm_get_cur_state (ssm))
     {
-    case GOODIX_ENROLL_PWR_BTN_SHIELD_ON:
+    case FP_ENROLL_PWR_BTN_SHIELD_ON:
       {
         goodix_sensor_cmd (self, MOC_CMD0_PWR_BTN_SHIELD, MOC_CMD1_PWR_BTN_SHIELD_ON,
                            false,
@@ -885,7 +847,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
       }
       break;
 
-    case GOODIX_ENROLL_ENUM:
+    case FP_ENROLL_ENUM:
       {
         goodix_sensor_cmd (self, MOC_CMD0_GETFINGERLIST, MOC_CMD1_DEFAULT,
                            false,
@@ -895,7 +857,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
       }
       break;
 
-    case GOODIX_ENROLL_CREATE:
+    case FP_ENROLL_CREATE:
       {
         goodix_sensor_cmd (self, MOC_CMD0_ENROLL_INIT, MOC_CMD1_DEFAULT,
                            false,
@@ -905,7 +867,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
       }
       break;
 
-    case GOODIX_ENROLL_CAPTURE:
+    case FP_ENROLL_CAPTURE:
       fpi_device_report_finger_status_changes (device,
                                                FP_FINGER_STATUS_NEEDED,
                                                FP_FINGER_STATUS_NONE);
@@ -916,7 +878,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          fp_enroll_capture_cb);
       break;
 
-    case GOODIX_ENROLL_UPDATE:
+    case FP_ENROLL_UPDATE:
       dummy[0] = 1;
       dummy[1] = self->sensorcfg->config[2];
       dummy[2] = self->sensorcfg->config[3];
@@ -927,7 +889,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          fp_enroll_update_cb);
       break;
 
-    case GOODIX_ENROLL_WAIT_FINGER_UP:
+    case FP_ENROLL_WAIT_FINGER_UP:
       dummy[0] = 0;
       goodix_sensor_cmd (self, MOC_CMD0_FINGER_MODE, MOC_CMD1_SET_FINGER_UP,
                          true,
@@ -936,7 +898,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          fp_finger_mode_cb);
       break;
 
-    case GOODIX_ENROLL_CHECK_DUPLICATE:
+    case FP_ENROLL_CHECK_DUPLICATE:
       goodix_sensor_cmd (self, MOC_CMD0_CHECK4DUPLICATE, MOC_CMD1_DEFAULT,
                          false,
                          (const guint8 *) &dummy,
@@ -944,7 +906,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          fp_enroll_check_duplicate_cb);
       break;
 
-    case GOODIX_ENROLL_COMMIT:
+    case FP_ENROLL_COMMIT:
       {
         fpi_device_get_enroll_data (device, &print);
         user_id = fpi_print_generate_user_id (print);
@@ -952,7 +914,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
         user_id_len = MIN (100, user_id_len);
         finger = 1;
 
-        if (fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
+        if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
           memset (self->template_id, 0, TEMPLATE_ID_SIZE);
         uid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
                                          user_id,
@@ -997,7 +959,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
       }
       break;
 
-    case GOODIX_ENROLL_PWR_BTN_SHIELD_OFF:
+    case FP_ENROLL_PWR_BTN_SHIELD_OFF:
       {
         goodix_sensor_cmd (self, MOC_CMD0_PWR_BTN_SHIELD, MOC_CMD1_PWR_BTN_SHIELD_OFF,
                            false,
@@ -1088,7 +1050,7 @@ fp_init_cb_reset_or_complete (FpiDeviceGoodixMoc  *self,
     {
       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, GOODIX_INIT_RESET_DEVICE);
+      fpi_ssm_jump_to_state (self->task_ssm, FP_INIT_RESET_DEVICE);
     }
   else
     {
@@ -1129,7 +1091,7 @@ fp_init_sm_run_state (FpiSsm *ssm, FpDevice *device)
 
   switch (fpi_ssm_get_cur_state (ssm))
     {
-    case GOODIX_INIT_VERSION:
+    case FP_INIT_VERSION:
       goodix_sensor_cmd (self, MOC_CMD0_GET_VERSION, MOC_CMD1_DEFAULT,
                          false,
                          &dummy,
@@ -1137,7 +1099,7 @@ fp_init_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          fp_init_version_cb);
       break;
 
-    case GOODIX_INIT_CONFIG:
+    case FP_INIT_CONFIG:
       goodix_sensor_cmd (self, MOC_CMD0_UPDATE_CONFIG, MOC_CMD1_WRITE_CFG_TO_FLASH,
                          false,
                          (guint8 *) self->sensorcfg,
@@ -1145,7 +1107,7 @@ fp_init_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          fp_init_config_cb);
       break;
 
-    case GOODIX_INIT_TEMPLATE_LIST:
+    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
@@ -1160,7 +1122,7 @@ fp_init_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          fp_init_cb_reset_or_complete);
       break;
 
-    case GOODIX_INIT_RESET_DEVICE:
+    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,
@@ -1372,7 +1334,7 @@ gx_fp_probe (FpDevice *device)
   if (!g_usb_device_claim_interface (usb_dev, 0, 0, &error))
     goto err_close;
 
-  if (fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
+  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
     {
 
       serial = g_strdup ("emulated-device");
@@ -1399,30 +1361,22 @@ gx_fp_probe (FpDevice *device)
     case 0x60A2:
     case 0x60A4:
     case 0x6014:
-    case 0x6090:
     case 0x6092:
     case 0x6094:
-    case 0x609A:
     case 0x609C:
     case 0x60BC:
-    case 0x60C2:
     case 0x6304:
     case 0x631C:
     case 0x633C:
     case 0x634C:
-    case 0x6382:
     case 0x6384:
     case 0x639C:
     case 0x63AC:
     case 0x63BC:
     case 0x63CC:
-    case 0x650A:
-    case 0x650C:
     case 0x6582:
     case 0x6A94:
     case 0x659A:
-    case 0x6890:
-    case 0x6984:
       self->max_enroll_stage = 12;
       break;
 
@@ -1478,7 +1432,7 @@ gx_fp_init (FpDevice *device)
     }
 
   self->task_ssm = fpi_ssm_new (device, fp_init_sm_run_state,
-                                GOODIX_INIT_NUM_STATES);
+                                FP_INIT_NUM_STATES);
 
   fpi_ssm_start (self->task_ssm, fp_init_ssm_done);
 
@@ -1509,7 +1463,9 @@ gx_fp_exit_cb (FpiDeviceGoodixMoc  *self,
                gxfp_cmd_response_t *resp,
                GError              *error)
 {
-  if (resp && resp->result >= GX_FAILED)
+
+
+  if (resp->result >= GX_FAILED)
     fp_dbg ("Setting power button shield failed, result: 0x%x", resp->result);
   self->is_power_button_shield_on = false;
   gx_fp_release_interface (self, error);
@@ -1539,16 +1495,16 @@ gx_fp_exit (FpDevice *device)
 
 
 static void
-gx_fp_identify (FpDevice *device)
+gx_fp_verify_identify (FpDevice *device)
 {
   FpiDeviceGoodixMoc *self = FPI_DEVICE_GOODIXMOC (device);
 
-  self->task_ssm = fpi_ssm_new_full (device, fp_identify_sm_run_state,
-                                     GOODIX_IDENTIFY_NUM_STATES,
-                                     GOODIX_IDENTIFY_PWR_BTN_SHIELD_OFF,
-                                     "identify");
+  self->task_ssm = fpi_ssm_new_full (device, fp_verify_sm_run_state,
+                                     FP_VERIFY_NUM_STATES,
+                                     FP_VERIFY_PWR_BTN_SHIELD_OFF,
+                                     "verify");
 
-  fpi_ssm_start (self->task_ssm, fp_identify_ssm_done);
+  fpi_ssm_start (self->task_ssm, fp_verify_ssm_done);
 
 }
 
@@ -1561,8 +1517,8 @@ gx_fp_enroll (FpDevice *device)
   self->enroll_stage = 0;
 
   self->task_ssm = fpi_ssm_new_full (device, fp_enroll_sm_run_state,
-                                     GOODIX_ENROLL_NUM_STATES,
-                                     GOODIX_ENROLL_PWR_BTN_SHIELD_OFF,
+                                     FP_ENROLL_NUM_STATES,
+                                     FP_ENROLL_PWR_BTN_SHIELD_OFF,
                                      "enroll");
 
   fpi_ssm_start (self->task_ssm, fp_enroll_ssm_done);
@@ -1601,7 +1557,7 @@ gx_fp_template_delete (FpDevice *device)
   gsize user_id_len = 0;
   const guint8 *tid;
   gsize tid_len = 0;
-  guint16 payload_len = 0;
+  gsize payload_len = 0;
   g_autofree guint8 *payload = NULL;
 
   fpi_device_get_delete_data (device, &print);
@@ -1614,8 +1570,7 @@ gx_fp_template_delete (FpDevice *device)
                                   fpi_device_error_new (FP_DEVICE_ERROR_DATA_INVALID));
       return;
     }
-
-  if (!encode_finger_id (tid, tid_len, user_id, user_id_len, &payload, &payload_len))
+  if (!encode_finger_id (tid, tid_len, user_id, user_id_len, &payload, (guint16 *) &payload_len))
     {
       fpi_device_delete_complete (device,
                                   fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1653,28 +1608,22 @@ fpi_device_goodixmoc_init (FpiDeviceGoodixMoc *self)
 static const FpIdEntry id_table[] = {
   { .vid = 0x27c6,  .pid = 0x5840,  },
   { .vid = 0x27c6,  .pid = 0x6014,  },
-  { .vid = 0x27c6,  .pid = 0x6090,  },
   { .vid = 0x27c6,  .pid = 0x6092,  },
   { .vid = 0x27c6,  .pid = 0x6094,  },
-  { .vid = 0x27c6,  .pid = 0x609A,  },
   { .vid = 0x27c6,  .pid = 0x609C,  },
   { .vid = 0x27c6,  .pid = 0x60A2,  },
   { .vid = 0x27c6,  .pid = 0x60A4,  },
   { .vid = 0x27c6,  .pid = 0x60BC,  },
-  { .vid = 0x27c6,  .pid = 0x60C2,  },
   { .vid = 0x27c6,  .pid = 0x6304,  },
   { .vid = 0x27c6,  .pid = 0x631C,  },
   { .vid = 0x27c6,  .pid = 0x633C,  },
   { .vid = 0x27c6,  .pid = 0x634C,  },
-  { .vid = 0x27c6,  .pid = 0x6382,  },
   { .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 = 0x650A,  },
-  { .vid = 0x27c6,  .pid = 0x650C,  },
   { .vid = 0x27c6,  .pid = 0x6582,  },
   { .vid = 0x27c6,  .pid = 0x6584,  },
   { .vid = 0x27c6,  .pid = 0x658C,  },
@@ -1683,11 +1632,6 @@ static const FpIdEntry id_table[] = {
   { .vid = 0x27c6,  .pid = 0x659A,  },
   { .vid = 0x27c6,  .pid = 0x659C,  },
   { .vid = 0x27c6,  .pid = 0x6A94,  },
-  { .vid = 0x27c6,  .pid = 0x6512,  },
-  { .vid = 0x27c6,  .pid = 0x6890,  },
-  { .vid = 0x27c6,  .pid = 0x689A,  },
-  { .vid = 0x27c6,  .pid = 0x66A9,  },
-  { .vid = 0x27c6,  .pid = 0x6984,  },
   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
 
@@ -1712,7 +1656,8 @@ fpi_device_goodixmoc_class_init (FpiDeviceGoodixMocClass *klass)
   dev_class->delete = gx_fp_template_delete;
   dev_class->clear_storage = gx_fp_template_delete_all;
   dev_class->list   = gx_fp_template_list;
-  dev_class->identify = gx_fp_identify;
+  dev_class->verify   = gx_fp_verify_identify;
+  dev_class->identify = gx_fp_verify_identify;
 
   fpi_device_class_auto_initialize_features (dev_class);
   dev_class->features |= FP_DEVICE_FEATURE_DUPLICATES_CHECK;

libfprint/drivers/goodixmoc/goodix.h

@@ -25,40 +25,39 @@
 G_DECLARE_FINAL_TYPE (FpiDeviceGoodixMoc, fpi_device_goodixmoc, FPI, DEVICE_GOODIXMOC, FpDevice)
 
 typedef enum {
-  GOODIX_CMD_SEND = 0,
-  GOODIX_CMD_GET_ACK,
-  GOODIX_CMD_GET_DATA,
-  GOODIX_CMD_NUM_STATES,
-} GoodixCmdState;
+  FP_CMD_SEND = 0,
+  FP_CMD_GET_ACK,
+  FP_CMD_GET_DATA,
+  FP_CMD_NUM_STATES,
+} FpCmdState;
 
 
 typedef enum {
-  GOODIX_INIT_VERSION = 0,
-  GOODIX_INIT_CONFIG,
-  GOODIX_INIT_TEMPLATE_LIST,
-  GOODIX_INIT_RESET_DEVICE,
-  GOODIX_INIT_NUM_STATES,
-} GoodixInitState;
+  FP_INIT_VERSION = 0,
+  FP_INIT_CONFIG,
+  FP_INIT_TEMPLATE_LIST,
+  FP_INIT_RESET_DEVICE,
+  FP_INIT_NUM_STATES,
+} FpInitState;
 
 
 typedef enum {
-  GOODIX_ENROLL_PWR_BTN_SHIELD_ON = 0,
-  GOODIX_ENROLL_ENUM,
-  GOODIX_ENROLL_CREATE,
-  GOODIX_ENROLL_CAPTURE,
-  GOODIX_ENROLL_UPDATE,
-  GOODIX_ENROLL_WAIT_FINGER_UP,
-  GOODIX_ENROLL_CHECK_DUPLICATE,
-  GOODIX_ENROLL_COMMIT,
-  GOODIX_ENROLL_PWR_BTN_SHIELD_OFF,
-  GOODIX_ENROLL_NUM_STATES,
-} GoodixEnrollState;
+  FP_ENROLL_PWR_BTN_SHIELD_ON = 0,
+  FP_ENROLL_ENUM,
+  FP_ENROLL_CREATE,
+  FP_ENROLL_CAPTURE,
+  FP_ENROLL_UPDATE,
+  FP_ENROLL_WAIT_FINGER_UP,
+  FP_ENROLL_CHECK_DUPLICATE,
+  FP_ENROLL_COMMIT,
+  FP_ENROLL_PWR_BTN_SHIELD_OFF,
+  FP_ENROLL_NUM_STATES,
+} FpEnrollState;
 
 typedef enum {
-  GOODIX_IDENTIFY_PWR_BTN_SHIELD_ON = 0,
-  GOODIX_IDENTIFY_CAPTURE,
-  GOODIX_IDENTIFY_IDENTIFY,
-  GOODIX_IDENTIFY_WAIT_FINGER_UP,
-  GOODIX_IDENTIFY_PWR_BTN_SHIELD_OFF,
-  GOODIX_IDENTIFY_NUM_STATES,
-} GoodixVerifyState;
+  FP_VERIFY_PWR_BTN_SHIELD_ON = 0,
+  FP_VERIFY_CAPTURE,
+  FP_VERIFY_IDENTIFY,
+  FP_VERIFY_PWR_BTN_SHIELD_OFF,
+  FP_VERIFY_NUM_STATES,
+} FpVerifyState;

libfprint/drivers/goodixmoc/goodix_proto.c

@@ -18,8 +18,6 @@
  */
 
 #include <glib.h>
-#include <stdint.h>
-
 #include "goodix_proto.h"
 
 /*
@@ -109,7 +107,7 @@ reflect (uint32_t data, uint8_t n_bits)
        * If the LSB bit is set, set the reflection of it.
        */
       if (data & 0x01)
-        reflection |= (1LU << ((n_bits - 1) - bit));
+        reflection |= (1 << ((n_bits - 1) - bit));
 
       data = (data >> 1);
     }
@@ -213,11 +211,7 @@ gx_proto_build_package (uint8_t       *ppackage,
   init_pack_header (&header, payload_size, cmd, 0);
 
   memcpy (ppackage, &header, PACKAGE_HEADER_SIZE);
-
-  if (payload)
-    memcpy (ppackage + PACKAGE_HEADER_SIZE, payload, payload_size);
-  else
-    ppackage[PACKAGE_HEADER_SIZE] = 0;
+  memcpy (ppackage + PACKAGE_HEADER_SIZE, payload, payload_size);
 
   gx_proto_crc32_calc (ppackage, PACKAGE_HEADER_SIZE + payload_size, ppackage + PACKAGE_HEADER_SIZE + payload_size);
 
@@ -226,106 +220,94 @@ gx_proto_build_package (uint8_t       *ppackage,
 
 
 int
-gx_proto_parse_header (FpiByteReader *reader,
-                       pack_header   *pheader)
+gx_proto_parse_header (
+  uint8_t     *buffer,
+  uint32_t     buffer_len,
+  pack_header *pheader)
 {
-  if (!pheader)
+  if (!buffer || !pheader)
+    return -1;
+  if (buffer_len < PACKAGE_HEADER_SIZE + PACKAGE_CRC_SIZE)
     return -1;
 
-  if (!fpi_byte_reader_get_uint8 (reader, &pheader->cmd0))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_uint8 (reader, &pheader->cmd1))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_uint8 (reader, &pheader->packagenum))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_uint8 (reader, &pheader->reserved))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_uint16_le (reader, &pheader->len))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_uint8 (reader, &pheader->crc8))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_uint8 (reader, &pheader->rev_crc8))
-    g_return_val_if_reached (-1);
-
+  memcpy (pheader, buffer, sizeof (pack_header));
+  pheader->len = GUINT16_FROM_LE (pheader->len);
+  if (buffer_len < pheader->len + PACKAGE_HEADER_SIZE)
+    return -1;
+  pheader->len -= PACKAGE_CRC_SIZE;
   return 0;
 }
 
 static int
-gx_proto_parse_fingerid (FpiByteReader     *reader,
-                         ptemplate_format_t template)
+gx_proto_parse_fingerid (
+  uint8_t          * fid_buffer,
+  uint16_t           fid_buffer_size,
+  ptemplate_format_t template
+                        )
 {
-  uint8_t byte;
+  uint8_t * buffer = NULL;
+  uint16_t Offset = 0;
 
-  if (!template)
+  if (!template || !fid_buffer)
     return -1;
 
-  if (!fpi_byte_reader_get_uint8 (reader, &byte) || byte != 67)
-    g_return_val_if_reached (-1);
+  if (fid_buffer_size < G_STRUCT_OFFSET (template_format_t, payload) + sizeof (uint32_t))
+    return -1;
 
-  if (!fpi_byte_reader_get_uint8 (reader, &template->type))
-    g_return_val_if_reached (-1);
+  buffer = fid_buffer;
+  Offset = 0;
 
-  if (!fpi_byte_reader_get_uint8 (reader, &template->finger_index))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_skip (reader, 1))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_data_static (reader, template->accountid))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_data_static (reader, template->tid))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_uint8 (reader, &template->payload.size))
-    g_return_val_if_reached (-1);
+  if (buffer[Offset++] != 67)
+    return -1;
 
+  template->type = buffer[Offset++];
+  template->finger_index = buffer[Offset++];
+  Offset++;
+  memcpy (template->accountid, &buffer[Offset], sizeof (template->accountid));
+  Offset += sizeof (template->accountid);
+  memcpy (template->tid, &buffer[Offset], sizeof (template->tid));
+  Offset += sizeof (template->tid);   // Offset == 68
+  template->payload.size = buffer[Offset++];
   if (template->payload.size > sizeof (template->payload.data))
-    {
-      g_warning ("Device reported oversized payload (%d)", template->payload.size);
-      return -1;
-    }
-
-  if (!(fpi_byte_reader_get_data_static) (reader, template->payload.size,
-                                          template->payload.data))
-    g_return_val_if_reached (-1);
+    return -1;
+  if (template->payload.size + Offset > fid_buffer_size)
+    return -1;
+  memset (template->payload.data, 0, template->payload.size);
+  memcpy (template->payload.data, &buffer[Offset], template->payload.size);
 
   return 0;
 }
 
 int
-gx_proto_parse_body (uint16_t cmd, FpiByteReader *byte_reader, pgxfp_cmd_response_t presp)
+gx_proto_parse_body (uint16_t cmd, uint8_t *buffer, uint16_t buffer_len, pgxfp_cmd_response_t presp)
 {
-  if (!presp)
+  uint16_t offset = 0;
+  uint8_t *fingerlist = NULL;
+
+  if (!buffer || !presp)
     return -1;
-
-  if (!fpi_byte_reader_get_uint8 (byte_reader, &presp->result))
-    g_return_val_if_reached (-1);
-
+  if (buffer_len < 1)
+    return -1;
+  presp->result = buffer[0];
   switch (HIBYTE (cmd))
     {
     case RESPONSE_PACKAGE_CMD:
       {
-        if (!fpi_byte_reader_get_uint8 (byte_reader, &presp->parse_msg.ack_cmd))
-          g_return_val_if_reached (-1);
+        if (buffer_len < sizeof (gxfp_parse_msg_t) + 1)
+          return -1;
+        presp->parse_msg.ack_cmd = buffer[1];
       }
       break;
 
     case MOC_CMD0_UPDATE_CONFIG:
       {
-        presp->finger_config.status = presp->result;
-        /* to compatiable old version firmware */
-        presp->finger_config.max_stored_prints = FP_MAX_FINGERNUM;
+        presp->finger_config.status = buffer[0];
+        if (buffer_len >= 3)
+          presp->finger_config.max_stored_prints = buffer[2];
+        else
+          /* to compatiable old version firmware */
+          presp->finger_config.max_stored_prints = FP_MAX_FINGERNUM;
 
-        if (fpi_byte_reader_skip (byte_reader, 1))
-          fpi_byte_reader_get_uint8 (byte_reader,
-                                     &presp->finger_config.max_stored_prints);
       }
       break;
 
@@ -336,106 +318,85 @@ gx_proto_parse_body (uint16_t cmd, FpiByteReader *byte_reader, pgxfp_cmd_respons
 
     case MOC_CMD0_PWR_BTN_SHIELD:
       presp->power_button_shield_resp.resp_cmd1 = LOBYTE (cmd);
-      uint8_t support_pwr_shield;
-
-      if (fpi_byte_reader_get_uint8 (byte_reader, &support_pwr_shield) &&
-          support_pwr_shield == 0xFF)
-        g_debug ("Power button shield feature not supported!\n");
+      if (buffer_len >= 2)
+        {
+          uint8_t support_pwr_shield = buffer[1];
+          if (support_pwr_shield == 0xFF)
+            g_debug ("Power button shield feature not supported!\n");
+        }
       break;
 
     case MOC_CMD0_GET_VERSION:
-      const uint8_t *version_info;
-
-      if (!fpi_byte_reader_get_data (byte_reader, sizeof (gxfp_version_info_t), &version_info))
-        g_return_val_if_reached (-1);
-
-      memcpy (&presp->version_info, version_info, sizeof (gxfp_version_info_t));
+      if (buffer_len < sizeof (gxfp_version_info_t) + 1)
+        return -1;
+      memcpy (&presp->version_info, buffer + 1, sizeof (gxfp_version_info_t));
       break;
 
     case MOC_CMD0_CAPTURE_DATA:
       if (LOBYTE (cmd) == MOC_CMD1_DEFAULT)
         {
-          if (!fpi_byte_reader_get_uint8 (byte_reader,
-                                          &presp->capture_data_resp.img_quality))
-            g_return_val_if_reached (-1);
-
-          if (!fpi_byte_reader_get_uint8 (byte_reader,
-                                          &presp->capture_data_resp.img_coverage))
-            g_return_val_if_reached (-1);
+          if (buffer_len < sizeof (gxfp_capturedata_t) + 1)
+            return -1;
+          presp->capture_data_resp.img_quality  = buffer[1];
+          presp->capture_data_resp.img_coverage = buffer[2];
         }
       break;
 
     case MOC_CMD0_ENROLL_INIT:
-      if (presp->result != GX_SUCCESS)
-        break;
-      const uint8_t *tid;
-      if (!fpi_byte_reader_get_data (byte_reader, TEMPLATE_ID_SIZE, &tid))
-        g_return_val_if_reached (-1);
-      memcpy (presp->enroll_create.tid, tid, TEMPLATE_ID_SIZE);
+      if (buffer_len < sizeof (gxfp_enroll_create_t) + 1)
+        return -1;
+      if (presp->result == GX_SUCCESS)
+        memcpy (&presp->enroll_create.tid, &buffer[1], TEMPLATE_ID_SIZE);
       break;
 
     case MOC_CMD0_ENROLL:
-      presp->enroll_update.rollback = (presp->result < 0x80) ? false : true;
-      if (!fpi_byte_reader_get_uint8 (byte_reader,
-                                      &presp->enroll_update.img_overlay))
-        g_return_val_if_reached (-1);
-
-      if (!fpi_byte_reader_get_uint8 (byte_reader,
-                                      &presp->enroll_update.img_preoverlay))
-        g_return_val_if_reached (-1);
+      if (buffer_len < sizeof (gxfp_enroll_update_t))
+        return -1;
+      presp->enroll_update.rollback = (buffer[0] < 0x80) ? false : true;
+      presp->enroll_update.img_overlay    = buffer[1];
+      presp->enroll_update.img_preoverlay = buffer[2];
       break;
 
     case MOC_CMD0_CHECK4DUPLICATE:
       presp->check_duplicate_resp.duplicate = (presp->result == 0) ? false : true;
       if (presp->check_duplicate_resp.duplicate)
         {
-          uint16_t tid_size;
-          FpiByteReader tid_reader;
+          if (buffer_len < 3)
+            return -1;
+          uint16_t tid_size = GUINT16_FROM_LE (*(uint16_t *) (buffer + 1));
+          offset += 3;
 
-          if (!fpi_byte_reader_get_uint16_le (byte_reader, &tid_size))
-            g_return_val_if_reached (-1);
-
-          if (!fpi_byte_reader_get_sub_reader (byte_reader, &tid_reader, tid_size))
-            g_return_val_if_reached (-1);
-
-          if (gx_proto_parse_fingerid (&tid_reader, &presp->check_duplicate_resp.template) != 0)
-            g_return_val_if_reached (-1);
+          if (buffer_len < tid_size + offset)
+            return -1;
+          if (gx_proto_parse_fingerid (buffer + offset, tid_size, &presp->check_duplicate_resp.template) != 0)
+            return -1;
         }
       break;
 
     case MOC_CMD0_GETFINGERLIST:
       if (presp->result != GX_SUCCESS)
         break;
-
-      if (!fpi_byte_reader_get_uint8 (byte_reader,
-                                      &presp->finger_list_resp.finger_num))
-        g_return_val_if_reached (-1);
-
-      if (presp->finger_list_resp.finger_num > FP_MAX_FINGERNUM)
-        {
-          g_warning ("Device reported too many fingers (%d)",
-                     presp->finger_list_resp.finger_num);
-          return -1;
-        }
-
+      if (buffer_len < 2)
+        return -1;
+      presp->finger_list_resp.finger_num = buffer[1];
+      fingerlist = buffer + 2;
       for(uint8_t num = 0; num < presp->finger_list_resp.finger_num; num++)
         {
           uint16_t fingerid_length;
-          FpiByteReader fingerid_reader;
-
-          if (!fpi_byte_reader_get_uint16_le (byte_reader, &fingerid_length))
-            g_return_val_if_reached (-1);
-
-          if (!fpi_byte_reader_get_sub_reader (byte_reader, &fingerid_reader,
-                                               fingerid_length))
-            g_return_val_if_reached (-1);
-
-          if (gx_proto_parse_fingerid (&fingerid_reader,
+          if (buffer_len < offset + 2)
+            return -1;
+          fingerid_length = GUINT16_FROM_LE (*(uint16_t *) (fingerlist + offset));
+          offset += 2;
+          if (buffer_len < fingerid_length + offset)
+            return -1;
+          if (gx_proto_parse_fingerid (fingerlist + offset,
+                                       fingerid_length,
                                        &presp->finger_list_resp.finger_list[num]) != 0)
             {
               g_warning ("Failed to parse finger list");
-              g_return_val_if_reached (-1);
+              return -1;
             }
+          offset += fingerid_length;
         }
       break;
 
@@ -444,32 +405,23 @@ gx_proto_parse_body (uint16_t cmd, FpiByteReader *byte_reader, pgxfp_cmd_respons
         uint32_t score = 0;
         uint8_t study = 0;
         uint16_t fingerid_size = 0;
-
-        presp->verify.match = (presp->result == 0) ? true : false;
-
+        presp->verify.match = (buffer[0] == 0) ? true : false;
         if (presp->verify.match)
           {
-            FpiByteReader finger_reader;
-
-            if (!fpi_byte_reader_get_uint16_le (byte_reader,
-                                                &presp->verify.rejectdetail))
-              g_return_val_if_reached (-1);
-
-            if (!fpi_byte_reader_get_uint32_le (byte_reader, &score))
-              g_return_val_if_reached (-1);
-
-            if (!fpi_byte_reader_get_uint8 (byte_reader, &study))
-              g_return_val_if_reached (-1);
-
-            if (!fpi_byte_reader_get_uint16_le (byte_reader, &fingerid_size))
-              g_return_val_if_reached (-1);
-
-            if (!fpi_byte_reader_get_sub_reader (byte_reader, &finger_reader,
-                                                 fingerid_size))
-              g_return_val_if_reached (-1);
-
-            if (gx_proto_parse_fingerid (&finger_reader,
-                                         &presp->verify.template) != 0)
+            if (buffer_len < 10)
+              return -1;
+            offset += 1;
+            presp->verify.rejectdetail = GUINT16_FROM_LE (*(uint16_t *) (buffer + offset));
+            offset += 2;
+            score = GUINT32_FROM_LE (*(uint32_t *) (buffer + offset));
+            offset += 4;
+            study = buffer[offset];
+            offset += 1;
+            fingerid_size = GUINT16_FROM_LE (*(uint16_t *) (buffer + offset));
+            offset += 2;
+            if (buffer_len < fingerid_size + offset)
+              return -1;
+            if (gx_proto_parse_fingerid (buffer + offset, fingerid_size, &presp->verify.template) != 0)
               {
                 presp->result = GX_FAILED;
                 break;
@@ -480,7 +432,7 @@ gx_proto_parse_body (uint16_t cmd, FpiByteReader *byte_reader, pgxfp_cmd_respons
       break;
 
     case MOC_CMD0_FINGER_MODE:
-      presp->finger_status.status = presp->result;
+      presp->finger_status.status = buffer[0];
       break;
 
     default:
@@ -498,6 +450,8 @@ static uint8_t sensor_config[26] = {
 int
 gx_proto_init_sensor_config (pgxfp_sensor_cfg_t pconfig)
 {
+  uint32_t crc32_calc = 0;
+
   if (!pconfig)
     return -1;
   memset (pconfig, 0, sizeof (*pconfig));
@@ -506,7 +460,9 @@ gx_proto_init_sensor_config (pgxfp_sensor_cfg_t pconfig)
   memcpy (&pconfig->config, sensor_config, G_N_ELEMENTS (sensor_config));
   pconfig->reserved[0] = 1;
 
-  gx_proto_crc32_calc ((uint8_t *) pconfig, sizeof (*pconfig) - PACKAGE_CRC_SIZE, pconfig->crc_value);
+  gx_proto_crc32_calc ((uint8_t *) pconfig, sizeof (*pconfig) - PACKAGE_CRC_SIZE, (uint8_t *) &crc32_calc);
+
+  memcpy (pconfig->crc_value, &crc32_calc, PACKAGE_CRC_SIZE);
 
   return 0;
 }

libfprint/drivers/goodixmoc/goodix_proto.h

@@ -22,8 +22,6 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "fpi-byte-reader.h"
-
 #define PACKAGE_CRC_SIZE (4)
 #define PACKAGE_HEADER_SIZE (8)
 
@@ -135,7 +133,7 @@ typedef struct _template_format
 typedef struct _gxfp_verify
 {
   bool     match;
-  uint16_t rejectdetail;
+  uint32_t rejectdetail;
   template_format_t  template;
 } gxfp_verify_t, *pgxfp_verify_t;
 
@@ -234,11 +232,13 @@ int gx_proto_build_package (uint8_t       *ppackage,
                             const uint8_t *payload,
                             uint32_t       payload_size);
 
-int gx_proto_parse_header (FpiByteReader *reader,
-                           pack_header   *pheader);
+int gx_proto_parse_header (uint8_t     *buffer,
+                           uint32_t     buffer_len,
+                           pack_header *pheader);
 
 int gx_proto_parse_body (uint16_t             cmd,
-                         FpiByteReader       *byte_reader,
+                         uint8_t             *buffer,
+                         uint16_t             buffer_len,
                          pgxfp_cmd_response_t presponse);
 
 int gx_proto_init_sensor_config (pgxfp_sensor_cfg_t pconfig);

libfprint/drivers/mafpmoc/mafpmoc.h

@@ -1,261 +0,0 @@
-#pragma once
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <stdio.h>
-#include <glib.h>
-#include <math.h>
-#include "fpi-device.h"
-#include "fpi-ssm.h"
-#include "pwd.h"
-#include <sys/utsname.h>
-
-G_DECLARE_FINAL_TYPE (FpiDeviceMafpmoc, fpi_device_mafpmoc, FPI, DEVICE_MAFPMOC, FpDevice)
-
-#define PRINT_CMD 0
-#define PRINT_SSM_DEBUG 0
-
-#define MAFP_INTERFACE_CLASS G_USB_DEVICE_CLASS_VENDOR_SPECIFIC
-#define MAFP_INTERFACE_SUB_CLASS 0x01
-#define MAFP_INTERFACE_PROTOCOL 0x01
-
-/* Usb port setting */
-#define MAFP_EP_BULK_OUT 0x03
-#define MAFP_EP_BULK_IN 0x83
-#define MAFP_EP_INT_IN 0x82
-
-/* Command transfer timeout: ms */
-#define CMD_TIMEOUT 5000
-#define DATA_TIMEOUT 5000
-#define CTRL_TIMEOUT 200
-
-#define MAFP_USB_BUFFER_SIZE 512
-#define PACKAGE_CRC_SIZE 2
-#define PACKAGE_HEADER_SIZE 9
-#define PACKAGE_DATA_SIZE_MAX (MAFP_USB_BUFFER_SIZE - PACKAGE_HEADER_SIZE - PACKAGE_CRC_SIZE)
-
-#define TEMPLATE_ID_SIZE 2
-#define TEMPLATE_UID_SIZE 128
-#define DEVICE_SN_SIZE 32
-#define MAX_FINGER_NUM 10
-#define MAX_USER_NUM 3
-#define MAX_NOTEPAD_PAGE 16
-
-#define MOC_CMD_GET_IMAGE 0x01
-#define MOC_CMD_GEN_FEATURE 0x02
-#define MOC_CMD_SEARCH 0x04
-#define MOC_CMD_GEN_TEMPLATE 0x05
-#define MOC_CMD_SAVE_TEMPLATE 0x06
-#define MOC_CMD_READ_TEMPLATE 0x07
-#define MOC_CMD_DELETE_TEMPLATE 0x0C
-#define MOC_CMD_EMPTY 0x0D
-#define MOC_CMD_WRITE_NOTEPAD 0x18
-#define MOC_CMD_READ_NOTEPAD 0x19
-#define MOC_CMD_GET_TEMPLATE_NUM 0x1D
-#define MOC_CMD_GET_TEMPLATE_TABLE 0x1F
-#define MOC_CMD_CANCEL 0x30
-#define MOC_CMD_SLEEP 0x33
-#define MOC_CMD_HANDSHAKE 0x35
-#define MOC_CMD_CALIBRATE 0x36
-#define MOC_CMD_FACTORY_RESET 0x3B
-#define MOC_CMD_FACTORY_TEST 0x56
-#define MOC_CMD_MATCH_WITHFID 0x66
-#define MOC_CMD_GET_MAX_ID 0x6d
-#define MOC_CMD_DUPAREA_TEST 0x6f
-#define MOC_CMD_SAVE_TEMPLATE_INFO 0x86
-#define MOC_CMD_GET_TEMPLATE_INFO 0x87
-#define MOC_CMD_GET_INIT_STATUS 0x88
-
-#define MAFP_SUCCESS 0
-#define MAFP_RE_TPL_NUM_OVERSIZE 0x0B
-#define MAFP_RE_GET_IMAGE_SUCCESS 0x00
-#define MAFP_RE_GET_IMAGE_NONE 0x02
-/* calibrate error (un-calibrate or calibrate failed) */
-#define MAFP_RE_CALIBRATE_ERROR 0x02
-
-#define MAFP_HANDSHAKE_CODE1 'M'
-#define MAFP_HANDSHAKE_CODE2 'A'
-
-/* Default enroll stages number */
-#define DEFAULT_ENROLL_SAMPLES 12
-#define MAFP_ENV_ENROLL_SAMPLES "MAFP_ENROLL_SAMPLES"
-
-#define MAFP_ENROLL_IDENTIFY_DISABLED 0
-#define MAFP_ENROLL_IDENTIFY_ENABLED 1
-#define MAFP_ENROLL_IDENTIFY_ONCE 2
-#define MAFP_ENROLL_DUPLICATE_DELETE_DISABLED 0
-#define MAFP_ENROLL_DUPLICATE_DELETE_ENABLED 1
-#define MAFP_ENROLL_DUPLICATE_AREA_DENY 0
-#define MAFP_ENROLL_DUPLICATE_AREA_ALLOW 1
-
-#define MAFP_SLEEP_INT_WAIT 0
-#define MAFP_SLEEP_INT_CHECK 1
-#define MAFP_SLEEP_INT_REFRESH 2
-
-#define MAFP_PRESS_WAIT_UP 0
-#define MAFP_PRESS_WAIT_DOWN 1
-
-#define MAFP_IMAGE_ERR_TRRIGER 30
-
-typedef enum {
-  MAPF_CMD_SEND = 0,
-  MAPF_CMD_RECEIVE,
-  MAPF_CMD_DATA_RECEIVE,
-  MAPF_CMD_TRANSFER_STATES,
-} MapfCmdState;
-
-typedef enum {
-  MAPF_INIT_CLEAN_EPIN = 0,
-  MAPF_INIT_CLEAN_EPOUT,
-  MAPF_INIT_CLEAN_EPIN2,
-  MAPF_INIT_HANDSHAKE,
-  MAPF_INIT_MODULE_STATUS,
-  MAPF_INIT_STATES,
-} MapfInitState;
-
-typedef enum {
-  MAFP_ENROLL_PWR_BTN_SHIELD_ON = 0,
-  MAFP_ENROLL_CHECK_EMPTY,
-  MAFP_ENROLL_TEMPLATE_TABLE,
-  MAFP_ENROLL_READ_TEMPLATE,
-  MAFP_ENROLL_VERIFY_GET_IMAGE,
-  MAFP_ENROLL_CHECK_INT_PARA,
-  MAFP_ENROLL_DETECT_MODE,
-  MAFP_ENROLL_ENABLE_INT,
-  MAFP_ENROLL_WAIT_INT,
-  MAFP_ENROLL_DISBALE_INT,
-  MAFP_ENROLL_REFRESH_INT_PARA,
-  MAFP_ENROLL_VERIFY_GENERATE_FEATURE,
-  MAFP_ENROLL_VERIFY_DUPLICATE_AREA,
-  MAFP_ENROLL_VERIFY_SEARCH,
-  MAFP_ENROLL_VERIFY_SEARCH_STEP, //match assigned id
-  MAFP_ENROLL_GET_TEMPLATE_INFO,
-  MAFP_ENROLL_SAVE_TEMPLATE_INFO,
-  MAFP_ENROLL_SAVE_TEMPLATE,
-  MAFP_ENROLL_DELETE_TEMPLATE_INFO_IF_FAILED,
-  MAFP_ENROLL_EXIT,
-  MAFP_ENROLL_STATES,
-} MapfEnrollState;
-
-typedef enum {
-  MAPF_IDENTIFY_PWR_BTN_SHIELD_ON = 0,
-  MAPF_IDENTIFY_TEMPLATE_TABLE,
-  MAPF_IDENTIFY_GET_STARTUP_RESULT,
-  MAPF_IDENTIFY_GET_IMAGE,
-  MAPF_IDENTIFY_CHECK_INT_PARA,
-  MAPF_IDENTIFY_DETECT_MODE,
-  MAPF_IDENTIFY_ENABLE_INT,
-  MAPF_IDENTIFY_WAIT_INT,
-  MAPF_IDENTIFY_DISBALE_INT,
-  MAPF_IDENTIFY_REFRESH_INT_PARA,
-  MAPF_IDENTIFY_GENERATE_FEATURE,
-  MAPF_IDENTIFY_SEARCH_STEP, //match assigned id
-  MAPF_IDENTIFY_GET_TEMPLATE_INFO,
-  MAPF_IDENTIFY_EXIT,
-  MAPF_IDENTIFY_STATES,
-} MapfIdentifyState;
-
-typedef enum {
-  MAPF_LIST_TEMPLATE_TABLE = 0,
-  MAPF_LIST_GET_TEMPLATE_INFO,
-  MAPF_LIST_STATES,
-} MapfListState;
-
-typedef enum {
-  MAPF_DELETE_TEMPLATE_TABLE = 0,
-  MAPF_DELETE_GET_TEMPLATE_INFO,
-  MAPF_DELETE_CLEAR_TEMPLATE_INFO,
-  MAPF_DELETE_TEMPLATE,
-  MAPF_DELETE_STATES,
-} MapfDeleteState;
-
-typedef enum {
-  MAPF_EMPTY_TEMPLATE = 0,
-  MAPF_EMPTY_STATES,
-} MapfDeleteAllState;
-
-typedef enum {
-  MAPF_PACK_CMD          = 0x01,   //cmd packet
-  MAPF_PACK_DATA         = 0x02,   //data packet, with more data packets later, must follow cmd or answer packet
-  MAPF_PACK_ANSWER       = 0x07,   //answer packet for cmd packet
-  MAPF_PACK_END          = 0x08,   //last data packet
-  MAPF_PACK_DATA_ANDSWER = 0x09,   //answer packet for data packet
-} MapfPackMark;
-
-#pragma pack(push, 1)
-typedef struct _mafp_handshake
-{
-  uint8_t code[2];
-  /*uint8_t state;
-     uint8_t desc[16];
-     uint8_t ver[4];*/
-} mafp_handshake_t, *pmafp_handshake_t;
-
-typedef struct _mafp_search
-{
-  uint8_t id[2];
-  uint8_t score[2];
-} mafp_search_t, *pmafp_search_t;
-
-typedef struct _mafp_tpl_table
-{
-  uint8_t used_num;
-  uint8_t list[256];
-} mafp_tpl_table_t, *pmafp_tpl_table_t;
-
-typedef struct _mafp_tpl_info
-{
-  char uid[128];
-} mafp_tpl_info_t, *pmafp_tpl_info_t;
-
-typedef struct _mafp_boot_handshake
-{
-  char     code[2];
-  uint8_t  state;
-  char     descrip[16];
-  uint32_t version;
-} mafp_boot_handshake_t, *pmafp_boot_handshake_t;
-
-typedef struct _mafp_template
-{
-  char     sn[32];
-  uint16_t id;
-  char     uid[128];
-} mafp_template_t, *pmafp_template_t;
-#pragma pack(pop)
-
-typedef struct _mafp_templates
-{
-  uint16_t        index;
-  uint16_t        total_num;
-  uint16_t        priv_num;
-  mafp_template_t total_list[256];
-  mafp_template_t priv_list[MAX_FINGER_NUM];
-  GPtrArray      *list;
-} mafp_templates_t, *pmafp_templates_t;
-
-typedef struct _fp_cmd_response
-{
-  uint8_t result;
-  union
-  {
-    mafp_handshake_t      handshake;
-    mafp_search_t         search;
-    mafp_tpl_table_t      tpl_table;
-    mafp_tpl_info_t       tpl_info;
-    mafp_boot_handshake_t boot_handshake;
-  };
-} mafp_cmd_response_t, *pmafp_cmd_response_t;
-
-typedef struct _pack_header
-{
-  uint8_t head0;
-  uint8_t head1;
-  uint8_t addr0;
-  uint8_t addr1;
-  uint8_t addr2;
-  uint8_t addr3;
-  uint8_t flag;
-  uint8_t frame_len0;
-  uint8_t frame_len1;
-} pack_header, *ppack_header;

libfprint/drivers/nb1010.c

@@ -412,7 +412,6 @@ nb1010_dev_change_state (FpImageDevice *dev, FpiImageDeviceState state)
 
 static const FpIdEntry id_table[] = {
   { .vid = 0x298d,  .pid = 0x1010, },
-  { .vid = 0x298d,  .pid = 0x2020, },
   { .vid = 0,  .pid = 0,  .driver_data = 0 },
 };
 
@@ -428,7 +427,7 @@ fpi_device_nb1010_class_init (FpiDeviceNb1010Class *klass)
   FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_CLASS (klass);
 
   dev_class->id = FP_COMPONENT;
-  dev_class->full_name = "NextBiometrics NB-1010-U/NB-2020-U";
+  dev_class->full_name = "NextBiometrics NB-1010-U";
   dev_class->type = FP_DEVICE_TYPE_USB;
   dev_class->id_table = id_table;
   dev_class->scan_type = FP_SCAN_TYPE_PRESS;

libfprint/drivers/realtek/realtek.c

@@ -28,9 +28,6 @@ G_DEFINE_TYPE (FpiDeviceRealtek, fpi_device_realtek, FP_TYPE_DEVICE)
 
 static const FpIdEntry id_table[] = {
   { .vid = 0x0bda,  .pid = 0x5813,  },
-  { .vid = 0x0bda,  .pid = 0x5816,  },
-  { .vid = 0x2541,  .pid = 0xfa03,  },
-  { .vid = 0x3274,  .pid = 0x9003,  },
   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
 
@@ -61,7 +58,7 @@ parse_print_data (GVariant      *data,
 
   *user_id = g_variant_get_fixed_array (user_id_var, user_id_len, 1);
 
-  if (*user_id_len == 0 || *user_id_len > DEFAULT_UID_LEN)
+  if (*user_id_len <= 0 || *user_id_len > DEFAULT_UID_LEN)
     return FALSE;
 
   if (*user_id[0] == '\0' || *user_id[0] == ' ')
@@ -95,50 +92,6 @@ fp_task_ssm_generic_cb (FpiDeviceRealtek *self,
   fpi_ssm_next_state (self->task_ssm);
 }
 
-static void
-fp_get_device_info_cb (FpiDeviceRealtek *self,
-                       uint8_t          *buffer_in,
-                       GError           *error)
-{
-  if (error)
-    {
-      fpi_ssm_mark_failed (self->task_ssm, error);
-      return;
-    }
-
-  self->template_len = TEMPLATE_LEN_COMMON;
-
-  fpi_ssm_next_state (self->task_ssm);
-}
-
-static void
-fp_update_template_cb (FpiDeviceRealtek *self,
-                       uint8_t          *buffer_in,
-                       GError           *error)
-{
-  if (error)
-    {
-      fpi_ssm_mark_failed (self->task_ssm, error);
-      return;
-    }
-
-  fpi_ssm_jump_to_state (self->task_ssm, FP_RTK_VERIFY_NUM_STATES);
-}
-
-static void
-fp_enroll_commit_cb (FpiDeviceRealtek *self,
-                     uint8_t          *buffer_in,
-                     GError           *error)
-{
-  if (error)
-    {
-      fpi_ssm_mark_failed (self->task_ssm, error);
-      return;
-    }
-
-  fpi_ssm_jump_to_state (self->task_ssm, FP_RTK_ENROLL_NUM_STATES);
-}
-
 static void
 fp_finish_capture_cb (FpiDeviceRealtek *self,
                       uint8_t          *buffer_in,
@@ -150,17 +103,8 @@ fp_finish_capture_cb (FpiDeviceRealtek *self,
       return;
     }
 
-  /* We hope this polling CMD can be completed before the action is cancelled */
-  GCancellable *cancellable = fpi_device_get_cancellable (FP_DEVICE (self));
-  if (g_cancellable_is_cancelled (cancellable))
-    {
-      fpi_ssm_mark_failed (self->task_ssm,
-                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                     "Action is cancelled!"));
-      return;
-    }
-
   gint capture_status = buffer_in[0];
+
   if (capture_status == 0)
     {
       fpi_device_report_finger_status_changes (FP_DEVICE (self),
@@ -234,16 +178,6 @@ fp_accept_sample_cb (FpiDeviceRealtek *self,
             }
           return;
         }
-
-      if (in_status != FP_RTK_SUCCESS)
-        {
-          fpi_ssm_mark_failed (self->task_ssm,
-                               fpi_device_error_new_msg (FP_DEVICE_ERROR_DATA_INVALID,
-                                                         "Enrollment failed (status 0x%02x)",
-                                                         in_status));
-          return;
-        }
-
       fpi_ssm_next_state (self->task_ssm);
     }
 }
@@ -304,6 +238,7 @@ fp_identify_feature_cb (FpiDeviceRealtek *self,
     }
 
   gint in_status = buffer_in[0];
+
   if (in_status == FP_RTK_CMD_ERR)
     {
       fpi_ssm_mark_failed (self->task_ssm,
@@ -356,7 +291,7 @@ fp_identify_feature_cb (FpiDeviceRealtek *self,
           else
             {
               fpi_device_identify_report (device, print, match, error);
-              fpi_ssm_jump_to_state (self->task_ssm, FP_RTK_VERIFY_NUM_STATES);
+              fpi_ssm_mark_completed (self->task_ssm);
             }
           return;
         }
@@ -405,9 +340,9 @@ fp_get_delete_pos_cb (FpiDeviceRealtek *self,
 
   for (gint i = 0; i < self->template_num; i++)
     {
-      if (buffer_in[i * self->template_len] != 0)
+      if (buffer_in[i * TEMPLATE_LEN] != 0)
         {
-          memcpy (temp_userid, buffer_in + i * self->template_len + UID_OFFSET, DEFAULT_UID_LEN);
+          memcpy (temp_userid, buffer_in + i * TEMPLATE_LEN + UID_OFFSET, DEFAULT_UID_LEN);
           if (g_strcmp0 (fp_print_get_description (print), (const char *) temp_userid) == 0)
             {
               self->pos_index = i;
@@ -445,25 +380,10 @@ fp_get_enroll_num_cb (FpiDeviceRealtek *self,
 }
 
 static void
-fp_verify_get_template_cb (FpiDeviceRealtek *self,
-                           uint8_t          *buffer_in,
-                           GError           *error)
+fp_get_template_cb (FpiDeviceRealtek *self,
+                    uint8_t          *buffer_in,
+                    GError           *error)
 {
-  if (error)
-    {
-      fpi_ssm_mark_failed (self->task_ssm, error);
-      return;
-    }
-
-  fpi_ssm_next_state (self->task_ssm);
-}
-
-static void
-fp_enroll_get_template_cb (FpiDeviceRealtek *self,
-                           uint8_t          *buffer_in,
-                           GError           *error)
-{
-  g_autofree guchar *seq_list = NULL;
   gboolean found = FALSE;
 
   if (error)
@@ -474,7 +394,7 @@ fp_enroll_get_template_cb (FpiDeviceRealtek *self,
 
   for (gint i = 0; i < self->template_num; i++)
     {
-      if (buffer_in[i * self->template_len] == 0)
+      if (buffer_in[i * TEMPLATE_LEN] == 0)
         {
           self->pos_index = i;
           found = TRUE;
@@ -505,6 +425,7 @@ fp_check_duplicate_cb (FpiDeviceRealtek *self,
     }
 
   gint in_status = buffer_in[0];
+
   if (in_status == FP_RTK_CMD_ERR)
     {
       fpi_ssm_mark_failed (self->task_ssm,
@@ -550,10 +471,10 @@ fp_list_cb (FpiDeviceRealtek *self,
 
   for (gint i = 0; i < self->template_num; i++)
     {
-      if (buffer_in[i * self->template_len] != 0)
+      if (buffer_in[i * TEMPLATE_LEN] != 0)
         {
           FpPrint *print = NULL;
-          print = fp_print_from_data (self, buffer_in + i * self->template_len + SUBFACTOR_OFFSET);
+          print = fp_print_from_data (self, buffer_in + i * TEMPLATE_LEN + SUBFACTOR_OFFSET);
           g_ptr_array_add (list_result, g_object_ref_sink (print));
           found = TRUE;
         }
@@ -597,11 +518,11 @@ parse_status (guint8 *buffer, gint status_type)
 {
   switch (status_type)
     {
-    case FP_RTK_MSG_NO_STATUS:
+    case FP_RTK_MSG_PLAINTEXT_NO_STATUS:
       return 0;
       break;
 
-    case FP_RTK_MSG_DEFAULT:
+    case FP_RTK_MSG_PLAINTEXT:
       return buffer[0];
       break;
 
@@ -648,14 +569,6 @@ fp_cmd_receive_cb (FpiUsbTransfer *transfer,
     {
       g_autofree guchar *read_buf = NULL;
 
-      if ((gsize) transfer->actual_length < self->trans_data_len)
-        {
-          fpi_ssm_mark_failed (transfer->ssm,
-                               fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                         "Truncated data received"));
-          return;
-        }
-
       read_buf = g_malloc0 (sizeof (guchar) * (self->trans_data_len));
       memcpy (read_buf, transfer->buffer, self->trans_data_len);
       self->read_data = g_steal_pointer (&read_buf);
@@ -708,13 +621,13 @@ fp_cmd_run_state (FpiSsm *ssm, FpDevice *dev)
       break;
 
     case FP_RTK_CMD_TRANS_DATA:
-      if (self->cmd_type == FP_RTK_CMD_BULK_ONLY)
+      if (self->cmd_type == FP_RTK_CMD_ONLY)
         {
           fpi_ssm_jump_to_state (ssm, FP_RTK_CMD_GET_STATUS);
           break;
         }
 
-      if (self->cmd_type == FP_RTK_CMD_BULK_WRITE)
+      if (self->cmd_type == FP_RTK_CMD_WRITE)
         {
           if (self->data_transfer)
             {
@@ -775,10 +688,10 @@ fp_cmd_ssm_done (FpiSsm *ssm, FpDevice *dev, GError *error)
 }
 
 static FpiUsbTransfer *
-prepare_bulk_transfer (FpDevice      *dev,
-                       guint8        *data,
-                       gsize          data_len,
-                       GDestroyNotify free_func)
+prepare_transfer (FpDevice      *dev,
+                  guint8        *data,
+                  gsize          data_len,
+                  GDestroyNotify free_func)
 {
   g_autoptr(FpiUsbTransfer) transfer = NULL;
 
@@ -795,100 +708,29 @@ prepare_bulk_transfer (FpDevice      *dev,
   return g_steal_pointer (&transfer);
 }
 
-
 static void
-fp_ctrl_cmd_cb (FpiUsbTransfer *transfer,
-                FpDevice       *device,
-                gpointer        user_data,
-                GError         *error)
-{
-  FpiDeviceRealtek *self = FPI_DEVICE_REALTEK (device);
-  g_autofree CommandData *data = g_steal_pointer (&user_data);
-
-  g_return_if_fail (data != NULL);
-
-  if (error)
-    {
-      fpi_ssm_mark_failed (transfer->ssm, error);
-      return;
-    }
-
-  if (transfer->direction == G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE)
-    {
-      if (data->callback)
-        data->callback (self, NULL, NULL);
-    }
-  else
-    {
-      if (transfer->actual_length == 0)
-        {
-          fp_info ("Control transfer receive data failed!");
-          fpi_ssm_mark_failed (transfer->ssm,
-                               fpi_device_error_new (FP_DEVICE_ERROR_DATA_INVALID));
-          return;
-        }
-
-      if (data->callback)
-        data->callback (self, transfer->buffer, NULL);
-    }
-}
-
-static void
-rtk_send_ctrl_cmd (FpiDeviceRealtek    *self,
-                   struct rtk_cmd_ctrl *ctrl_cmd,
-                   guint8              *cmd_data,
-                   SynCmdMsgCallback    callback)
-{
-  FpiUsbTransfer *transfer = NULL;
-  g_autofree CommandData *data = g_new0 (CommandData, 1);
-
-  data->callback = callback;
-
-  transfer = fpi_usb_transfer_new (FP_DEVICE (self));
-  fpi_usb_transfer_fill_control (transfer,
-                                 ctrl_cmd->direction,
-                                 G_USB_DEVICE_REQUEST_TYPE_VENDOR,
-                                 G_USB_DEVICE_RECIPIENT_DEVICE,
-                                 ctrl_cmd->request,
-                                 ctrl_cmd->value,
-                                 ctrl_cmd->index,
-                                 ctrl_cmd->len);
-
-  transfer->ssm = self->task_ssm;
-  if (ctrl_cmd->direction == G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST &&
-      cmd_data != NULL && ctrl_cmd->len != 0)
-    memcpy (transfer->buffer, cmd_data, ctrl_cmd->len);
-
-  fpi_usb_transfer_submit (transfer,
-                           CMD_TIMEOUT,
-                           NULL,
-                           fp_ctrl_cmd_cb,
-                           g_steal_pointer (&data));
-}
-
-static void
-rtk_sensor_bulk_cmd (FpiDeviceRealtek *self,
-                     guint8           *cmd,
-                     guint8           *trans_data,
-                     FpRtkMsgType      message_type,
-                     gboolean          bwait_data_delay,
-                     SynCmdMsgCallback callback)
+realtek_sensor_cmd (FpiDeviceRealtek *self,
+                    guint8           *cmd,
+                    guint8           *trans_data,
+                    FpRtkMsgType      message_type,
+                    gboolean          bwait_data_delay,
+                    SynCmdMsgCallback callback)
 {
   g_autoptr(FpiUsbTransfer) cmd_transfer = NULL;
   g_autoptr(FpiUsbTransfer) data_transfer = NULL;
   CommandData *data = g_new0 (CommandData, 1);
 
-  self->cmd_type = GET_BULK_CMD_TYPE (cmd[0]);
+  self->cmd_type = GET_CMD_TYPE (cmd[0]);
   self->message_type = message_type;
   self->trans_data_len = GET_TRANS_DATA_LEN (cmd[11], cmd[10]);
   self->cmd_cancellable = bwait_data_delay;
 
-  cmd_transfer = prepare_bulk_transfer (FP_DEVICE (self), cmd, FP_RTK_CMD_BULK_TOTAL_LEN, NULL);
+  cmd_transfer = prepare_transfer (FP_DEVICE (self), cmd, FP_RTK_CMD_TOTAL_LEN, NULL);
   self->cmd_transfer = g_steal_pointer (&cmd_transfer);
 
-  if ((self->cmd_type == FP_RTK_CMD_BULK_WRITE) && trans_data)
+  if ((self->cmd_type == FP_RTK_CMD_WRITE) && trans_data)
     {
-      data_transfer = prepare_bulk_transfer (FP_DEVICE (self), trans_data, self->trans_data_len, g_free);
+      data_transfer = prepare_transfer (FP_DEVICE (self), trans_data, self->trans_data_len, g_free);
       self->data_transfer = g_steal_pointer (&data_transfer);
     }
 
@@ -987,55 +829,34 @@ fp_verify_sm_run_state (FpiSsm *ssm, FpDevice *device)
 
   switch (fpi_ssm_get_cur_state (ssm))
     {
-    case FP_RTK_VERIFY_GET_TEMPLATE:
-      if (self->template_num <= 0)
-        {
-          fpi_ssm_mark_failed (ssm,
-                               fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                         "No templates enrolled"));
-          break;
-        }
-
-      co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num);
-      co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num);
-      cmd_buf = (guint8 *) &co_get_template;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_verify_get_template_cb);
-      break;
-
     case FP_RTK_VERIFY_CAPTURE:
       fpi_device_report_finger_status_changes (device,
                                                FP_FINGER_STATUS_NEEDED,
                                                FP_FINGER_STATUS_NONE);
 
       cmd_buf = (guint8 *) &co_start_capture;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_task_ssm_generic_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 1, fp_task_ssm_generic_cb);
       break;
 
     case FP_RTK_VERIFY_FINISH_CAPTURE:
       cmd_buf = (guint8 *) &co_finish_capture;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_finish_capture_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 1, fp_finish_capture_cb);
       break;
 
     case FP_RTK_VERIFY_ACCEPT_SAMPLE:
       co_accept_sample.param[0] = self->fp_purpose;
       cmd_buf = (guint8 *) &co_accept_sample;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_NO_STATUS, 0, fp_accept_sample_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT_NO_STATUS, 1, fp_accept_sample_cb);
       break;
 
     case FP_RTK_VERIFY_INDENTIFY_FEATURE:
-      cmd_buf = (guint8 *) &nor_identify_feature;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_NO_STATUS, 0, fp_identify_feature_cb);
+      cmd_buf = (guint8 *) &tls_identify_feature;
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT_NO_STATUS, 0, fp_identify_feature_cb);
       break;
 
     case FP_RTK_VERIFY_UPDATE_TEMPLATE:
       cmd_buf = (guint8 *) &co_update_template;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_update_template_cb);
-      break;
-
-    case FP_RTK_VERIFY_CANCEL_CAPTURE:
-      co_cancel_capture.param[0] = self->fp_purpose;
-      cmd_buf = (guint8 *) &co_cancel_capture;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_task_ssm_generic_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 0, fp_task_ssm_generic_cb);
       break;
     }
 }
@@ -1048,6 +869,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
   FpiDeviceRealtek *self = FPI_DEVICE_REALTEK (device);
   FpPrint *print = NULL;
   guint8 *cmd_buf = NULL;
+  guint8 *trans_id = NULL;
   GVariant *uid = NULL;
   GVariant *data = NULL;
   gsize user_id_len;
@@ -1056,25 +878,19 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
   switch (fpi_ssm_get_cur_state (ssm))
     {
     case FP_RTK_ENROLL_GET_TEMPLATE:
-      if (self->template_num <= 0)
-        {
-          fpi_ssm_mark_failed (ssm,
-                               fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                         "No templates enrolled"));
-          break;
-        }
+      g_assert (self->template_num > 0);
 
-      co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num);
-      co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num);
+      co_get_template.data_len[0] = GET_LEN_L (TEMPLATE_LEN * self->template_num);
+      co_get_template.data_len[1] = GET_LEN_H (TEMPLATE_LEN * self->template_num);
 
       cmd_buf = (guint8 *) &co_get_template;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_enroll_get_template_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 0, fp_get_template_cb);
       break;
 
     case FP_RTK_ENROLL_BEGIN_POS:
-      nor_enroll_begin.param[0] = self->pos_index;
-      cmd_buf = (guint8 *) &nor_enroll_begin;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_task_ssm_generic_cb);
+      tls_enroll_begin.param[0] = self->pos_index;
+      cmd_buf = (guint8 *) &tls_enroll_begin;
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 0, fp_task_ssm_generic_cb);
       break;
 
     case FP_RTK_ENROLL_CAPTURE:
@@ -1083,42 +899,39 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
                                                FP_FINGER_STATUS_NONE);
 
       cmd_buf = (guint8 *) &co_start_capture;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_task_ssm_generic_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 1, fp_task_ssm_generic_cb);
       break;
 
     case FP_RTK_ENROLL_FINISH_CAPTURE:
       cmd_buf = (guint8 *) &co_finish_capture;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_finish_capture_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 1, fp_finish_capture_cb);
       break;
 
     case FP_RTK_ENROLL_ACCEPT_SAMPLE:
       co_accept_sample.param[0] = self->fp_purpose;
       cmd_buf = (guint8 *) &co_accept_sample;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_NO_STATUS, 0, fp_accept_sample_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT_NO_STATUS, 1, fp_accept_sample_cb);
       break;
 
     case FP_RTK_ENROLL_CHECK_DUPLICATE:
       cmd_buf = (guint8 *) &co_check_duplicate;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_NO_STATUS, 0, fp_check_duplicate_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT_NO_STATUS, 1, fp_check_duplicate_cb);
       break;
 
     case FP_RTK_ENROLL_COMMIT:
-      gchar *valid_uid = NULL;
-      gint payload_len;
-
-      payload_len = UID_PAYLOAD_LEN_DEFAULT;
-
       fpi_device_get_enroll_data (device, &print);
       user_id = fpi_print_generate_user_id (print);
-      user_id_len = MIN (DEFAULT_UID_LEN, strlen (user_id));
+      user_id_len = strlen (user_id);
+      user_id_len = MIN (DEFAULT_UID_LEN, user_id_len);
 
-      payload = g_malloc0 (payload_len);
+      payload = g_malloc0 (UID_PAYLOAD_LEN);
       memcpy (payload, user_id, user_id_len);
-      valid_uid = (gchar *) payload;
+
+      trans_id = g_steal_pointer (&payload);
 
       finger = SUB_FINGER_01;
       uid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
-                                       valid_uid,
+                                       user_id,
                                        user_id_len,
                                        1);
       data = g_variant_new ("(y@ay)",
@@ -1128,23 +941,14 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
       fpi_print_set_type (print, FPI_PRINT_RAW);
       fpi_print_set_device_stored (print, TRUE);
       g_object_set (print, "fpi-data", data, NULL);
-      g_object_set (print, "description", valid_uid, NULL);
+      g_object_set (print, "description", user_id, NULL);
 
       g_debug ("user_id: %s, finger: 0x%x", user_id, finger);
 
-      nor_enroll_commit.param[0] = SUB_FINGER_01;
-      nor_enroll_commit.data_len[0] = GET_LEN_L (payload_len);
-      nor_enroll_commit.data_len[1] = GET_LEN_H (payload_len);
-
-      cmd_buf = (guint8 *) &nor_enroll_commit;
-      rtk_sensor_bulk_cmd (self, cmd_buf, g_steal_pointer (&payload),
-                           FP_RTK_MSG_DEFAULT, 1, fp_enroll_commit_cb);
+      tls_enroll_commit.param[0] = SUB_FINGER_01;
+      cmd_buf = (guint8 *) &tls_enroll_commit;
+      realtek_sensor_cmd (self, cmd_buf, trans_id, FP_RTK_MSG_PLAINTEXT, 0, fp_task_ssm_generic_cb);
       break;
-
-    case FP_RTK_ENROLL_CANCEL_CAPTURE:
-      co_cancel_capture.param[0] = self->fp_purpose;
-      cmd_buf = (guint8 *) &co_cancel_capture;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_task_ssm_generic_cb);
     }
 }
 
@@ -1156,19 +960,15 @@ fp_init_sm_run_state (FpiSsm *ssm, FpDevice *device)
 
   switch (fpi_ssm_get_cur_state (ssm))
     {
-    case FP_RTK_INIT_GET_DEVICE_INFO:
-      rtk_send_ctrl_cmd (self, &get_device_info, NULL, fp_get_device_info_cb);
-      break;
-
     case FP_RTK_INIT_SELECT_OS:
       co_select_system.param[0] = 0x01;
       cmd_buf = (guint8 *) &co_select_system;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_task_ssm_generic_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 0, fp_task_ssm_generic_cb);
       break;
 
     case FP_RTK_INIT_GET_ENROLL_NUM:
       cmd_buf = (guint8 *) &co_get_enroll_num;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_get_enroll_num_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 0, fp_get_enroll_num_cb);
       break;
     }
 }
@@ -1182,25 +982,19 @@ fp_delete_sm_run_state (FpiSsm *ssm, FpDevice *device)
   switch (fpi_ssm_get_cur_state (ssm))
     {
     case FP_RTK_DELETE_GET_POS:
-      if (self->template_num <= 0)
-        {
-          fpi_ssm_mark_failed (ssm,
-                               fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                         "No templates enrolled"));
-          break;
-        }
+      g_assert (self->template_num > 0);
 
-      co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num);
-      co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num);
+      co_get_template.data_len[0] = GET_LEN_L (TEMPLATE_LEN * self->template_num);
+      co_get_template.data_len[1] = GET_LEN_H (TEMPLATE_LEN * self->template_num);
 
       cmd_buf = (guint8 *) &co_get_template;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_get_delete_pos_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 0, fp_get_delete_pos_cb);
       break;
 
     case FP_RTK_DELETE_PRINT:
       co_delete_record.param[0] = self->pos_index;
       cmd_buf = (guint8 *) &co_delete_record;
-      rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_task_ssm_generic_cb);
+      realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 0, fp_task_ssm_generic_cb);
       break;
     }
 }
@@ -1218,14 +1012,17 @@ identify_verify (FpDevice *device)
   g_assert (current_action == FPI_DEVICE_ACTION_VERIFY ||
             current_action == FPI_DEVICE_ACTION_IDENTIFY);
 
-  self->fp_purpose = FP_RTK_PURPOSE_IDENTIFY;
+  if (current_action == FPI_DEVICE_ACTION_IDENTIFY)
+    self->fp_purpose = FP_RTK_PURPOSE_IDENTIFY;
+  else
+    self->fp_purpose = FP_RTK_PURPOSE_VERIFY;
 
   g_assert (!self->task_ssm);
 
   self->task_ssm = fpi_ssm_new_full (device,
                                      fp_verify_sm_run_state,
                                      FP_RTK_VERIFY_NUM_STATES,
-                                     FP_RTK_VERIFY_CANCEL_CAPTURE,
+                                     FP_RTK_VERIFY_NUM_STATES,
                                      "Verify & Identify");
 
   fpi_ssm_start (self->task_ssm, fp_verify_ssm_done);
@@ -1245,7 +1042,7 @@ enroll (FpDevice *device)
   self->task_ssm = fpi_ssm_new_full (device,
                                      fp_enroll_sm_run_state,
                                      FP_RTK_ENROLL_NUM_STATES,
-                                     FP_RTK_ENROLL_CANCEL_CAPTURE,
+                                     FP_RTK_ENROLL_NUM_STATES,
                                      "Enroll");
 
   fpi_ssm_start (self->task_ssm, fp_enroll_ssm_done);
@@ -1370,7 +1167,7 @@ clear_storage (FpDevice *device)
   G_DEBUG_HERE ();
   co_delete_record.param[0] = 0xff;
   cmd_buf = (guint8 *) &co_delete_record;
-  rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 0, fp_clear_storage_cb);
+  realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 0, fp_clear_storage_cb);
 }
 
 static void
@@ -1380,27 +1177,13 @@ list_print (FpDevice *device)
   guint8 *cmd_buf = NULL;
 
   G_DEBUG_HERE ();
+  g_assert (self->template_num > 0);
 
-  if (self->template_num < 0)
-    {
-      fpi_device_list_complete (device, NULL,
-                                fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                          "Get template number failed!"));
-      return;
-    }
-
-  if (self->template_num == 0)
-    {
-      g_autoptr(GPtrArray) list_result = g_ptr_array_new_with_free_func (g_object_unref);
-      fpi_device_list_complete (device, g_steal_pointer (&list_result), NULL);
-      return;
-    }
-
-  co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num);
-  co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num);
+  co_get_template.data_len[0] = GET_LEN_L (TEMPLATE_LEN * self->template_num);
+  co_get_template.data_len[1] = GET_LEN_H (TEMPLATE_LEN * self->template_num);
 
   cmd_buf = (guint8 *) &co_get_template;
-  rtk_sensor_bulk_cmd (self, cmd_buf, NULL, FP_RTK_MSG_DEFAULT, 1, fp_list_cb);
+  realtek_sensor_cmd (self, cmd_buf, NULL, FP_RTK_MSG_PLAINTEXT, 1, fp_list_cb);
 }
 
 static void

libfprint/drivers/realtek/realtek.h

@@ -30,17 +30,16 @@
 
 #define EP_IN_MAX_BUF_SIZE 2048
 
-#define FP_RTK_CMD_BULK_TOTAL_LEN 12
-#define FP_RTK_CMD_BULK_LEN 2
-#define FP_RTK_CMD_BULK_PARAM_LEN 4
-#define FP_RTK_CMD_BULK_ADDR_LEN 4
-#define FP_RTK_CMD_BULK_DATA_LEN 2
-
-#define TEMPLATE_LEN_COMMON 35
+#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_DEFAULT 32
+#define UID_PAYLOAD_LEN 32
 
 /* Command transfer timeout :ms*/
 #define CMD_TIMEOUT 1000
@@ -51,7 +50,7 @@
 #define DEFAULT_UID_LEN 28
 #define SUB_FINGER_01 0xFF
 
-#define GET_BULK_CMD_TYPE(val)              ((val & 0xC0) >> 6)
+#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)
@@ -68,19 +67,19 @@ typedef struct
 } CommandData;
 
 typedef enum {
-  FP_RTK_CMD_BULK_ONLY = 0,
-  FP_RTK_CMD_BULK_READ,
-  FP_RTK_CMD_BULK_WRITE,
+  FP_RTK_CMD_ONLY = 0,
+  FP_RTK_CMD_READ,
+  FP_RTK_CMD_WRITE,
 } FpRtkCmdType;
 
 typedef enum {
-  FP_RTK_MSG_DEFAULT = 0,
-  FP_RTK_MSG_NO_STATUS,
+  FP_RTK_MSG_PLAINTEXT = 0,
+  FP_RTK_MSG_PLAINTEXT_NO_STATUS,
 } FpRtkMsgType;
 
 typedef enum {
-  FP_RTK_PURPOSE_VERIFY   = 0x01,
-  FP_RTK_PURPOSE_IDENTIFY = 0x02,
+  FP_RTK_PURPOSE_IDENTIFY = 0x01,     /* identify before enroll */
+  FP_RTK_PURPOSE_VERIFY   = 0x02,
   FP_RTK_PURPOSE_ENROLL   = 0x04,
 } FpRtkPurpose;
 
@@ -108,18 +107,15 @@ typedef enum {
   FP_RTK_ENROLL_ACCEPT_SAMPLE,
   FP_RTK_ENROLL_CHECK_DUPLICATE,
   FP_RTK_ENROLL_COMMIT,
-  FP_RTK_ENROLL_CANCEL_CAPTURE,
   FP_RTK_ENROLL_NUM_STATES,
 } FpRtkEnrollState;
 
 typedef enum {
-  FP_RTK_VERIFY_GET_TEMPLATE = 0,
-  FP_RTK_VERIFY_CAPTURE,
+  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_CANCEL_CAPTURE,
   FP_RTK_VERIFY_NUM_STATES,
 } FpRtkVerifyState;
 
@@ -130,8 +126,7 @@ typedef enum {
 } FpRtkDeleteState;
 
 typedef enum {
-  FP_RTK_INIT_GET_DEVICE_INFO = 0,
-  FP_RTK_INIT_SELECT_OS,
+  FP_RTK_INIT_SELECT_OS = 0,
   FP_RTK_INIT_GET_ENROLL_NUM,
   FP_RTK_INIT_NUM_STATES,
 } FpRtkInitState;
@@ -160,87 +155,66 @@ struct _FpiDeviceRealtek
   FpRtkPurpose    fp_purpose;
   gint            pos_index;
   gint            template_num;
-  gint            template_len;
 };
 
-struct rtk_cmd_bulk
+struct realtek_fp_cmd
 {
-  uint8_t cmd[FP_RTK_CMD_BULK_LEN];
-  uint8_t param[FP_RTK_CMD_BULK_PARAM_LEN];
-  uint8_t addr[FP_RTK_CMD_BULK_ADDR_LEN];
-  uint8_t data_len[FP_RTK_CMD_BULK_DATA_LEN];
+  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];
 };
 
-struct rtk_cmd_ctrl
-{
-  int      direction;
-  uint8_t  request;
-  uint16_t value;
-  uint16_t index;
-  uint16_t len;
-};
-
-static struct rtk_cmd_ctrl get_device_info = {
-  .direction = G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST,
-  .request = 0x07,
-  .value = 0x000D,
-  .index = 0x0000,
-  .len = 0x0008,
-};
-
-static struct rtk_cmd_bulk co_start_capture = {
+static struct realtek_fp_cmd co_start_capture = {
   .cmd = {0x05, 0x05},
 };
 
-static struct rtk_cmd_bulk co_finish_capture = {
+static struct realtek_fp_cmd co_finish_capture = {
   .cmd = {0x45, 0x06},
   .data_len = {0x05},
 };
 
-static struct rtk_cmd_bulk co_accept_sample = {
+static struct realtek_fp_cmd co_accept_sample = {
   .cmd = {0x45, 0x08},
   .data_len = {0x09},
 };
 
-static struct rtk_cmd_bulk nor_identify_feature = {
+static struct realtek_fp_cmd tls_identify_feature = {
   .cmd = {0x45, 0x22},
   .data_len = {0x2A},
 };
 
-static struct rtk_cmd_bulk co_get_enroll_num = {
+static struct realtek_fp_cmd co_get_enroll_num = {
   .cmd = {0x45, 0x0d},
   .data_len = {0x02},
 };
 
-static struct rtk_cmd_bulk co_get_template = {
+static struct realtek_fp_cmd co_get_template = {
   .cmd = {0x45, 0x0E},
 };
 
-static struct rtk_cmd_bulk nor_enroll_begin = {
+static struct realtek_fp_cmd tls_enroll_begin = {
   .cmd = {0x05, 0x20},
 };
 
-static struct rtk_cmd_bulk co_check_duplicate = {
+static struct realtek_fp_cmd co_check_duplicate = {
   .cmd = {0x45, 0x10},
   .data_len = {0x22},
 };
 
-static struct rtk_cmd_bulk nor_enroll_commit = {
+static struct realtek_fp_cmd tls_enroll_commit = {
   .cmd = {0x85, 0x21},
+  .data_len = {0x20},
 };
 
-static struct rtk_cmd_bulk co_update_template = {
+static struct realtek_fp_cmd co_update_template = {
   .cmd = {0x05, 0x11},
 };
 
-static struct rtk_cmd_bulk co_delete_record = {
+static struct realtek_fp_cmd co_delete_record = {
   .cmd = {0x05, 0x0F},
 };
 
-static struct rtk_cmd_bulk co_select_system = {
+static struct realtek_fp_cmd co_select_system = {
   .cmd = {0x05, 0x13},
 };
-
-static struct rtk_cmd_bulk co_cancel_capture = {
-  .cmd = {0x05, 0x07},
-};

libfprint/drivers/synaptics/bmkt_message.c

@@ -177,25 +177,17 @@ parse_get_enrolled_fingers_report (bmkt_msg_resp_t *msg_resp, bmkt_response_t *r
 
   if (msg_resp->payload_len < 2)
     return BMKT_UNRECOGNIZED_MESSAGE;
-
   /* 2 bytes per finger so calculate the total number of fingers to process*/
   int num_fingers = (msg_resp->payload_len) / 2;
 
   bmkt_enrolled_fingers_resp_t *get_enrolled_fingers_resp = &resp->response.enrolled_fingers_resp;
 
-  if (num_fingers > (int) G_N_ELEMENTS (get_enrolled_fingers_resp->fingers))
-    {
-      g_warning ("Device reported more enrolled fingers (%d) than supported",
-                 num_fingers);
-      num_fingers = G_N_ELEMENTS (get_enrolled_fingers_resp->fingers);
-    }
-
   for (i = 0; i < num_fingers; i++)
     {
       get_enrolled_fingers_resp->fingers[i].finger_id = extract8 (msg_resp->payload, &offset);
       get_enrolled_fingers_resp->fingers[i].template_status = extract8 (msg_resp->payload, &offset);
-    }
 
+    }
   return BMKT_SUCCESS;
 }
 static int
@@ -222,18 +214,10 @@ parse_get_enrolled_users_report (bmkt_msg_resp_t *msg_resp, bmkt_response_t *res
       get_enroll_templates_resp->templates[n].user_id_len = extract8 (msg_resp->payload, &offset) - 2;
       if(get_enroll_templates_resp->templates[n].user_id_len > BMKT_MAX_USER_ID_LEN)
         return BMKT_UNRECOGNIZED_MESSAGE;
-      if (offset >= msg_resp->payload_len)
-        return BMKT_CORRUPT_MESSAGE;
       get_enroll_templates_resp->templates[n].template_status = extract8 (msg_resp->payload, &offset);
-      if (offset >= msg_resp->payload_len)
-        return BMKT_CORRUPT_MESSAGE;
       get_enroll_templates_resp->templates[n].finger_id = extract8 (msg_resp->payload, &offset);
       for (i = 0; i < get_enroll_templates_resp->templates[n].user_id_len; i++)
-        {
-          if (offset >= msg_resp->payload_len)
-            return BMKT_CORRUPT_MESSAGE;
-          get_enroll_templates_resp->templates[n].user_id[i] = extract8 (msg_resp->payload, &offset);
-        }
+        get_enroll_templates_resp->templates[n].user_id[i] = extract8 (msg_resp->payload, &offset);
       get_enroll_templates_resp->templates[n].user_id[i] = '\0';
     }
 
@@ -272,8 +256,7 @@ bmkt_compose_message (uint8_t *cmd, int *cmd_len, uint8_t msg_id, uint8_t seq_nu
   cmd[BMKT_MESSAGE_SEQ_NUM_FIELD] = seq_num;
   cmd[BMKT_MESSAGE_ID_FIELD] = msg_id;
   cmd[BMKT_MESSAGE_PAYLOAD_LEN_FIELD] = payload_size;
-  if (payload_size > 0)
-    memcpy (&cmd[BMKT_MESSAGE_PAYLOAD_FIELD], payload, payload_size);
+  memcpy (&cmd[BMKT_MESSAGE_PAYLOAD_FIELD], payload, payload_size);
 
   *cmd_len = message_len;
 
@@ -283,19 +266,12 @@ bmkt_compose_message (uint8_t *cmd, int *cmd_len, uint8_t msg_id, uint8_t seq_nu
 int
 bmkt_parse_message_header (uint8_t *resp_buf, int resp_len, bmkt_msg_resp_t *msg_resp)
 {
-  if (resp_len < BMKT_MESSAGE_HEADER_LEN)
-    return BMKT_CORRUPT_MESSAGE;
-
   if (resp_buf[BMKT_MESSAGE_HEADER_ID_FIELD] != BMKT_MESSAGE_HEADER_ID)
     return BMKT_CORRUPT_MESSAGE;
 
   msg_resp->seq_num = resp_buf[BMKT_MESSAGE_SEQ_NUM_FIELD];
   msg_resp->msg_id = resp_buf[BMKT_MESSAGE_ID_FIELD];
   msg_resp->payload_len = resp_buf[BMKT_MESSAGE_PAYLOAD_LEN_FIELD];
-
-  if (msg_resp->payload_len > resp_len - BMKT_MESSAGE_PAYLOAD_FIELD)
-    return BMKT_CORRUPT_MESSAGE;
-
   if (msg_resp->payload_len > 0)
     msg_resp->payload = &resp_buf[BMKT_MESSAGE_PAYLOAD_FIELD];
   else

libfprint/drivers/synaptics/synaptics.c

@@ -32,38 +32,22 @@ static void compose_and_send_identify_msg (FpDevice *device);
 
 static const FpIdEntry id_table[] = {
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00BD,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00C2,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00C4,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00C6,  },
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00DF,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00E9,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00F0,  },
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00F9,  },
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00FC,  },
+  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00C2,  },
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0100,  },
+  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00F0,  },
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0103,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0104,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0106,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0107,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0108,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0109,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x010A,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x010D,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x010E,  },
   { .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 = 0x015F,  },
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0168,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0169,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x016C,  },
+  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x015F,  },
+  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0104,  },
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0173,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0174,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x019D,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x019F,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x01A0,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x01A4,  },
+  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0106,  },
   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
 
@@ -174,14 +158,6 @@ cmd_receive_cb (FpiUsbTransfer *transfer,
        *      The original code did not! */
       if (msg_resp.msg_id == BMKT_RSP_GENERAL_ERROR)
         {
-          if (msg_resp.payload_len < 2 || !msg_resp.payload)
-            {
-              fp_warn ("Received General Error with short or empty payload");
-              fpi_ssm_mark_failed (transfer->ssm,
-                                   fpi_device_error_new (FP_DEVICE_ERROR_PROTO));
-              return;
-            }
-
           guint16 err;
 
           /* XXX: It is weird that this is big endian. */
@@ -1221,7 +1197,7 @@ prob_msg_cb (FpiDeviceSynaptics *self,
       return;
     }
 
-  if (fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
+  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
     serial = g_strdup ("emulated-device");
   else
     serial = g_usb_device_get_string_descriptor (usb_dev,
@@ -1271,12 +1247,6 @@ dev_probe (FpDevice *device)
       return;
     }
 
-  if (!g_usb_device_reset (usb_dev, &error))
-    {
-      fp_dbg ("%s g_usb_device_reset failed %s", G_STRFUNC, error->message);
-      goto err_close;
-    }
-
   if (!g_usb_device_claim_interface (usb_dev, 0, 0, &error))
     goto err_close;
 
@@ -1489,7 +1459,7 @@ suspend (FpDevice *dev)
   self->cmd_suspended = TRUE;
 
   /* Cancel the current transfer.
-   * The CMD SSM will go into the suspend state and signal readiness. */
+   * The CMD SSM will go into the suspend state and signal readyness. */
   g_cancellable_cancel (self->interrupt_cancellable);
   g_clear_object (&self->interrupt_cancellable);
   self->interrupt_cancellable = g_cancellable_new ();

libfprint/drivers/upektc_img.c

@@ -155,8 +155,7 @@ capture_reqs_cb (FpiUsbTransfer *transfer, FpDevice *device,
 }
 
 static int
-upektc_img_process_image_frame (unsigned char *image_buf, size_t image_buf_len,
-                                unsigned char *cmd_res, size_t cmd_res_len)
+upektc_img_process_image_frame (unsigned char *image_buf, unsigned char *cmd_res)
 {
   int offset = 8;
   int len = ((cmd_res[5] & 0x0f) << 8) | (cmd_res[6]);
@@ -169,16 +168,6 @@ upektc_img_process_image_frame (unsigned char *image_buf, size_t image_buf_len,
     }
   if (cmd_res[7] == 0x20)
     len -= 4;
-
-  if (len <= 0 ||
-      (size_t) offset + (size_t) len > cmd_res_len ||
-      (size_t) len > image_buf_len)
-    {
-      fp_dbg ("Invalid image frame length %d (offset %d, source %zu, dest %zu)",
-              len, offset, cmd_res_len, image_buf_len);
-      return 0;
-    }
-
   memcpy (image_buf, cmd_res + offset, len);
 
   return len;
@@ -332,8 +321,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
         case 0x24:
           self->image_size +=
             upektc_img_process_image_frame (self->image_bits + self->image_size,
-                                            (self->expected_image_size * 2) - self->image_size,
-                                            data, MAX_RESPONSE_SIZE);
+                                            data);
           fpi_ssm_jump_to_state (transfer->ssm,
                                  CAPTURE_ACK_FRAME);
           break;
@@ -342,16 +330,8 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
         case 0x20:
           self->image_size +=
             upektc_img_process_image_frame (self->image_bits + self->image_size,
-                                            (self->expected_image_size * 2) - self->image_size,
-                                            data, MAX_RESPONSE_SIZE);
-          if (self->image_size != self->expected_image_size)
-            {
-              fp_err ("Image size mismatch: got %zu, expected %zu",
-                      self->image_size, self->expected_image_size);
-              fpi_ssm_mark_failed (transfer->ssm,
-                                   fpi_device_error_new (FP_DEVICE_ERROR_PROTO));
-              return;
-            }
+                                            data);
+          BUG_ON (self->image_size != self->expected_image_size);
           fp_dbg ("Image size is %lu",
                   (gulong) self->image_size);
           img = fp_image_new (img_class->img_width, img_class->img_height);
@@ -432,10 +412,12 @@ capture_run_state (FpiSsm *ssm, FpDevice *_dev)
 static void
 capture_sm_complete (FpiSsm *ssm, FpDevice *_dev, GError *error_arg)
 {
-  g_autoptr(GError) error = error_arg;
   FpImageDevice *dev = FP_IMAGE_DEVICE (_dev);
   FpiDeviceUpektcImg *self = FPI_DEVICE_UPEKTC_IMG (_dev);
 
+  g_autoptr(GError) error = error_arg;
+
+
   /* Note: We assume that the error is a cancellation in the deactivation case */
   if (self->deactivating)
     start_deactivation (dev);
@@ -516,7 +498,6 @@ deactivate_sm_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)
 
   fp_dbg ("Deactivate completed");
 
-  g_clear_pointer (&self->image_bits, g_free);
   self->deactivating = FALSE;
   fpi_image_device_deactivate_complete (dev,  error);
 }
@@ -631,7 +612,6 @@ init_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
         }
 
       self->expected_image_size = img_class->img_width * img_class->img_height;
-      g_clear_pointer (&self->image_bits, g_free);
       self->image_bits = g_malloc0 (self->expected_image_size * 2);
     }
 

libfprint/drivers/upekts.c

@@ -196,9 +196,8 @@ struct read_msg_data
 static void __read_msg_async (FpDevice             *dev,
                               struct read_msg_data *udata);
 
-#define READ_MSG_DATA_CB_ERR(dev, udata, error) \
-  (udata)->callback (dev, \
-                     READ_MSG_CMD, 0, 0, NULL, 0, (udata)->user_data, error)
+#define READ_MSG_DATA_CB_ERR(dev, udata, error) (udata)->callback (dev, \
+                                                                   READ_MSG_CMD, 0, 0, NULL, 0, (udata)->user_data, error)
 
 static void
 busy_ack_sent_cb (FpiUsbTransfer *transfer, FpDevice *device,
@@ -308,14 +307,6 @@ __handle_incoming_msg (FpDevice             *device,
         fp_dbg ("non-zero bytes in cmd response");
 
       innerlen = innerbuf[1] | (innerbuf[2] << 8);
-      if (innerlen < 3 || innerlen > len - 3)
-        {
-          fp_warn ("cmd response has invalid inner length (%d)", innerlen);
-          error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                            "CMD response has invalid inner length");
-          goto err;
-        }
-
       innerlen = innerlen - 3;
       _subcmd = innerbuf[5];
       fp_dbg ("device responds to subcmd %x with %d bytes", _subcmd, innerlen);
@@ -1252,7 +1243,7 @@ do_verify_stop (FpDevice *dev, FpiMatchResult res, GError *error)
   FpiSsm *ssm = deinitsm_new (dev, data);
 
   /* Report the error immediately if possible, otherwise delay it. */
-  if (!error || error->domain == FP_DEVICE_RETRY)
+  if (error && error->domain == FP_DEVICE_RETRY)
     fpi_device_verify_report (dev, res, NULL, error);
   else
     data->error = error;
@@ -1304,7 +1295,7 @@ verify_start_sm_run_state (FpiSsm *ssm, FpDevice *dev)
       memcpy (msg, verify_hdr, sizeof (verify_hdr));
       memcpy (msg + sizeof (verify_hdr), data, data_len);
 
-      transfer = alloc_send_cmd28_transfer (dev, 0x03, msg, msg_len);
+      transfer = alloc_send_cmd28_transfer (dev, 0x03, data, data_len);
 
       g_free (msg);
 
@@ -1350,6 +1341,7 @@ v_handle_resp00 (FpDevice *dev, unsigned char *data,
       fp_dbg ("good image");
       break;
 
+    case 0x1c:     /* FIXME what does this one mean? */
     case 0x0b:     /* FIXME what does this one mean? */
     case 0x23:     /* FIXME what does this one mean? */
       error = fpi_device_retry_new (FP_DEVICE_RETRY_GENERAL);
@@ -1359,14 +1351,6 @@ v_handle_resp00 (FpDevice *dev, unsigned char *data,
       error = fpi_device_retry_new (FP_DEVICE_RETRY_REMOVE_FINGER);
       break;
 
-    case 0x1c:     /* swipe too fast */
-      error = fpi_device_retry_new (FP_DEVICE_RETRY_TOO_FAST);
-      break;
-
-    case 0x1d:     /* too much horizontal movement */
-      error = fpi_device_retry_new (FP_DEVICE_RETRY_CENTER_FINGER);
-      break;
-
     case 0x1e:     /* swipe too short */
       error = fpi_device_retry_new (FP_DEVICE_RETRY_TOO_SHORT);
       break;
@@ -1455,7 +1439,7 @@ verify_rd2800_cb (FpDevice *dev, enum read_msg_type msgtype,
       do_verify_stop (dev,
                       FPI_MATCH_ERROR,
                       fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                "Response had wrong command sequence"));
+                                                "Response hat wrong command sequence"));
       return;
     }
 

libfprint/drivers/uru4000.c

@@ -20,8 +20,8 @@
 
 #define FP_COMPONENT "uru4000"
 
-#include <openssl/evp.h>
-#include <openssl/err.h>
+#include <nss.h>
+#include <pk11pub.h>
 
 #include "drivers_api.h"
 
@@ -148,7 +148,10 @@ struct _FpiDeviceUru4000
   int                             fwfixer_offset;
   unsigned char                   fwfixer_value;
 
-  EVP_CIPHER_CTX                 *cipher_ctx;
+  CK_MECHANISM_TYPE               cipher;
+  PK11SlotInfo                   *slot;
+  PK11SymKey                     *symkey;
+  SECItem                        *param;
 };
 G_DECLARE_FINAL_TYPE (FpiDeviceUru4000, fpi_device_uru4000, FPI, DEVICE_URU4000,
                       FpImageDevice);
@@ -243,29 +246,13 @@ response_cb (FpiUsbTransfer *transfer, FpDevice *dev, void *user_data, GError *e
     fpi_ssm_mark_failed (ssm, error);
 }
 
-static GError *
-openssl_device_error (void)
-{
-  char buf[256];
-  unsigned long e;
-
-  e = ERR_get_error ();
-  if (e == 0)
-    return fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
-                                     "unexpected OpenSSL error");
-
-  ERR_error_string_n (e, buf, G_N_ELEMENTS (buf));
-
-  return fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL, "OpenSSL error: %s",
-                                   buf);
-}
-
 static void
 challenge_cb (FpiUsbTransfer *transfer, FpDevice *dev, void *user_data, GError *error)
 {
   FpiSsm *ssm = user_data;
   FpiDeviceUru4000 *self = FPI_DEVICE_URU4000 (dev);
-  unsigned char respdata[CR_LENGTH * 2];
+  unsigned char respdata[CR_LENGTH];
+  PK11Context *ctx;
   int outlen;
 
   if (error)
@@ -274,39 +261,17 @@ challenge_cb (FpiUsbTransfer *transfer, FpDevice *dev, void *user_data, GError *
       return;
     }
 
-  if (transfer->actual_length != CR_LENGTH)
-    {
-      error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                        "Unexpected buffer length (%" G_GSIZE_FORMAT
-                                        "instead of %d)",
-                                        transfer->actual_length, CR_LENGTH);
-      fpi_ssm_mark_failed (ssm, g_steal_pointer (&error));
-      return;
-    }
-
   /* submit response */
   /* produce response from challenge */
-  if (!EVP_EncryptUpdate (self->cipher_ctx, respdata, &outlen, transfer->buffer, CR_LENGTH))
+  ctx = PK11_CreateContextBySymKey (self->cipher, CKA_ENCRYPT,
+                                    self->symkey, self->param);
+  if (PK11_CipherOp (ctx, respdata, &outlen, CR_LENGTH, transfer->buffer, CR_LENGTH) != SECSuccess ||
+      PK11_Finalize (ctx) != SECSuccess)
     {
-      fpi_ssm_mark_failed (ssm, openssl_device_error ());
-      return;
-    }
-
-  if (outlen != CR_LENGTH)
-    {
-      error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                        "Unexpected encrypted buffer length (%d"
-                                        "instead of %d)",
-                                        outlen, CR_LENGTH);
-      fpi_ssm_mark_failed (ssm, g_steal_pointer (&error));
-      return;
-    }
-
-  if (!EVP_EncryptFinal_ex (self->cipher_ctx, respdata + outlen, &outlen))
-    {
-      fpi_ssm_mark_failed (ssm, openssl_device_error ());
-      return;
+      fp_err ("Failed to encrypt challenge data");
+      error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, "Failed to encrypt challenge data");
     }
+  PK11_DestroyContext (ctx, PR_TRUE);
 
   if (!error)
     write_regs (FP_IMAGE_DEVICE (dev), REG_RESPONSE, CR_LENGTH, respdata, response_cb, ssm);
@@ -587,10 +552,7 @@ image_transfer_cb (FpiUsbTransfer *transfer, FpDevice *dev,
     }
   else
     {
-      struct uru4k_image *img = g_memdup2 (transfer->buffer, sizeof (struct uru4k_image));
-
-      img->num_lines = GUINT16_FROM_LE (img->num_lines);
-      self->img_data = g_steal_pointer (&img);
+      self->img_data = g_memdup2 (transfer->buffer, sizeof (struct uru4k_image));
       self->img_data_actual_length = transfer->actual_length;
       fpi_ssm_next_state (ssm);
     }
@@ -681,10 +643,10 @@ calc_dev2 (struct uru4k_image *img)
 static void
 imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
 {
-  g_autoptr(FpImage) fpimg = NULL;
   FpImageDevice *dev = FP_IMAGE_DEVICE (_dev);
   FpiDeviceUru4000 *self = FPI_DEVICE_URU4000 (_dev);
   struct uru4k_image *img = self->img_data;
+  FpImage *fpimg;
   uint32_t key;
   uint8_t flags, num_lines;
   int i, r, to, dev2;
@@ -741,9 +703,9 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
 
     case IMAGING_DECODE:
       key  = self->last_reg_rd[0];
-      key |= (uint32_t) self->last_reg_rd[1] << 8;
-      key |= (uint32_t) self->last_reg_rd[2] << 16;
-      key |= (uint32_t) self->last_reg_rd[3] << 24;
+      key |= self->last_reg_rd[1] << 8;
+      key |= self->last_reg_rd[2] << 16;
+      key |= self->last_reg_rd[3] << 24;
       key ^= self->img_enc_seed;
 
       fp_dbg ("encryption id %02x -> key %08x", img->key_number, key);
@@ -755,17 +717,6 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
           if (num_lines == 0)
             break;
 
-          /* num_lines is device-supplied; make sure decoding this block stays
-           * within the captured image buffer (IMAGE_HEIGHT rows). */
-          if ((size_t) self->img_lines_done + num_lines > IMAGE_HEIGHT)
-            {
-              fp_err ("bad captured image: block %d (%d lines) overflows buffer",
-                      self->img_block, num_lines);
-              fpi_ssm_mark_failed (ssm,
-                                   fpi_device_error_new (FP_DEVICE_ERROR_PROTO));
-              return;
-            }
-
           fp_dbg ("%d %02x %d", self->img_block, flags,
                   num_lines);
           if (flags & BLOCKF_CHANGE_KEY)
@@ -809,17 +760,6 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
           num_lines = img->block_info[i].num_lines;
           if (num_lines == 0)
             break;
-
-          if ((size_t) r + num_lines > IMAGE_HEIGHT ||
-              (size_t) to + (size_t) num_lines * IMAGE_WIDTH > fpimg->width * fpimg->height)
-            {
-              fp_err ("bad captured image: block %d (%d lines) overflows buffer",
-                      i, num_lines);
-              fpi_ssm_mark_failed (ssm,
-                                   fpi_device_error_new (FP_DEVICE_ERROR_PROTO));
-              return;
-            }
-
           memcpy (&fpimg->data[to], &img->data[r][0],
                   num_lines * IMAGE_WIDTH);
           if (!(flags & BLOCKF_NOT_PRESENT))
@@ -836,8 +776,7 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
        */
       if (self->profile->image_not_flipped)
         fpimg->flags |= FPI_IMAGE_V_FLIPPED | FPI_IMAGE_H_FLIPPED;
-
-      fpi_image_device_image_captured (dev, g_steal_pointer (&fpimg));
+      fpi_image_device_image_captured (dev, fpimg);
 
       if (self->activate_state == FPI_IMAGE_DEVICE_STATE_CAPTURE)
         fpi_ssm_jump_to_state (ssm, IMAGING_CAPTURE);
@@ -1207,12 +1146,6 @@ init_run_state (FpiSsm *ssm, FpDevice *_dev)
 static void
 activate_initsm_complete (FpiSsm *ssm, FpDevice *dev, GError *error)
 {
-  FpiDeviceUru4000 *self = FPI_DEVICE_URU4000 (dev);
-
-  g_clear_pointer (&self->scanpwr_irq_timeout, g_source_destroy);
-  self->irq_cb_data = NULL;
-  self->irq_cb = NULL;
-
   fpi_image_device_activate_complete (FP_IMAGE_DEVICE (dev), error);
 }
 
@@ -1337,6 +1270,8 @@ dev_init (FpImageDevice *dev)
   g_autoptr(GPtrArray) interfaces = NULL;
   GUsbInterface *iface = NULL;
   guint64 driver_data;
+  SECStatus rv;
+  SECItem item;
   int i;
 
   interfaces = g_usb_device_get_interfaces (fpi_device_get_usb_device (FP_DEVICE (dev)), &error);
@@ -1408,11 +1343,25 @@ dev_init (FpImageDevice *dev)
       return;
     }
 
+  /* Disable loading p11-kit's user configuration */
+  g_setenv ("P11_KIT_NO_USER_CONFIG", "1", TRUE);
+
+  /* Initialise NSS early */
+  rv = NSS_NoDB_Init (".");
+  if (rv != SECSuccess)
+    {
+      fp_err ("could not initialise NSS");
+      fpi_image_device_open_complete (dev,
+                                      fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
+                                                                "Could not initialise NSS"));
+      return;
+    }
+
   self = FPI_DEVICE_URU4000 (dev);
 
   g_clear_pointer (&self->rand, g_rand_free);
   self->rand = g_rand_new ();
-  if (fpi_device_emulation_mode_enabled (FP_DEVICE (dev)))
+  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
     g_rand_set_seed (self->rand, 0xFACADE);
 
   driver_data = fpi_device_get_driver_data (FP_DEVICE (dev));
@@ -1420,17 +1369,35 @@ dev_init (FpImageDevice *dev)
   self->interface = g_usb_interface_get_number (iface);
 
   /* Set up encryption */
-  if (!(self->cipher_ctx = EVP_CIPHER_CTX_new ()))
+  self->cipher = CKM_AES_ECB;
+  self->slot = PK11_GetBestSlot (self->cipher, NULL);
+  if (self->slot == NULL)
     {
-      fpi_image_device_open_complete (dev, openssl_device_error ());
+      fp_err ("could not get encryption slot");
+      fpi_image_device_open_complete (dev,
+                                      fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
+                                                                "Could not get encryption slot"));
       return;
     }
-
-  if (!EVP_EncryptInit_ex (self->cipher_ctx, EVP_aes_128_ecb (), NULL, crkey, NULL))
+  item.type = siBuffer;
+  item.data = (unsigned char *) crkey;
+  item.len = sizeof (crkey);
+  self->symkey = PK11_ImportSymKey (self->slot,
+                                    self->cipher,
+                                    PK11_OriginUnwrap,
+                                    CKA_ENCRYPT,
+                                    &item, NULL);
+  if (self->symkey == NULL)
     {
-      fpi_image_device_open_complete (dev, openssl_device_error ());
+      fp_err ("failed to import key into NSS");
+      PK11_FreeSlot (self->slot);
+      self->slot = NULL;
+      fpi_image_device_open_complete (dev,
+                                      fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
+                                                                "Failed to import key into NSS"));
       return;
     }
+  self->param = PK11_ParamFromIV (self->cipher, NULL);
 
   fpi_image_device_open_complete (dev, NULL);
 }
@@ -1441,7 +1408,14 @@ dev_deinit (FpImageDevice *dev)
   GError *error = NULL;
   FpiDeviceUru4000 *self = FPI_DEVICE_URU4000 (dev);
 
-  g_clear_pointer (&self->cipher_ctx, EVP_CIPHER_CTX_free);
+  if (self->symkey)
+    PK11_FreeSymKey (self->symkey);
+  if (self->param)
+    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);

libfprint/drivers/vfs0050.c

@@ -119,7 +119,7 @@ async_abort_callback (FpiUsbTransfer *transfer, FpDevice *device,
 
   /* In normal case endpoint is empty */
   if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT) ||
-      (fpi_device_emulation_mode_enabled (device) && transfer->actual_length == 0))
+      (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0 && transfer->actual_length == 0))
     {
       g_clear_error (&error);
       fpi_ssm_next_state (transfer->ssm);

libfprint/drivers/vfs101.c

@@ -162,9 +162,9 @@ enum {
 
 /* Dump buffer for debug */
 #define dump_buffer(buf) \
-  fp_dbg ("%02x %02x %02x %02x %02x %02x %02x %02x", \
-          buf[6], buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13] \
-         )
+        fp_dbg ("%02x %02x %02x %02x %02x %02x %02x %02x", \
+                buf[6], buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13] \
+               )
 
 /* Callback of asynchronous send */
 static void
@@ -184,8 +184,8 @@ async_send_cb (FpiUsbTransfer *transfer, FpDevice *device,
         }
       else
         {
-          fp_dbg ("Ignoring send error: %s", error->message);
           g_error_free (error);
+          fp_dbg ("Ignoring send error: %s", error->message);
         }
     }
   /* Reset ignore_error flag */
@@ -708,9 +708,6 @@ vfs_check_contrast (FpDeviceVfs101 *vdev)
   int y;
   long int count = 0;
 
-  if (vdev->height <= 0)
-    return;
-
   /* Check difference from byte 4 to byte 5 for verify contrast of image */
   for (y = 0; y < vdev->height; y++)
     count = count + vdev->buffer[offset (5, y)] - vdev->buffer[offset (4, y)];

libfprint/drivers/vfs301.c

@@ -85,7 +85,6 @@ enum {
 static void
 m_loop_state (FpiSsm *ssm, FpDevice *_dev)
 {
-  g_autoptr(GError) error = NULL;
   FpImageDevice *dev = FP_IMAGE_DEVICE (_dev);
   FpDeviceVfs301 *self = FPI_DEVICE_VFS301 (_dev);
 
@@ -102,16 +101,10 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
       break;
 
     case M_CHECK_PRINT:
-      {
-        int rv = vfs301_proto_peek_event (self, &error);
-
-        if (rv == VFS301_FAILURE)
-          fpi_ssm_mark_failed (ssm, error);
-        else if (rv == VFS301_ONGOING)
-          fpi_ssm_jump_to_state (ssm, M_WAIT_PRINT);
-        else
-          fpi_ssm_next_state (ssm);
-      }
+      if (!vfs301_proto_peek_event (self))
+        fpi_ssm_jump_to_state (ssm, M_WAIT_PRINT);
+      else
+        fpi_ssm_next_state (ssm);
       break;
 
     case M_READ_PRINT_START:
@@ -128,11 +121,8 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
     case M_READ_PRINT_POLL:
       {
         int rv = vfs301_proto_process_event_poll (self);
-
-        if (rv == VFS301_FAILURE)
-          fpi_ssm_mark_failed (ssm,
-                               fpi_device_error_new (FP_DEVICE_ERROR_PROTO));
-        else if (rv == VFS301_ONGOING)
+        g_assert (rv != VFS301_FAILURE);
+        if (rv == VFS301_ONGOING)
           fpi_ssm_jump_to_state (ssm, M_READ_PRINT_WAIT);
         else
           fpi_ssm_next_state (ssm);

libfprint/drivers/vfs301.h

@@ -133,8 +133,7 @@ void vfs301_proto_deinit (FpDeviceVfs301 *dev);
 void vfs301_proto_request_fingerprint (FpDeviceVfs301 *dev);
 
 /** returns 0 if no event is ready, or 1 if there is one... */
-int vfs301_proto_peek_event (FpDeviceVfs301 *dev,
-                             GError        **error);
+int vfs301_proto_peek_event (FpDeviceVfs301 *dev);
 void vfs301_proto_process_event_start (FpDeviceVfs301 *dev);
 int vfs301_proto_process_event_poll (FpDeviceVfs301 *dev);
 

libfprint/drivers/vfs301_proto.c

@@ -63,7 +63,7 @@ usb_print_packet (int dir, GError *error, const guint8 *data, int length)
 }
 #endif
 
-static gboolean
+static void
 usb_recv (FpDeviceVfs301 *dev, guint8 endpoint, int max_bytes, FpiUsbTransfer **out, GError **error)
 {
   GError *err = NULL;
@@ -87,14 +87,10 @@ usb_recv (FpDeviceVfs301 *dev, guint8 endpoint, int max_bytes, FpiUsbTransfer **
       if (!error)
         g_warning ("Unhandled receive error: %s", err->message);
       g_propagate_error (error, err);
-
-      return FALSE;
     }
 
   if (out)
     *out = g_steal_pointer (&transfer);
-
-  return TRUE;
 }
 
 FP_GNUC_ACCESS (read_only, 2, 3)
@@ -161,7 +157,7 @@ vfs301_proto_generate_0B (int subtype, gssize *len)
 }
 
 #define HEX_TO_INT(c) \
-  (((c) >= '0' && (c) <= '9') ? ((c) - '0') : ((c) - 'A' + 10))
+        (((c) >= '0' && (c) <= '9') ? ((c) - '0') : ((c) - 'A' + 10))
 
 static guint8 *
 translate_str (const char **srcL, gssize *len)
@@ -348,11 +344,7 @@ vfs301_extract_image (FpDeviceVfs301 *vfs, guint8 *output, int *output_height
   int last_line;
   int i;
 
-  if (vfs->scanline_count < 1 || scanlines == NULL)
-    {
-      *output_height = 0;
-      g_return_if_reached ();
-    }
+  g_assert (vfs->scanline_count >= 1);
 
   *output_height = 1;
   memcpy (output, scanlines, VFS301_FP_OUTPUT_WIDTH);
@@ -430,15 +422,15 @@ img_process_data (int first_block, FpDeviceVfs301 *dev, const guint8 *buf, int l
 /************************** PROTOCOL STUFF ************************************/
 
 #define USB_RECV(from, len) \
-  usb_recv (dev, from, len, NULL, NULL)
+        usb_recv (dev, from, len, NULL, NULL)
 
 #define USB_SEND(type, subtype) \
-  { \
-    const guint8 *data; \
-    gssize len; \
-    data = vfs301_proto_generate (type, subtype, &len); \
-    usb_send (dev, data, len, NULL); \
-  }
+        { \
+          const guint8 *data; \
+          gssize len; \
+          data = vfs301_proto_generate (type, subtype, &len); \
+          usb_send (dev, data, len, NULL); \
+        }
 
 #define RAW_DATA(x) g_memdup2 (x, sizeof (x)), sizeof (x)
 
@@ -451,8 +443,7 @@ vfs301_proto_process_data (FpDeviceVfs301 *dev, int first_block, const guint8 *b
 
   if (first_block)
     {
-      if (len < VFS301_FP_FRAME_SIZE)
-        g_return_val_if_reached (img_process_data (first_block, dev, buf, 0));
+      g_assert (len >= VFS301_FP_FRAME_SIZE);
 
       /* Skip bytes until start_sequence is found */
       for (i = 0; i < VFS301_FP_FRAME_SIZE; i++, buf++, len--)
@@ -471,25 +462,26 @@ vfs301_proto_request_fingerprint (FpDeviceVfs301 *dev)
 }
 
 int
-vfs301_proto_peek_event (FpDeviceVfs301 *dev,
-                         GError        **error)
+vfs301_proto_peek_event (FpDeviceVfs301 *dev)
 {
+  g_autoptr(GError) error = NULL;
   g_autoptr(FpiUsbTransfer) transfer = NULL;
 
   const char no_event[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
   const char got_event[] = {0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00};
 
   USB_SEND (0x17, -1);
-  if (!usb_recv (dev, VFS301_RECEIVE_ENDPOINT_CTRL, 7, &transfer, error))
-    return -1;
+  usb_recv (dev, VFS301_RECEIVE_ENDPOINT_CTRL, 7, &transfer, &error);
+
+  /* XXX: This is obviously not a sane error handling! */
+  g_assert (!error);
 
   if (memcmp (transfer->buffer, no_event, sizeof (no_event)) == 0)
     return 0;
   else if (memcmp (transfer->buffer, got_event, sizeof (no_event)) == 0)
     return 1;
-
-  g_set_error (error, FP_DEVICE_ERROR_PROTO, 0, "Unexpected event response");
-  return -1;
+  else
+    g_assert_not_reached ();
 }
 
 /* XXX: We sometimes need to receive data on from two endpoints at the same
@@ -497,13 +489,13 @@ vfs301_proto_peek_event (FpDeviceVfs301 *dev,
  *      we will run into timeouts randomly and need to then try again.
  */
 #define PARALLEL_RECEIVE(e1, l1, e2, l2) \
-  { \
-    g_autoptr(GError) error = NULL; \
-    usb_recv (dev, e1, l1, NULL, &error); \
-    usb_recv (dev, e2, l2, NULL, NULL); \
-    if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT)) \
-    usb_recv (dev, e1, l1, NULL, NULL); \
-  }
+        { \
+          g_autoptr(GError) error = NULL; \
+          usb_recv (dev, e1, l1, NULL, &error); \
+          usb_recv (dev, e2, l2, NULL, NULL); \
+          if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT)) \
+          usb_recv (dev, e1, l1, NULL, NULL); \
+        }
 
 static void
 vfs301_proto_process_event_cb (FpiUsbTransfer *transfer,

libfprint/drivers/vfs5011.c

@@ -41,30 +41,30 @@ struct usb_action
 };
 
 #define SEND(ENDPOINT, COMMAND) \
-  { \
-    .type = ACTION_SEND, \
-    .endpoint = ENDPOINT, \
-    .name = #COMMAND, \
-    .size = sizeof (COMMAND), \
-    .data = COMMAND \
-  },
+        { \
+          .type = ACTION_SEND, \
+          .endpoint = ENDPOINT, \
+          .name = #COMMAND, \
+          .size = sizeof (COMMAND), \
+          .data = COMMAND \
+        },
 
 #define RECV(ENDPOINT, SIZE) \
-  { \
-    .type = ACTION_RECEIVE, \
-    .endpoint = ENDPOINT, \
-    .size = SIZE, \
-    .data = NULL \
-  },
+        { \
+          .type = ACTION_RECEIVE, \
+          .endpoint = ENDPOINT, \
+          .size = SIZE, \
+          .data = NULL \
+        },
 
 #define RECV_CHECK(ENDPOINT, SIZE, EXPECTED) \
-  { \
-    .type = ACTION_RECEIVE, \
-    .endpoint = ENDPOINT, \
-    .size = SIZE, \
-    .data = EXPECTED, \
-    .correct_reply_size = sizeof (EXPECTED) \
-  },
+        { \
+          .type = ACTION_RECEIVE, \
+          .endpoint = ENDPOINT, \
+          .size = SIZE, \
+          .data = EXPECTED, \
+          .correct_reply_size = sizeof (EXPECTED) \
+        },
 
 struct usbexchange_data
 {

libfprint/drivers/vfs7552.c

@@ -51,39 +51,39 @@ struct usb_action
 };
 
 #define SEND(ENDPOINT, COMMAND) \
-  {                             \
-    .type = ACTION_SEND,        \
-    .endpoint = ENDPOINT,       \
-    .name = #COMMAND,           \
-    .size = sizeof (COMMAND),   \
-    .data = COMMAND             \
-  },
+        {                             \
+          .type = ACTION_SEND,        \
+          .endpoint = ENDPOINT,       \
+          .name = #COMMAND,           \
+          .size = sizeof (COMMAND),   \
+          .data = COMMAND             \
+        },
 
 #define RECV(ENDPOINT, SIZE)  \
-  {                           \
-    .type = ACTION_RECEIVE,   \
-    .endpoint = ENDPOINT,     \
-    .size = SIZE,             \
-    .data = NULL              \
-  },
+        {                           \
+          .type = ACTION_RECEIVE,   \
+          .endpoint = ENDPOINT,     \
+          .size = SIZE,             \
+          .data = NULL              \
+        },
 
 #define RECV_CHECK(ENDPOINT, SIZE, EXPECTED) \
-  {                                          \
-    .type = ACTION_RECEIVE,                  \
-    .endpoint = ENDPOINT,                    \
-    .size = SIZE,                            \
-    .data = EXPECTED,                        \
-    .correct_reply_size = sizeof (EXPECTED)  \
-  },
+        {                                          \
+          .type = ACTION_RECEIVE,                  \
+          .endpoint = ENDPOINT,                    \
+          .size = SIZE,                            \
+          .data = EXPECTED,                        \
+          .correct_reply_size = sizeof (EXPECTED)  \
+        },
 
 #define RECV_CHECK_SIZE(ENDPOINT, SIZE, EXPECTED) \
-  {                                               \
-    .type = ACTION_RECEIVE,                       \
-    .endpoint = ENDPOINT,                         \
-    .size = SIZE,                                 \
-    .data = NULL,                                 \
-    .correct_reply_size = sizeof (EXPECTED)       \
-  },
+        {                                               \
+          .type = ACTION_RECEIVE,                       \
+          .endpoint = ENDPOINT,                         \
+          .size = SIZE,                                 \
+          .data = NULL,                                 \
+          .correct_reply_size = sizeof (EXPECTED)       \
+        },
 
 struct usbexchange_data
 {

libfprint/drivers/virtual-device-storage.c

@@ -77,7 +77,6 @@ dev_identify (FpDevice *dev)
                                                  &idx))
         {
           match = g_ptr_array_index (prints, idx);
-          fp_print_set_finger (new_scan, fp_print_get_finger (match));
         }
 
       if (!self->match_reported)

libfprint/drivers/virtual-device.c

@@ -165,7 +165,11 @@ process_cmds (FpDeviceVirtualDevice * self,
     {
       g_autofree gchar *cmd = NULL;
 
-      cmd = g_ptr_array_steal_index (self->pending_commands, 0);
+      /* TODO: g_ptr_array_steal_index requires GLib 2.58, we depend on 2.56 */
+      cmd = g_ptr_array_index (self->pending_commands, 0);
+      g_ptr_array_index (self->pending_commands, 0) = NULL;
+      g_ptr_array_remove_index (self->pending_commands, 0);
+
       g_debug ("Processing command %s", cmd);
 
       /* These are always processed. */
@@ -545,9 +549,6 @@ dev_verify (FpDevice *dev)
       else
         {
           success = fp_print_equal (print, new_scan);
-
-          if (success)
-            fp_print_set_finger (new_scan, fp_print_get_finger (print));
         }
 
       if (!self->match_reported)
@@ -771,7 +772,6 @@ fpi_device_virtual_device_class_init (FpDeviceVirtualDeviceClass *klass)
 {
   FpDeviceClass *dev_class = FP_DEVICE_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  const char *hot_seconds;
 
   object_class->finalize = fpi_device_virtual_device_finalize;
 
@@ -787,18 +787,5 @@ fpi_device_virtual_device_class_init (FpDeviceVirtualDeviceClass *klass)
   dev_class->enroll = dev_enroll;
   dev_class->cancel = dev_cancel;
 
-  if ((hot_seconds = g_getenv ("FP_VIRTUAL_DEVICE_HOT_SECONDS")) &&
-      *hot_seconds != '\0')
-    {
-      gint64 hot_seconds_value;
-
-      hot_seconds_value = g_ascii_strtoll (hot_seconds, NULL, 10);
-      if (hot_seconds_value >= G_MAXINT32 || hot_seconds_value < 0)
-        hot_seconds_value = -1;
-
-      dev_class->temp_hot_seconds = hot_seconds_value;
-      g_debug ("device hot seconds set to %d", dev_class->temp_hot_seconds);
-    }
-
   fpi_device_class_auto_initialize_features (dev_class);
 }

libfprint/drivers/virtual-image.c

@@ -191,12 +191,12 @@ on_listener_connected (FpiDeviceVirtualListener *listener,
 
   switch (state)
     {
+    case FPI_IMAGE_DEVICE_STATE_IDLE:
     case FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON:
     case FPI_IMAGE_DEVICE_STATE_CAPTURE:
+    case FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF:
       recv_image (self);
 
-    case FPI_IMAGE_DEVICE_STATE_IDLE:
-    case FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF:
     case FPI_IMAGE_DEVICE_STATE_INACTIVE:
     case FPI_IMAGE_DEVICE_STATE_ACTIVATING:
     case FPI_IMAGE_DEVICE_STATE_DEACTIVATING:
@@ -310,7 +310,6 @@ fpi_device_virtual_image_class_init (FpDeviceVirtualImageClass *klass)
 {
   FpDeviceClass *dev_class = FP_DEVICE_CLASS (klass);
   FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_CLASS (klass);
-  const char *hot_seconds;
 
   dev_class->id = FP_COMPONENT;
   dev_class->full_name = "Virtual image device for debugging";
@@ -322,17 +321,4 @@ fpi_device_virtual_image_class_init (FpDeviceVirtualImageClass *klass)
 
   img_class->activate = dev_activate;
   img_class->deactivate = dev_deactivate;
-
-  if ((hot_seconds = g_getenv ("FP_VIRTUAL_IMAGE_HOT_SECONDS")) &&
-      *hot_seconds != '\0')
-    {
-      gint64 hot_seconds_value;
-
-      hot_seconds_value = g_ascii_strtoll (hot_seconds, NULL, 10);
-      if (hot_seconds_value >= G_MAXINT32 || hot_seconds_value < 0)
-        hot_seconds_value = -1;
-
-      dev_class->temp_hot_seconds = hot_seconds_value;
-      g_debug ("device hot seconds set to %d", dev_class->temp_hot_seconds);
-    }
 }

libfprint/drivers_api.h

@@ -22,7 +22,6 @@
 #pragma once
 
 #include "fpi-compat.h"
-#include "fpi-enums.h"
 #include "fpi-assembling.h"
 #include "fpi-device.h"
 #include "fpi-image-device.h"

libfprint/fp-context.c

@@ -27,6 +27,10 @@
 
 #include <config.h>
 
+#ifdef HAVE_LIBFPRINT_TOD
+#include "tod/tod-shared-loader.h"
+#endif
+
 #ifdef HAVE_UDEV
 #include <gudev/gudev.h>
 #endif
@@ -296,6 +300,8 @@ fp_context_finalize (GObject *object)
     g_object_run_dispose (G_OBJECT (priv->usb_ctx));
   g_clear_object (&priv->usb_ctx);
 
+  tod_shared_drivers_unregister ();
+
   G_OBJECT_CLASS (fp_context_parent_class)->finalize (object);
 }
 
@@ -351,6 +357,7 @@ static void
 fp_context_init (FpContext *self)
 {
   g_autoptr(GError) error = NULL;
+  g_autoptr(GArray) shared_drivers = NULL;
   FpContextPrivate *priv = fp_context_get_instance_private (self);
   guint i;
 
@@ -358,6 +365,10 @@ fp_context_init (FpContext *self)
 
   priv->drivers = fpi_get_driver_types ();
 
+  tod_shared_drivers_register ();
+  shared_drivers = tod_shared_drivers_get ();
+  g_array_prepend_vals (priv->drivers, shared_drivers->data, shared_drivers->len);
+
   if (get_drivers_allowlist_env ())
     {
       for (i = 0; i < priv->drivers->len;)