elan: Do not leak converted frames

The elan driver converts frames into a different format. These frames are only needed to assemable the image and should be free'ed afterwards. Fixes: #213
examples: Fix double device closing in manage-prints
2026-09-10 21:06:51 +00:00 · 2019-12-16 11:41:22 +01:00 · 2019-12-16 11:41:22 +01:00 · 2019-12-16 11:41:22 +01:00 · 2019-12-16 11:41:22 +01:00 · 2019-12-16 11:39:18 +01:00
284 changed files with 4083 additions and 90636 deletions
@@ -1,10 +0,0 @@
-# The commits that did automated reformatting. You can ignore them
-# during git-blame with `--ignore-rev` or `--ignore-revs-file`.
-#
-#   $ git config --add 'blame.ignoreRevsFile' '.git-blame-ignore-revs'
-#
-
-d1fb1e26f3b79e54febc94496c1184763cf2af3d
-e4f9935706be4c0e3253afe251c182019ff7ccef
-65e602d8c72baa7020efb62d10bf28e621feb05d
-4115ae7ced77d392ee11ea55212206d9404356f0
@@ -1,3 +1,24 @@
+ltmain.sh
+missing
+stamp-h1
+libtool
+*.la
+*.lo
 *.o
 *.swp
-_build
+Makefile
+Makefile.in
+config.h*
+aclocal.m4
+autom4te.cache
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+.deps
+.libs
+compile
+ChangeLog
@@ -1,301 +1,167 @@
-include:
-  - local: '.gitlab-ci/libfprint-image-variables.yaml'
-  - local: '.gitlab-ci/libfprint-templates.yaml'
-  - project: 'freedesktop/ci-templates'
-    ref: master
-    file: '/templates/fedora.yml'
-  - remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/71e636e012ae0ab04c5e0fe40ca73ada91ae6bde/flatpak/flatpak_ci_initiative.yml'
-
-default:
-  interruptible: true
-  # Auto-retry jobs in case of infra failures
-  retry:
-    max: 1
-    when:
-      - 'runner_system_failure'
-      - 'stuck_or_timeout_failure'
-      - 'scheduler_failure'
-      - 'api_failure'
-
 variables:
-  extends: .libfprint_common_variables
-  FDO_DISTRIBUTION_TAG: $LIBFPRINT_IMAGE_TAG
-  FDO_DISTRIBUTION_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_TAG: rawhide
+  FEDORA_VERSION: rawhide
+  FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION:$FEDORA_TAG"
+  BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
  LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"

-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-    - if: $CI_PIPELINE_SOURCE == 'push'
-    - if: $CI_PIPELINE_SOURCE == 'schedule'
-    - if: $CI_PROJECT_NAMESPACE == 'libfprint' && $LIBFPRINT_CI_ACTION != ''
+include:
+  - project: 'wayland/ci-templates'
+    ref: master
+    file: '/templates/fedora.yml'

 stages:
-  - image-build
  - check-source
  - build
  - test
-  - flatpak
-  - deploy
+  - flatpack

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

 .build_one_driver_template: &build_one_driver
  script:
-    # Build with a driver that doesn't need imaging, or openssl
-    - meson setup _build --werror -Ddrivers=$driver
-    - meson compile -C _build
+    # Build with a driver that doesn't need imaging, or nss
+    - meson --werror -Ddrivers=$driver . _build
+    - ninja -C _build
    - rm -rf _build/

 .build_template: &build
  script:
    # And build with everything
-    - meson setup _build --werror -Ddrivers=all
-    - meson compile -C _build
-    - meson install -C _build
+    - meson --werror -Ddrivers=all . _build
+    - ninja -C _build
+    - ninja -C _build install

 .build_template: &check_abi
  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
  <<: *build
 #  <<: *check_abi
-  artifacts:
-    expose_as: "HTML Documentation"
-    paths:
-    - _build/doc/html
-    - _build/doc/html/index.html
-    expire_in: 1 week

 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
-    - ninja -C _build coverage || true
-    - cat _build/meson-logs/coverage.txt || true
+    - meson --werror -Ddrivers=all -Db_coverage=true . _build
+    - ninja -C _build
+    - meson test -C _build --verbose --no-stdsplit --timeout-multiplier 3
+    - ninja -C _build coverage
  artifacts:
-    reports:
-      junit: "_build/meson-logs/testlog.junit.xml"
-      coverage_report:
-        coverage_format: cobertura
-        path: _build/meson-logs/coverage.xml
-    expose_as: 'Coverage Report'
-    when: always
    paths:
      - _build/meson-logs
-      - _build/meson-logs/coveragereport/index.html
    expire_in: 1 week
-  coverage: '/^TOTAL.*\s+(\d+\%)$/'

 test_valgrind:
  stage: test
-  extends:
-    - .standard_job
+  except:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule"
  script:
-    - meson setup _build -Ddrivers=all
-    - meson compile -C _build
-    - meson test -C _build --print-errorlogs --no-stdsplit --setup=valgrind
-  artifacts:
-    reports:
-      junit: "_build/meson-logs/testlog-valgrind.junit.xml"
-    expose_as: 'Valgrind test logs'
-    when: always
-    paths:
-      - _build/meson-logs
-      - _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
-  script:
-    - meson setup _build --prefix=/usr -Ddrivers=all
-    - meson install -C _build
-    - mv _build _build_dir
-    - rm -rf tests
-    - gnome-desktop-testing-runner --list libfprint-2
-    - gnome-desktop-testing-runner libfprint-2
-        --report-directory=_installed-tests-report/failed/
-        --log-directory=_installed-tests-report/logs/
-        --parallel=0
-  artifacts:
-    expose_as: 'GNOME Tests Runner logs'
-    when: always
-    paths:
-      - _build_dir/meson-logs
-      - _installed-tests-report
-    expire_in: 1 week
-
-
-test_scan_build:
-  stage: test
-  extends:
-    - .standard_job
-  allow_failure: true
-  script:
-    - meson setup _build -Ddrivers=all
-    # Wrapper to add --status-bugs and disable malloc checker
-    - SCANBUILD=$CI_PROJECT_DIR/.gitlab-ci/scan-build
-      ninja -C _build scan-build
-  artifacts:
-    when: on_failure
-    paths:
-      - _build/meson-logs
-    expire_in: 1 week
+    - meson -Ddrivers=all . _build
+    - ninja -C _build
+    - meson test -C _build --verbose --no-stdsplit --setup=valgrind

 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'
+    - scripts/uncrustify.sh --check
+
+.flatpak_script_template: &flatpak_script
+    script:
+        - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
+        # Make sure to keep this in sync with the Flatpak manifest, all arguments
+        # are passed except the config-args because we build it ourselves
+        - flatpak build app meson --prefix=/app --libdir=lib ${MESON_ARGS} _build
+        - flatpak build app ninja -C _build install
+        - flatpak build app rm -rf /app/include/ /app/lib/pkgconfig/
+        - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
+        # Generate a Flatpak bundle
+        - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
+
+.flatpak_artifacts_template: &flatpak_artifacts
+    artifacts:
        paths:
-          - '**/*.c'
-          - '**/*.h'
+            - ${BUNDLE}
+        when: always
+        expire_in: 30 days

-test_unsupported_list:
-  stage: check-source
-  extends:
-    - .standard_job
-  allow_failure: true
-  script:
-    - tests/hwdb-check-unsupported.py
+.flatpak_template: &flatpak
+    <<: *flatpak_script
+    <<: *flatpak_artifacts

-flatpak:
-  stage: flatpak
-  extends: .flatpak@x86_64
-  variables:
-    MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json"
-    FLATPAK_MODULE: "libfprint"
-    APP_ID: "org.freedesktop.libfprint.Demo"
-    BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
-    RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
-  # Build with any builder
-  tags: []
-  rules:
-    - if: '$CI_PROJECT_PATH != "libfprint/libfprint"'
-      when: manual
-      allow_failure: true
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: never
-    - if: '$CI_COMMIT_BRANCH == "master"'
-      allow_failure: true
-      when: always
-    - if: '$CI_COMMIT_TAG'
-      allow_failure: true
-      when: always
-    # For any other (commit), allow manual run.
-    # This excludes MRs which would create a duplicate pipeline
-    - if: '$CI_COMMIT_BRANCH'
-      when: manual
-      allow_failure: true
-    - if: '$CI_MERGE_REQUEST_ID'
-      when: manual
-      allow_failure: true
+.flatpak_master_template: &flatpak_master
+    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32
+    stage: flatpack
+    except:
+      variables:
+        - $CI_PIPELINE_SOURCE == "schedule"
+    variables:
+        MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json"
+        # From demo/org.freedesktop.libfprint.Demo.json
+        MESON_ARGS: "-Dudev_rules=false -Dx11-examples=false -Dgtk-examples=true"
+        FLATPAK_MODULE: "libfprint"
+        DBUS_ID: "org.freedesktop.libfprint.Demo"
+    <<: *flatpak
+
+flatpak-auto master:
+    <<: *flatpak_master
+    when: always
+    only:
+      - tags
+      - master
+
+flatpak-manual master:
+    <<: *flatpak_master
+    when: manual
+    except:
+      - tags
+      - master

 # CONTAINERS creation stage
-.container_fedora_build_base:
-  extends: .fdo.container-build@fedora
-  stage: image-build
+container_fedora_build:
+  extends: .fedora@container-build
+  only:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
  variables:
    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
    # a list of packages to install
-    FDO_DISTRIBUTION_PACKAGES:
-      $LIBFPRINT_DEPENDENCIES
-      vala
-      libpcap-devel
-      libudev-devel
-    FDO_DISTRIBUTION_EXEC: |
-      $LIBFPRINT_EXEC
-  rules:
-    - when: never
-
-.container_fedora_build_forced:
-  variables:
-    FDO_FORCE_REBUILD: 1
-
-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
-
-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:
-  extends: .container_fedora_build_base
-  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'
-
-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
+    FEDORA_RPMS:
+      doxygen
+      flatpak-builder
+      gcc
+      gcc-c++
+      gcovr
+      git
+      glib2-devel
+      glibc-devel
+      gobject-introspection-devel
+      gtk-doc
+      gtk3-devel
+      libabigail
+      libgusb-devel
+      libX11-devel
+      libXv-devel
+      meson
+      nss-devel
+      pixman-devel
+      python3-cairo
+      python3-gobject
+      systemd
+      umockdev
+      uncrustify
+      valgrind
@@ -1,2 +0,0 @@
-variables:
-  LIBFPRINT_IMAGE_TAG: v6
@@ -1,49 +0,0 @@
-# Bump image version on .gitlab-ci/libfprint-image-variables.yaml to trigger
-# a rebuild on changes to this file
-
-.libfprint_common_variables:
-  LIBFPRINT_DEPENDENCIES:
-    appstream
-    doxygen
-    dnf-plugins-core
-    flatpak-builder
-    gcc
-    gcc-c++
-    gcovr
-    git
-    glib2-devel
-    glibc-devel
-    gobject-introspection-devel
-    gnome-desktop-testing
-    gtk-doc
-    gtk3-devel
-    libabigail
-    libasan
-    libgusb-devel
-    libgudev-devel
-    libubsan
-    libX11-devel
-    libXv-devel
-    meson
-    openssl-devel
-    pixman-devel
-    python3-cairo
-    python3-gobject
-    systemd
-    umockdev
-    uncrustify
-    valgrind
-    clang-analyzer
-    diffutils
-
-  LIBFPRINT_EXEC: |
-    dnf -y install dnf-utils
-    debuginfo-install -y \
-      glib2 \
-      glibc \
-      libgusb \
-      libusb \
-      openssl \
-      pixman \
-      python3-gobject \
-      python3-gobject-base
@@ -1,7 +0,0 @@
-#!/bin/sh -x
-
-# 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" \
-    "$@"
@@ -1,13 +0,0 @@
-Current maintainers of libfprint are:
-
- * Benjamin Berg <bberg@redhat.com>
- * Marco Trevisan (Treviño) <mail@3v1n0.net>
-
-Many drivers are not actively maintained and may not be fully functional.
-We are happy to receive contributions, but the support we can give is
-limitted unfortunately. For many drivers we may not even have test devices.
-
-Maintained drivers are:
- * synaptics:
-   Contributed and maintained by Synaptics Inc.
-   Contact: Vincent Huang <vincent.huang@tw.synaptics.com>
@@ -1,319 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.

-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:
- * synaptics: fix enroll identify problem after user reset database.
- * synaptics: New PIDs 0x0173, 0x0106, 0x0124.
- * goodixmoc: New PID 0x6582.
- * build: Do not require bash to build, only posix sh.
- * fp-image: Simplify minutiae detection tasks.
- * GLib 2.68 is now required to build libfprint.
-
-New drivers:
- * realtek (PID 0x5813).
- * focaltech_moc (PIDs 0x9E48, 0xD979, 0xA959).
- * egismoc (PIDs 0x0582, 0x05a1).
-
-2023-08-17: v1.94.6 release
-
-Highlights:
- * goodixmoc: New PIDs 0x60A4, 0x60BC, 0x6092, 0x633C and 0x6304.
- * goodixmoc: Fix missing "enroll create" state.
- * elanmoc: New PID 0x0C99.
- * upektc: Improve compatibility with sensors 147e:2016.
- * aes4000: Actually support 08FF:5501 devices.
- * virtual-device-listener: Fix failing tests with GLib 2.76
- * tests: Add installed tests
-
-Bugs fixed:
- * #526 libfprint: fpcmoc: use after free if enrollment or identification is
-   cancelled (Vasily Khoruzhick)
-
-2022-10-13: v1.94.5 release
-
-Highlights:
- * New driver: fpcmoc, supporting various FPC MOC Fingerprint Sensors
- * goodixmoc: New PIDs 0x6014, 0x6094, 0x631C, 0x634C, 0x6384, 0x659A.
- * goodixmoc: Support resetting device on firmware failure due to corrupted DB.
- * elanmoc: New PIDs 0x0c88, 0x0c8c, 0x0c8d.
- * synaptics: New PID 0x0104.
- * upektc: New PID 0x2017.
- * Fixed various memory leaks
- * More tests
-
-2022-05-24: v1.94.4 release
-
-Highlights:
- * synaptics: New PIDs 0x0168, 0x015f
- * elan: New PID 0x0c4b
- * elanspi: New PID 0x241f
- * synaptics: Minor fix to interrupt transfer resubmission
- * Avoid sysfs writes if value is already expected
- * Improvements to the testing setup
- * Fixes to the internal critical section API
-
-2021-11-02: v1.94.3 release
-
-Highlights:
- * Ensure idle mainloop before completing enumeration (fprintd#119)
- * It is now possible to extend already enrolled prints
- * elanspi: Fix timeout error with some hardware (#438)
- * elanspi: Fix cancellation issues
- * goodixmoc: Return matching device print; fixes duplicate checking (#444)
- * goodixmoc: Support clearing the storage (usually unused)
-
-2021-11-02: v1.94.2 release
-
-Highlights:
- * goodixmoc: Fix protocol error with certain username lengths
- * elanmoc: New PID 0x0c7d
- * goodixmoc: New PID 0x63cc
-
-2021-09-24: v1.94.1 release
-
-Highlights:
- * Ship a simple script to create new CI tests using tshark
- * Added CI tests for elan, uru4000, aes2501
- * goodixmoc: Remove duplicate checking during enroll and let fprintd handle it
- * uru4000: Fix USB transfer type
- * synaptics: Support for new PIDs
- * goodixmoc: Support for new PIDs
-
-2021-08-20: v1.94.0 release
-
-Highlights:
- * Implement suspend/resume handling including USB wakeup configuration.
-   This requires writing the "persist" and "wakeup" sysfs attributes.
- * Add simple temperature module to prevent devices from becoming too hot
- * Add feature for continuous scanning
- * New internal "critical section" API to simplify driver development
- * elan: new PID 0x0c58
- * elanmoc: Fixes for multi-user handling and FW changes
- * virtual-device: Do not time out for SCAN command
-
-2021-06-30: v1.92.1 release
-
-Highlights:
- * elanmoc: New driver for ELAN match-on-chip devices
- * egis0570: New driver for some Egis Technology devices
- * synaptics: Fix empty identify causing enroll issues
- * elan: Support more PIDs
- * misc: Architecture related bugfixes
-
-2021-06-30: v1.92.0 release
-
-Highlights:
- * Support for SPI devices was added together with the elanspi driver
- * Generate hwdb for autosuspend (which is now pulled by systemd)
- * An API was added to clear the device storage.
-   Note: Devices may not implement the "list" API anymore.
- * Device features can now be queried using a common API
-
-New drivers:
- * vfs7552
- * nb1010
- * elanspi
-
-Driver changes:
- * uru4000: Fix deactivation when unplugged unexpectedly
- * goodixmoc: Correctly complete verify/identify after retry condition
- * goodixmoc: Support power shield feature
- * goodixmoc: Support new PIDs
- * synaptics: Fix driver lockup when sequence counter overflows (#358)
- * synaptics: Remove unnecessary device reset
- * synaptics: Support new PIDs
- * synaptics: Add clear_storage and remove list support
- * synaptics: Fix initialization if the device is still busy when opening
- * upeksonly: Fix double free in USB transfer callbacks
- * elan: Support new PIDs
- * vfs301: Fix leak of USB transfer
- * uru4000: Silence warning happening during startup
-
-Internal API changes:
- * ssm: Add getter for the device
- * ssm: Add cleanup state feature
- * image-device: Allow overriding number of enroll stages
- * context: Support udev based device discovery
- * spi-transfer: Add SPI transfer helper routines
-
-Other:
- * Use pcap based USB replay for CI
- * New virtual drivers for more advanced testing
- * Ensure async operations are run in the thread local main context
- * Disable drivers on big-endian unless they are verified to work
- * Add missing gobject-introspection dependency
-
-
-2020-12-01: v1.90.7 release
-
-Highlights:
- * vfs5011: Fix possible use-after-free
- * goodixmoc: Add two new PIDs (0x63AC, 0x639C)
- * goodixmoc: Support finger status API
- * synaptics: Only identify within provided prints
- * synaptics: Reject devices with old firmware during probe (#239)
-
-
-2020-12-01: v1.90.6 release
-
-This release is primarily a bugfix release for some older issues.
-
-The major change is that fp_print_deserialize will now correctly return a
-sunken reference rather than a floating one. Most API users will have
-assumed this was true, and issues could happen at a later point.
-If any API user worked around this libfprint bug, they will now leak the
-returned print.
-
-Highlights:
- * Object reference management fixes for FpPrint and identify
- * Fixed issues that caused problem on non-x86 machines (#236)
- * Fix building with older GLib versions
- * synaptics: Support PID 00e7
- * goodix: Fix issue with long USB packages
-
-
-2020-12-01: v1.90.5 release
-
-The 1.90.4 release caused a major regression, as it included a USB hub in
-UDEV the autosupend rule list.
-
-Highlights:
- * Remove USB hub from udev autosupend rules
- * synaptics: Add PID 0x00c9 which is used in some HP laptops
-
-
-2020-11-27: v1.90.4 release
-
-This release contains a number of important bugfixes. On the feature side,
-the USB hotplug support was improved. A lot of drivers received fixes and
-improvements.
-
-Highlights:
- * Work around GUsb cancellation issue
- * Redefine internal image device state machine for more robustness
- * Add public finger-status reporting to FpDevice
- * Rework device removal API to be convenient (#330)
- * Enable powersave for unsupported USB devices
- * Improvements to examples
- * synaptics: Support identify operation
- * synaptics: Fix possible crash when the interrupt transfer is resubmitted
- * synaptics: Add support for PIDs 0x00f9, 0x00fc and 0x00c2
- * elan: Add PID 0x0c4d to supported device list
- * aes3k: Fix driver and add CI test (#306)
- * uru4000: Fix reference counting of image transfer
- * vfs301: Fix driver and add CI test (#320)
-
-2020-06-08: v1.90.3 release
-
-This release mostly contains support for a number of new match-on-chip
-devices. Most notable is the addition of the new goodixmoc driver.
-Currently the driver has the small caveat that we have no strategy to
-garbage collect old prints yet (a simple strategy could be implemented
-in fprintd).
-
-Highlights:
- * New goodixmoc driver supporting Goodix USB devices:
-   27C6:5840
-   27C6:6496
-   27C6:60A2
- * Newly added support for Synaptics device:
-   06CB:00E9
-   06CB:00DF
- * Fixed an issue with Synaptics devices sometimes not working at boot
- * Fix issue with aes3k driver (#306)
-
-2020-06-08: v1.90.2 release
-
-This release contains a large amount of bug and regression fixes. These
-are not listed explicitly, but affect the majority of drivers.
-
-Highlights:
- * A patch for nbis required for some sensors was accidentally dropped in
-   an earlier release. Users of these sensors/drivers (aes1610, aes2501,
-   aes2550, aes1660, aes2660, elan, upektc_img) need to re-enroll (#142).
-
-2019-11-20: v1.90.1 release
-
-This release fixes a lot of the regressions introduced in 1.90.0. Please note
-that both the driver and external APIs have changed, as both the verify and
-the identify functions now have early reporting mechanisms.
-The soname for the library, as well as a number of file locations have also
-changed. While this allows installation in parallel with the 1.0 version of
-libfprint, we recommend installing only one, and migrating from version 1.0 to
-version 2.0 alongside its main consumer (fprintd).
-
-Only major changes are listed below. A lot of other cleanup work and small
-fixes have also been merged.
-
-* Library:
-  - Add support to run tests in gdb/valgrind
-  - Allow testing on all architectures
-  - Avoid image device AWAIT_FINGER_ON to deactivate state transitions
-  - Fix verify/identify error propagation to library user
-  - Correctly read image device information from class data
-  - Continue enroll after an image driver reported a retry error
-  - Change external API to allow reporting match results early
-  - A lot of new unit tests and integration tests have been added
-
-* Drivers API
-  - 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:
-  - elan: Ensure correct deactivation of device
-  - uru4000: Fix IRQ handler registration and internal state handling
-  - uru4000: Fix control transfer request type
-  - synaptics: Ensure errors are only reported after finger removal
-
 2019-11-20: v1.90.0 release

 This release updates the core of the library to use GLib routines and Gio
@@ -417,7 +104,7 @@ tests of the drivers using umockdev.
  - Mark fp_dscv_print functions as deprecated

 * Udev rules:
-  - Add some unsupported devices to the allowlist
+  - Add some unsupported devices to the whitelist

 2017-05-14: v0.7.0 release
 * Drivers:
@@ -467,7 +154,7 @@ tests of the drivers using umockdev.
  - Fix possible race condition, and cancellation in uru4000 driver

 * Udev rules:
-  - Add Microsoft keyboard to the suspend denylist
+  - Add Microsoft keyboard to the suspend blacklist

 * Plenty of build fixes

@@ -0,0 +1,51 @@
+libfprint
+=========
+
+libfprint is part of the fprint project:
+https://fprint.freedesktop.org/
+
+libfprint was originally developed as part of an academic project at the
+University of Manchester with the aim of hiding differences between different
+consumer fingerprint scanners and providing a single uniform API to application
+developers. The ultimate goal of the fprint project is to make fingerprint
+scanners widely and easily usable under common Linux environments.
+
+The academic university project runs off a codebase maintained separately
+from this one, although I try to keep them as similar as possible (I'm not
+hiding anything in the academic branch, it's just the open source release
+contains some commits excluded from the academic project).
+
+THE UNIVERSITY OF MANCHESTER DOES NOT ENDORSE THIS THIS SOFTWARE RELEASE AND
+IS IN NO WAY RESPONSIBLE FOR THE CODE CONTAINED WITHIN, OR ANY DAMAGES CAUSED
+BY USING OR DISTRIBUTING THE SOFTWARE. Development does not happen on
+university computers and the project is not hosted at the university either.
+
+For more information on libfprint, supported devices, API documentation, etc.,
+see the homepage:
+https://fprint.freedesktop.org/
+
+libfprint is licensed under the GNU LGPL version 2.1. See the COPYING file
+for the license text.
+
+Section 6 of the license states that for compiled works that use this
+library, such works must include libfprint copyright notices alongside the
+copyright notices for the other parts of the work. We have attempted to
+make this process slightly easier for you by grouping these all in one place:
+the AUTHORS file.
+
+libfprint includes code from NIST's NBIS software distribution:
+http://fingerprint.nist.gov/NBIS/index.html
+We include bozorth3 from the US export controlled distribution. We have
+determined that it is fine to ship bozorth3 in an open source project,
+see https://fprint.freedesktop.org/us-export-control.html
+
+## Historical links
+
+Older versions of libfprint are available at:
+https://sourceforge.net/projects/fprint/files/
+
+Historical mailing-list archives:
+http://www.reactivated.net/fprint_list_archives/
+
+Historical website:
+http://web.archive.org/web/*/https://www.freedesktop.org/wiki/Software/fprint/
@@ -1,95 +0,0 @@
-
-
-<div align="center">
-
-# LibFPrint
-
-*LibFPrint is part of the **[FPrint][Website]** project.*
-
-<br/>
-
-[![Button Website]][Website]
-[![Button Documentation]][Documentation]
-
-[![Button Supported]][Supported]
-[![Button Unsupported]][Unsupported]
-
-[![Button Contribute]][Contribute]
-[![Button Contributors]][Contributors]
-
-</div>
-
-## History
-
-**LibFPrint** was originally developed as part of an
-academic project at the **[University Of Manchester]**.
-
-It aimed to hide the differences between consumer
-fingerprint scanners and provide a single uniform
-API to application developers.
-
-## Goal
-
-The ultimate goal of the **FPrint** project is to make
-fingerprint scanners widely and easily usable under
-common Linux environments.
-
-## License
-
-`Section 6` of the license states that for compiled works that use
-this library, such works must include **LibFPrint** copyright notices
-alongside the copyright notices for the other parts of the work.
-
-**LibFPrint** includes code from **NIST's** **[NBIS]** software distribution.
-
-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">
-
-[![Badge License]][License]
-
-</div>
-
-
-<!----------------------------------------------------------------------------->
-
-[Documentation]: https://fprint.freedesktop.org/libfprint-dev/
-[Contributors]: https://gitlab.freedesktop.org/libfprint/libfprint/-/graphs/master
-[Unsupported]: https://gitlab.freedesktop.org/libfprint/wiki/-/wikis/Unsupported-Devices
-[Supported]: https://fprint.freedesktop.org/supported-devices.html
-[Website]: https://fprint.freedesktop.org/
-[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
-
-[University Of Manchester]: https://www.manchester.ac.uk/
-[US Export Controlled]: https://fprint.freedesktop.org/us-export-control.html
-[NBIS]: http://fingerprint.nist.gov/NBIS/index.html
-
-
-<!---------------------------------[ Badges ]---------------------------------->
-
-[Badge License]: https://img.shields.io/badge/License-LGPL2.1-015d93.svg?style=for-the-badge&labelColor=blue
-
-
-<!---------------------------------[ Buttons ]--------------------------------->
-
-[Button Documentation]: https://img.shields.io/badge/Documentation-04ACE6?style=for-the-badge&logoColor=white&logo=BookStack
-[Button Contributors]: https://img.shields.io/badge/Contributors-FF4F8B?style=for-the-badge&logoColor=white&logo=ActiGraph
-[Button Unsupported]: https://img.shields.io/badge/Unsupported_Devices-EF2D5E?style=for-the-badge&logoColor=white&logo=AdBlock
-[Button Contribute]: https://img.shields.io/badge/Contribute-66459B?style=for-the-badge&logoColor=white&logo=Git
-[Button Supported]: https://img.shields.io/badge/Supported_Devices-428813?style=for-the-badge&logoColor=white&logo=AdGuard
-[Button Website]: https://img.shields.io/badge/Homepage-3B80AE?style=for-the-badge&logoColor=white&logo=freedesktopDotOrg
@@ -0,0 +1,30 @@
+LIBRARY
+=======
+test suite against NFIQ compliance set
+make library optionally asynchronous and maybe thread-safe
+nbis cleanups
+API function to determine if img device supports uncond. capture
+race-free way of saying "save this print but don't overwrite"
+
+NEW DRIVERS
+===========
+Sunplus 895 driver
+AES3400/3500 driver
+ID Mouse driver
+Support for 2nd generation MS devices
+Support for 2nd generation UPEK devices
+
+IMAGING
+=======
+ignore first frame or two with aes2501
+aes2501: increase threshold "sum" for end-of-image detection
+aes2501 gain calibration
+aes4000 gain calibration
+aes4000 resampling
+PPMM parameter to get_minutiae seems to have no effect
+nbis minutiae should be stored in endian-independent format
+
+PORTABILITY
+===========
+OpenBSD can't do -Wshadow or visibility
+OpenBSD: add compat codes for ENOTSUP ENODATA and EPROTO
@@ -1,521 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# This file has been generated using fprint-list-udev-hwdb with all drivers enabled
-
-# Supported by libfprint driver aes1610
-usb:v08FFp1600*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver aes1660
-usb:v08FFp1660*
-usb:v08FFp1680*
-usb:v08FFp1681*
-usb:v08FFp1682*
-usb:v08FFp1683*
-usb:v08FFp1684*
-usb:v08FFp1685*
-usb:v08FFp1686*
-usb:v08FFp1687*
-usb:v08FFp1688*
-usb:v08FFp1689*
-usb:v08FFp168A*
-usb:v08FFp168B*
-usb:v08FFp168C*
-usb:v08FFp168D*
-usb:v08FFp168E*
-usb:v08FFp168F*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver aes2501
-usb:v08FFp2500*
-usb:v08FFp2580*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver aes2550
-usb:v08FFp2550*
-usb:v08FFp2810*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver aes2660
-usb:v08FFp2660*
-usb:v08FFp2680*
-usb:v08FFp2681*
-usb:v08FFp2682*
-usb:v08FFp2683*
-usb:v08FFp2684*
-usb:v08FFp2685*
-usb:v08FFp2686*
-usb:v08FFp2687*
-usb:v08FFp2688*
-usb:v08FFp2689*
-usb:v08FFp268A*
-usb:v08FFp268B*
-usb:v08FFp268C*
-usb:v08FFp268D*
-usb:v08FFp268E*
-usb:v08FFp268F*
-usb:v08FFp2691*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver aes3500
-usb:v08FFp5731*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver aes4000
-usb:v08FFp5501*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver egis0570
-usb:v1C7Ap0570*
-usb:v1C7Ap0571*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver 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
-
-# Supported by libfprint driver elan
-usb:v04F3p0903*
-usb:v04F3p0907*
-usb:v04F3p0C01*
-usb:v04F3p0C02*
-usb:v04F3p0C03*
-usb:v04F3p0C04*
-usb:v04F3p0C05*
-usb:v04F3p0C06*
-usb:v04F3p0C07*
-usb:v04F3p0C08*
-usb:v04F3p0C09*
-usb:v04F3p0C0A*
-usb:v04F3p0C0B*
-usb:v04F3p0C0C*
-usb:v04F3p0C0D*
-usb:v04F3p0C0E*
-usb:v04F3p0C0F*
-usb:v04F3p0C10*
-usb:v04F3p0C11*
-usb:v04F3p0C12*
-usb:v04F3p0C13*
-usb:v04F3p0C14*
-usb:v04F3p0C15*
-usb:v04F3p0C16*
-usb:v04F3p0C17*
-usb:v04F3p0C18*
-usb:v04F3p0C19*
-usb:v04F3p0C1A*
-usb:v04F3p0C1B*
-usb:v04F3p0C1C*
-usb:v04F3p0C1D*
-usb:v04F3p0C1E*
-usb:v04F3p0C1F*
-usb:v04F3p0C20*
-usb:v04F3p0C21*
-usb:v04F3p0C22*
-usb:v04F3p0C23*
-usb:v04F3p0C24*
-usb:v04F3p0C25*
-usb:v04F3p0C26*
-usb:v04F3p0C27*
-usb:v04F3p0C28*
-usb:v04F3p0C29*
-usb:v04F3p0C2A*
-usb:v04F3p0C2B*
-usb:v04F3p0C2C*
-usb:v04F3p0C2D*
-usb:v04F3p0C2E*
-usb:v04F3p0C2F*
-usb:v04F3p0C30*
-usb:v04F3p0C31*
-usb:v04F3p0C32*
-usb:v04F3p0C33*
-usb:v04F3p0C3D*
-usb:v04F3p0C42*
-usb:v04F3p0C4B*
-usb:v04F3p0C4D*
-usb:v04F3p0C4F*
-usb:v04F3p0C63*
-usb:v04F3p0C6E*
-usb:v04F3p0C58*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver elanmoc
-usb:v04F3p0C7D*
-usb:v04F3p0C7E*
-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
-
-# Supported by libfprint driver etes603
-usb:v1C7Ap0603*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# 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:v27C6p6384*
-usb:v27C6p639C*
-usb:v27C6p63AC*
-usb:v27C6p63BC*
-usb:v27C6p63CC*
-usb:v27C6p6496*
-usb:v27C6p650A*
-usb:v27C6p650C*
-usb:v27C6p6582*
-usb:v27C6p6584*
-usb:v27C6p658C*
-usb:v27C6p6592*
-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*
- 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:v06CBp0100*
-usb:v06CBp0103*
-usb:v06CBp0104*
-usb:v06CBp0106*
-usb:v06CBp0107*
-usb:v06CBp0108*
-usb:v06CBp0109*
-usb:v06CBp010A*
-usb:v06CBp0123*
-usb:v06CBp0124*
-usb:v06CBp0126*
-usb:v06CBp0129*
-usb:v06CBp015F*
-usb:v06CBp0168*
-usb:v06CBp0169*
-usb:v06CBp016C*
-usb:v06CBp0173*
-usb:v06CBp0174*
-usb:v06CBp019D*
-usb:v06CBp019F*
-usb:v06CBp01A0*
-usb:v06CBp01A4*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver upeksonly
-usb:v147Ep2016*
-usb:v147Ep1000*
-usb:v147Ep1001*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver upektc
-usb:v0483p2015*
-usb:v0483p2017*
-usb:v147Ep3001*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver upektc_img
-usb:v147Ep2020*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver uru4000
-usb:v045Ep00BC*
-usb:v045Ep00BD*
-usb:v045Ep00CA*
-usb:v05BAp0007*
-usb:v05BAp0008*
-usb:v05BAp000A*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver vcom5s
-usb:v061Ap0110*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver vfs0050
-usb:v138Ap0050*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver vfs101
-usb:v138Ap0001*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver vfs301
-usb:v138Ap0005*
-usb:v138Ap0008*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver vfs5011
-usb:v138Ap0010*
-usb:v138Ap0011*
-usb:v138Ap0015*
-usb:v138Ap0017*
-usb:v138Ap0018*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Supported by libfprint driver vfs7552
-usb:v138Ap0091*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
-
-# Known unsupported devices
-usb:v0A5Cp5802*
-usb:v047Dp00F2*
-usb:v047Dp8054*
-usb:v047Dp8055*
-usb:v04E8p730B*
-usb:v04F3p036B*
-usb:v04F3p0C00*
-usb:v04F3p0C4C*
-usb:v04F3p0C57*
-usb:v04F3p0C5E*
-usb:v04F3p0C5A*
-usb:v04F3p0C60*
-usb:v04F3p0C6C*
-usb:v04F3p0C70*
-usb:v04F3p0C72*
-usb:v04F3p0C77*
-usb:v04F3p0C7C*
-usb:v04F3p0C7F*
-usb:v04F3p0C80*
-usb:v04F3p0C85*
-usb:v04F3p0C90*
-usb:v04F3p2706*
-usb:v04F3p3032*
-usb:v04F3p3057*
-usb:v04F3p3104*
-usb:v04F3p310D*
-usb:v04F3p3128*
-usb:v04F3p0C8A*
-usb:v05BAp000E*
-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:v06CBp00CB*
-usb:v06CBp00C9*
-usb:v06CBp00D8*
-usb:v06CBp00DA*
-usb:v06CBp00DC*
-usb:v06CBp00E4*
-usb:v06CBp00E7*
-usb:v06CBp00FD*
-usb:v06CBp00FF*
-usb:v0A5Cp5801*
-usb:v0A5Cp5805*
-usb:v0A5Cp5834*
-usb:v0A5Cp5840*
-usb:v0A5Cp5841*
-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*
-usb:v10A5p9201*
-usb:v10A5p9800*
-usb:v10A5pA120*
-usb:v10A5pA900*
-usb:v10A5pA921*
-usb:v10A5pE340*
-usb:v1188p9545*
-usb:v138Ap0007*
-usb:v138Ap003A*
-usb:v138Ap003C*
-usb:v138Ap003D*
-usb:v138Ap003F*
-usb:v138Ap0090*
-usb:v138Ap0092*
-usb:v138Ap0094*
-usb:v138Ap0097*
-usb:v138Ap009D*
-usb:v138Ap00AB*
-usb:v138Ap00A6*
-usb:v147Ep1002*
-usb:v1491p0088*
-usb:v16D1p1027*
-usb:v1C7Ap0300*
-usb:v1C7Ap0575*
-usb:v1C7Ap0576*
-usb:v1C7Ap0577*
-usb:v1C7Ap057E*
-usb:v2541p0236*
-usb:v2541p9711*
-usb:v27C6p5042*
-usb:v27C6p5110*
-usb:v27C6p5117*
-usb:v27C6p5120*
-usb:v27C6p5125*
-usb:v27C6p5201*
-usb:v27C6p521D*
-usb:v27C6p5301*
-usb:v27C6p530C*
-usb:v27C6p532D*
-usb:v27C6p5335*
-usb:v27C6p533C*
-usb:v27C6p5381*
-usb:v27C6p5385*
-usb:v27C6p538C*
-usb:v27C6p538D*
-usb:v27C6p5395*
-usb:v27C6p5503*
-usb:v27C6p550A*
-usb:v27C6p550C*
-usb:v27C6p5584*
-usb:v27C6p55A2*
-usb:v27C6p55A4*
-usb:v27C6p55B4*
-usb:v27C6p5740*
-usb:v27C6p5E0A*
-usb:v27C6p581A*
-usb:v27C6p589A*
-usb:v27C6p5F10*
-usb:v27C6p5F91*
-usb:v27C6p6382*
-usb:v2808p9338*
-usb:v2808p9348*
-usb:v2808p93A9*
-usb:v2808pA658*
-usb:v2808pC652*
-usb:v2808pA553*
-usb:v298Dp2020*
-usb:v298Dp2033*
-usb:v2DF0p0003*
-usb:v3538p0930*
- ID_AUTOSUSPEND=1
- ID_PERSIST=0
@@ -1,11 +0,0 @@
-if udev_hwdb_dir != ''
-    # This file has to be updated using
-    # 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
-
-    install_data('autosuspend.hwdb',
-        rename: '60-autosuspend-@0@.hwdb'.format(versioned_libname),
-        install_dir: udev_hwdb_dir,
-    )
-endif
@@ -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++)
    {
@@ -244,8 +241,6 @@ dev_capture_start_cb (FpDevice     *dev,
      if (error->domain == FP_DEVICE_RETRY ||
          g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
        libfprint_demo_set_mode (win, RETRY_MODE);
-      else if (g_error_matches (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_NOT_SUPPORTED))
-        libfprint_demo_set_mode (win, NOIMAGING_MODE);
      else
        libfprint_demo_set_mode (win, ERROR_MODE);
      return;
@@ -529,7 +524,7 @@ libfprint_demo_window_init (LibfprintDemoWindow *window)
      return;
    }

-  if (!fp_device_has_feature (g_ptr_array_index (devices, 0), FP_DEVICE_FEATURE_CAPTURE))
+  if (!fp_device_supports_capture (g_ptr_array_index (devices, 0)))
    {
      libfprint_demo_set_mode (window, NOIMAGING_MODE);
      return;
@@ -1,12 +1,12 @@
 {
    "app-id": "org.freedesktop.libfprint.Demo",
    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
+    "runtime-version": "3.32",
    "sdk": "org.gnome.Sdk",
    "command": "gtk-libfprint-test",
    "finish-args": [
        /* X11 + XShm access */
-        "--share=ipc", "--socket=fallback-x11",
+        "--share=ipc", "--socket=x11",
        /* Wayland access */
        "--socket=wayland",
        /* OpenGL access */
@@ -18,7 +18,7 @@
    "modules": [
        {
            "name": "libusb",
-            "config-opts": [ "--disable-static" ],
+            "config-opts": [ "--disable-static", "--disable-udev" ],
            "cleanup": [
                "/lib/*.la",
                "/lib/pkgconfig",
@@ -26,47 +26,36 @@
            ],
            "sources": [
                {
-                   "type": "archive",
-                   "url": "https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2",
-                   "sha256": "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5"
+                    "type": "archive",
+                    "url": "https://github.com/libusb/libusb/archive/v1.0.22.tar.gz",
+                    "sha256": "3500f7b182750cd9ccf9be8b1df998f83df56a39ab264976bdb3307773e16f48"
                }
            ],
            "post-install": [
-                "install -Dm644 COPYING /app/share/licenses/libusb/COPYING"
+                "install -Dm644 COPYING /app/share/licenses/libgusb/COPYING"
            ]
        },
        {
            "name": "libgusb",
            "buildsystem": "meson",
-            "config-opts": [ "-Dtests=false", "-Dvapi=false", "-Ddocs=false" ],
+            "config-opts": [ "-Dtests=false", "-Dvapi=false", "-Ddocs=false", "-Dintrospection=false" ],
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://github.com/hughsie/libgusb/releases/download/0.4.6/libgusb-0.4.6.tar.xz",
-                    "sha256": "1b0422bdcd72183272ac42eec9398c5a0bc48a02f618fa3242c468cbbd003049"
-                }
-            ]
-        },
-        {
-            "name": "gudev",
-            "buildsystem": "meson",
-            "config-opts": [ "-Dtests=disabled", "-Dintrospection=disabled", "-Dvapi=disabled" ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libgudev/238/libgudev-238.tar.xz",
-                    "sha256": "61266ab1afc9d73dbc60a8b2af73e99d2fdff47d99544d085760e4fa667b5dd1"
+                    "url": "https://github.com/hughsie/libgusb/archive/0.3.0.tar.gz",
+                    "sha256": "b36310f8405d5fd68f6caf4a829f7ab4c627b38fd3d02a139d411fce0f3a49f1"
                }
            ]
        },
        {
            "name": "libfprint",
            "buildsystem": "meson",
-            "config-opts": [ "-Dudev_hwdb=disabled", "-Dudev_rules=disabled", "-Dgtk-examples=true", "-Ddrivers=all" ],
+            "config-opts": [ "-Dudev_rules=false", "-Dx11-examples=false", "-Dgtk-examples=true", "-Ddrivers=all" ],
            "sources": [
                {
                    "type": "git",
-                    "url": "https://gitlab.freedesktop.org/libfprint/libfprint.git"
+                    "url": "https://gitlab.freedesktop.org/libfprint/libfprint.git",
+                    "branch": "wip/benzea/v2"
                }
            ]
        }
@@ -1,443 +0,0 @@
-<SECTION>
-<FILE>drivers_api</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>fp-context</FILE>
-<TITLE>FpContext</TITLE>
-FP_TYPE_CONTEXT
-FpContextClass
-fp_context_new
-fp_context_enumerate
-fp_context_get_devices
-FpContext
-</SECTION>
-
-<SECTION>
-<FILE>fp-device</FILE>
-FP_TYPE_DEVICE
-FP_DEVICE_RETRY
-FP_DEVICE_ERROR
-FpDeviceType
-FpDeviceFeature
-FpScanType
-FpDeviceRetry
-FpDeviceError
-FpFingerStatusFlags
-fp_device_retry_quark
-fp_device_error_quark
-FpEnrollProgress
-FpMatchCb
-fp_device_get_driver
-fp_device_get_device_id
-fp_device_get_name
-fp_device_get_scan_type
-fp_device_get_nr_enroll_stages
-fp_device_get_finger_status
-fp_device_get_features
-fp_device_has_feature
-fp_device_has_storage
-fp_device_supports_identify
-fp_device_supports_capture
-fp_device_is_open
-fp_device_open
-fp_device_close
-fp_device_enroll
-fp_device_verify
-fp_device_identify
-fp_device_capture
-fp_device_delete_print
-fp_device_list_prints
-fp_device_clear_storage
-fp_device_suspend
-fp_device_resume
-fp_device_open_finish
-fp_device_close_finish
-fp_device_enroll_finish
-fp_device_verify_finish
-fp_device_identify_finish
-fp_device_capture_finish
-fp_device_delete_print_finish
-fp_device_list_prints_finish
-fp_device_clear_storage_finish
-fp_device_suspend_finish
-fp_device_resume_finish
-fp_device_open_sync
-fp_device_close_sync
-fp_device_enroll_sync
-fp_device_verify_sync
-fp_device_identify_sync
-fp_device_capture_sync
-fp_device_delete_print_sync
-fp_device_list_prints_sync
-fp_device_clear_storage_sync
-fp_device_suspend_sync
-fp_device_resume_sync
-FpDevice
-FpTemperature
-</SECTION>
-
-<SECTION>
-<FILE>fp-image</FILE>
-FP_TYPE_IMAGE
-FpMinutia
-fp_image_new
-fp_image_get_width
-fp_image_get_height
-fp_image_get_ppmm
-fp_image_get_minutiae
-fp_image_detect_minutiae
-fp_image_detect_minutiae_finish
-fp_image_get_data
-fp_image_get_binarized
-fp_minutia_get_coords
-FpImage
-</SECTION>
-
-<SECTION>
-<FILE>fp-image-device</FILE>
-FP_TYPE_IMAGE_DEVICE
-FpImageDevice
-</SECTION>
-
-<SECTION>
-<FILE>fp-print</FILE>
-FP_TYPE_PRINT
-FpFinger
-FpPrint
-fp_print_new
-fp_print_get_driver
-fp_print_get_device_id
-fp_print_get_device_stored
-fp_print_get_image
-fp_print_get_finger
-fp_print_get_username
-fp_print_get_description
-fp_print_get_enroll_date
-fp_print_set_finger
-fp_print_set_username
-fp_print_set_description
-fp_print_set_enroll_date
-fp_print_compatible
-fp_print_equal
-fp_print_serialize
-fp_print_deserialize
-</SECTION>
-
-<SECTION>
-<FILE>fpi-assembling</FILE>
-fpi_frame
-fpi_frame_asmbl_ctx
-fpi_do_movement_estimation
-fpi_assemble_frames
-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
-</SECTION>
-
-<SECTION>
-<FILE>fpi-device</FILE>
-FpDeviceClass
-FpTimeoutFunc
-FpiDeviceAction
-FpIdEntry
-FpiDeviceUdevSubtypeFlags
-fpi_device_get_usb_device
-fpi_device_get_udev_data
-fpi_device_get_virtual_env
-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
-fpi_device_get_capture_data
-fpi_device_get_verify_data
-fpi_device_get_identify_data
-fpi_device_get_delete_data
-fpi_device_get_cancellable
-fpi_device_action_is_cancelled
-fpi_device_add_timeout
-fpi_device_set_nr_enroll_stages
-fpi_device_set_scan_type
-fpi_device_update_features
-fpi_device_critical_enter
-fpi_device_critical_leave
-fpi_device_remove
-fpi_device_report_finger_status
-fpi_device_report_finger_status_changes
-fpi_device_action_error
-fpi_device_probe_complete
-fpi_device_open_complete
-fpi_device_close_complete
-fpi_device_enroll_complete
-fpi_device_verify_complete
-fpi_device_identify_complete
-fpi_device_capture_complete
-fpi_device_clear_storage_complete
-fpi_device_delete_complete
-fpi_device_list_complete
-fpi_device_suspend_complete
-fpi_device_resume_complete
-fpi_device_enroll_progress
-fpi_device_verify_report
-fpi_device_identify_report
-fpi_device_class_auto_initialize_features
-</SECTION>
-
-<SECTION>
-<FILE>fpi-image</FILE>
-FpiImageFlags
-FpImage
-fpi_std_sq_dev
-fpi_mean_sq_diff_norm
-fpi_image_resize
-</SECTION>
-
-<SECTION>
-<FILE>fpi-image-device</FILE>
-<TITLE>Internal FpImageDevice</TITLE>
-FpiImageDeviceState
-FpImageDeviceClass
-fpi_image_device_session_error
-fpi_image_device_open_complete
-fpi_image_device_close_complete
-fpi_image_device_activate_complete
-fpi_image_device_deactivate_complete
-fpi_image_device_report_finger_status
-fpi_image_device_image_captured
-fpi_image_device_retry_scan
-fpi_image_device_set_bz3_threshold
-</SECTION>
-
-<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>
-
-<SECTION>
-<FILE>fpi-print</FILE>
-FpiPrintType
-FpiMatchResult
-fpi_print_add_print
-fpi_print_set_type
-fpi_print_set_device_stored
-fpi_print_add_from_image
-fpi_print_bz3_match
-fpi_print_generate_user_id
-fpi_print_fill_from_user_id
-</SECTION>
-
-<SECTION>
-<FILE>fpi-ssm</FILE>
-FpiSsmCompletedCallback
-FpiSsmHandlerCallback
-fpi_ssm_new
-fpi_ssm_new_full
-fpi_ssm_free
-fpi_ssm_start
-fpi_ssm_start_subsm
-fpi_ssm_next_state
-fpi_ssm_next_state_delayed
-fpi_ssm_jump_to_state
-fpi_ssm_jump_to_state_delayed
-fpi_ssm_cancel_delayed_state_change
-fpi_ssm_mark_completed
-fpi_ssm_mark_failed
-fpi_ssm_set_data
-fpi_ssm_get_data
-fpi_ssm_get_device
-fpi_ssm_get_error
-fpi_ssm_dup_error
-fpi_ssm_get_cur_state
-fpi_ssm_silence_debug
-fpi_ssm_spi_transfer_cb
-fpi_ssm_spi_transfer_with_weak_pointer_cb
-fpi_ssm_usb_transfer_cb
-fpi_ssm_usb_transfer_with_weak_pointer_cb
-FpiSsm
-</SECTION>
-
-<SECTION>
-<FILE>fpi-usb-transfer</FILE>
-FPI_USB_ENDPOINT_IN
-FPI_USB_ENDPOINT_OUT
-FpiUsbTransferCallback
-FpiTransferType
-FpiUsbTransfer
-fpi_usb_transfer_new
-fpi_usb_transfer_ref
-fpi_usb_transfer_unref
-fpi_usb_transfer_set_short_error
-fpi_usb_transfer_fill_bulk
-fpi_usb_transfer_fill_bulk_full
-fpi_usb_transfer_fill_control
-fpi_usb_transfer_fill_interrupt
-fpi_usb_transfer_fill_interrupt_full
-fpi_usb_transfer_submit
-fpi_usb_transfer_submit_sync
-<SUBSECTION Standard>
-FPI_TYPE_USB_TRANSFER
-fpi_usb_transfer_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fpi-spi-transfer</FILE>
-FpiSpiTransferCallback
-FpiSpiTransfer
-fpi_spi_transfer_new
-fpi_spi_transfer_ref
-fpi_spi_transfer_unref
-fpi_spi_transfer_write
-fpi_spi_transfer_write_full
-fpi_spi_transfer_read
-fpi_spi_transfer_read_full
-fpi_spi_transfer_submit
-fpi_spi_transfer_submit_sync
-<SUBSECTION Standard>
-FPI_TYPE_SPI_TRANSFER
-fpi_spi_transfer_get_type
-</SECTION>
@@ -1,8 +0,0 @@
-#include <fprint.h>
-#include <fp-image-device.h>
-
-fp_context_get_type
-fp_device_get_type
-fp_image_device_get_type
-fp_image_get_type
-fp_print_get_type
@@ -41,19 +41,12 @@
    </chapter>

    <chapter id="driver-helpers">
-      <title>USB, SPI and State Machine helpers</title>
-      <xi:include href="xml/fpi-spi-transfer.xml"/>
+      <title>USB and State Machine helpers</title>
      <xi:include href="xml/fpi-usb-transfer.xml"/>
      <xi:include href="xml/fpi-ssm.xml"/>
      <xi:include href="xml/fpi-log.xml"/>
    </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"/>
@@ -0,0 +1,257 @@
+<SECTION>
+<FILE>drivers_api</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>fp-context</FILE>
+<TITLE>FpContext</TITLE>
+FP_TYPE_CONTEXT
+FpContextClass
+fp_context_new
+fp_context_enumerate
+fp_context_get_devices
+FpContext
+</SECTION>
+
+<SECTION>
+<FILE>fp-device</FILE>
+FP_TYPE_DEVICE
+FP_DEVICE_RETRY
+FP_DEVICE_ERROR
+FpDeviceType
+FpScanType
+FpDeviceRetry
+FpDeviceError
+fp_device_retry_quark
+fp_device_error_quark
+FpEnrollProgress
+fp_device_get_driver
+fp_device_get_device_id
+fp_device_get_name
+fp_device_get_scan_type
+fp_device_get_nr_enroll_stages
+fp_device_has_storage
+fp_device_supports_identify
+fp_device_supports_capture
+fp_device_open
+fp_device_close
+fp_device_enroll
+fp_device_verify
+fp_device_identify
+fp_device_capture
+fp_device_delete_print
+fp_device_list_prints
+fp_device_open_finish
+fp_device_close_finish
+fp_device_enroll_finish
+fp_device_verify_finish
+fp_device_identify_finish
+fp_device_capture_finish
+fp_device_delete_print_finish
+fp_device_list_prints_finish
+fp_device_open_sync
+fp_device_close_sync
+fp_device_enroll_sync
+fp_device_verify_sync
+fp_device_identify_sync
+fp_device_capture_sync
+fp_device_delete_print_sync
+fp_device_list_prints_sync
+FpDevice
+</SECTION>
+
+<SECTION>
+<FILE>fp-image</FILE>
+FP_TYPE_IMAGE
+FpMinutia
+fp_image_new
+fp_image_get_width
+fp_image_get_height
+fp_image_get_ppmm
+fp_image_get_minutiae
+fp_image_detect_minutiae
+fp_image_detect_minutiae_finish
+fp_image_get_data
+fp_image_get_binarized
+fp_minutia_get_coords
+FpImage
+</SECTION>
+
+<SECTION>
+<FILE>fp-image-device</FILE>
+FP_TYPE_IMAGE_DEVICE
+FpImageDevice
+</SECTION>
+
+<SECTION>
+<FILE>fp-print</FILE>
+FP_TYPE_PRINT
+FpFinger
+FpPrint
+fp_print_new
+fp_print_new_from_data
+fp_print_to_data
+fp_print_get_driver
+fp_print_get_device_id
+fp_print_get_device_stored
+fp_print_get_image
+fp_print_get_finger
+fp_print_get_username
+fp_print_get_description
+fp_print_get_enroll_date
+fp_print_set_finger
+fp_print_set_username
+fp_print_set_description
+fp_print_set_enroll_date
+fp_print_compatible
+fp_print_equal
+fp_print_serialize
+fp_print_deserialize
+</SECTION>
+
+<SECTION>
+<FILE>fpi-assembling</FILE>
+fpi_frame
+fpi_frame_asmbl_ctx
+fpi_do_movement_estimation
+fpi_assemble_frames
+fpi_line_asmbl_ctx
+fpi_assemble_lines
+</SECTION>
+
+<SECTION>
+<FILE>fpi-context</FILE>
+fpi_get_driver_types
+</SECTION>
+
+<SECTION>
+<FILE>fpi-device</FILE>
+FpDeviceClass
+FpTimeoutFunc
+FpDeviceAction
+FpIdEntry
+fpi_device_get_usb_device
+fpi_device_get_virtual_env
+fpi_device_get_current_action
+fpi_device_retry_new
+fpi_device_error_new
+fpi_device_retry_new_msg
+fpi_device_error_new_msg
+fpi_device_get_driver_data
+fpi_device_get_enroll_data
+fpi_device_get_capture_data
+fpi_device_get_verify_data
+fpi_device_get_identify_data
+fpi_device_get_delete_data
+fpi_device_get_cancellable
+fpi_device_action_is_cancelled
+fpi_device_add_timeout
+fpi_device_set_nr_enroll_stages
+fpi_device_set_scan_type
+fpi_device_action_error
+fpi_device_probe_complete
+fpi_device_open_complete
+fpi_device_close_complete
+fpi_device_enroll_complete
+fpi_device_verify_complete
+fpi_device_identify_complete
+fpi_device_capture_complete
+fpi_device_delete_complete
+fpi_device_enroll_progress
+</SECTION>
+
+<SECTION>
+<FILE>fpi-image</FILE>
+FpiImageFlags
+FpImage
+fpi_std_sq_dev
+fpi_mean_sq_diff_norm
+fpi_image_resize
+</SECTION>
+
+<SECTION>
+<FILE>fpi-image-device</FILE>
+<TITLE>FpImageDevice</TITLE>
+FpImageDeviceState
+FpImageDeviceClass
+fpi_image_device_session_error
+fpi_image_device_open_complete
+fpi_image_device_close_complete
+fpi_image_device_activate_complete
+fpi_image_device_deactivate_complete
+fpi_image_device_report_finger_status
+fpi_image_device_image_captured
+fpi_image_device_retry_scan
+</SECTION>
+
+<SECTION>
+<FILE>fpi-log</FILE>
+fp_dbg
+fp_info
+fp_warn
+fp_err
+BUG_ON
+BUG
+</SECTION>
+
+<SECTION>
+<FILE>fpi-print</FILE>
+FpPrintType
+FpiMatchResult
+fpi_print_add_print
+fpi_print_set_type
+fpi_print_set_device_stored
+fpi_print_add_from_image
+fpi_print_bz3_match
+</SECTION>
+
+<SECTION>
+<FILE>fpi-ssm</FILE>
+FpiSsmCompletedCallback
+FpiSsmHandlerCallback
+fpi_ssm_new
+fpi_ssm_new_full
+fpi_ssm_free
+fpi_ssm_start
+fpi_ssm_start_subsm
+fpi_ssm_next_state
+fpi_ssm_next_state_delayed
+fpi_ssm_jump_to_state
+fpi_ssm_jump_to_state_delayed
+fpi_ssm_cancel_delayed_state_change
+fpi_ssm_mark_completed
+fpi_ssm_mark_failed
+fpi_ssm_set_data
+fpi_ssm_get_data
+fpi_ssm_get_error
+fpi_ssm_dup_error
+fpi_ssm_get_cur_state
+fpi_ssm_next_state_timeout_cb
+fpi_ssm_usb_transfer_cb
+FpiSsm
+</SECTION>
+
+<SECTION>
+<FILE>fpi-usb-transfer</FILE>
+FPI_USB_ENDPOINT_IN
+FPI_USB_ENDPOINT_OUT
+FpiUsbTransferCallback
+FpiTransferType
+FpiUsbTransfer
+fpi_usb_transfer_new
+fpi_usb_transfer_ref
+fpi_usb_transfer_unref
+fpi_usb_transfer_set_short_error
+fpi_usb_transfer_fill_bulk
+fpi_usb_transfer_fill_bulk_full
+fpi_usb_transfer_fill_control
+fpi_usb_transfer_fill_interrupt
+fpi_usb_transfer_fill_interrupt_full
+fpi_usb_transfer_submit
+fpi_usb_transfer_submit_sync
+<SUBSECTION Standard>
+FPI_TYPE_USB_TRANSFER
+fpi_usb_transfer_get_type
+</SECTION>
+
@@ -90,7 +90,7 @@ fp_image_get_width
 <TITLE>Base class for image devices</TITLE>
 FpImageDevice
 FpImageDeviceClass
-FpiImageDeviceState
+FpImageDeviceState
 </SECTION>

 <SECTION>
@@ -114,3 +114,5 @@ FpUsbTransferCallback
 FP_USB_ENDPOINT_IN
 FP_USB_ENDPOINT_OUT
 </SECTION>
+
+
@@ -4,6 +4,7 @@ private_headers = [
    'config.h',
    'nbis-helpers.h',
    'fprint.h',
+    'fp_internal.h',

    # Subdirectories to ignore
    'drivers',
@@ -19,19 +20,20 @@ content_files = [

 expand_content_files = content_files

-glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix')
+glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
 glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
 docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')

-gnome.gtkdoc(versioned_libname,
+gnome.gtkdoc('libfprint',
    main_xml: 'libfprint-docs.xml',
-    src_dir: join_paths(meson.project_source_root(), 'libfprint'),
-    include_directories: include_directories('../libfprint'),
+    src_dir: join_paths(meson.source_root(), 'libfprint'),
    dependencies: libfprint_dep,
    content_files: content_files,
    expand_content_files: expand_content_files,
-    ignore_headers: private_headers,
-    gobject_typesfile: 'libfprint-2.types',
+    scan_args: [
+        #'--rebuild-sections',
+        '--ignore-headers=' + ' '.join(private_headers),
+    ],
    fixxref_args: [
        '--html-dir=@0@'.format(docpath),
        '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
@@ -1,8 +1,8 @@
 ent_conf = configuration_data()
-ent_conf.set('PACKAGE', versioned_libname)
+ent_conf.set('PACKAGE', 'libfprint')
 ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/libfprint/libfprint/issues')
-ent_conf.set('PACKAGE_NAME', versioned_libname)
-ent_conf.set('PACKAGE_STRING', versioned_libname)
+ent_conf.set('PACKAGE_NAME', 'libfprint')
+ent_conf.set('PACKAGE_STRING', 'libfprint')
 ent_conf.set('PACKAGE_TARNAME', 'libfprint-' + meson.project_version())
 ent_conf.set('PACKAGE_URL', 'https://fprint.freedesktop.org/')
 ent_conf.set('PACKAGE_VERSION', meson.project_version())
@@ -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;
-}
@@ -1,6 +1,6 @@
 /*
 * Example fingerprint enrollment program
- * Enrolls your chosen finger and saves the print to disk
+ * Enrolls your choosen finger and saves the print to disk
 * Copyright (C) 2007 Daniel Drake <dsd@gentoo.org>
 * Copyright (C) 2019 Marco Trevisan <marco.trevisan@canonical.com>
 *
@@ -19,30 +19,22 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#define FP_COMPONENT "example-enroll"
-
 #include <stdio.h>
 #include <libfprint/fprint.h>
-#include <glib-unix.h>

 #include "storage.h"
 #include "utilities.h"

 typedef struct _EnrollData
 {
-  GMainLoop    *loop;
-  GCancellable *cancellable;
-  unsigned int  sigint_handler;
-  FpFinger      finger;
-  int           ret_value;
-  gboolean      update_fingerprint;
+  GMainLoop *loop;
+  FpFinger   finger;
+  int        ret_value;
 } EnrollData;

 static void
 enroll_data_free (EnrollData *enroll_data)
 {
-  g_clear_handle_id (&enroll_data->sigint_handler, g_source_remove);
-  g_clear_object (&enroll_data->cancellable);
  g_main_loop_unref (enroll_data->loop);
  g_free (enroll_data);
 }
@@ -58,7 +50,7 @@ on_device_closed (FpDevice *dev, GAsyncResult *res, void *user_data)
  fp_device_close_finish (dev, res, &error);

  if (error)
-    g_warning ("Failed closing device %s", error->message);
+    g_warning ("Failed closing device %s\n", error->message);

  g_main_loop_quit (enroll_data->loop);
 }
@@ -77,25 +69,20 @@ on_enroll_completed (FpDevice *dev, GAsyncResult *res, void *user_data)
    {
      enroll_data->ret_value = EXIT_SUCCESS;

-      if (fp_device_has_feature (dev, FP_DEVICE_FEATURE_STORAGE))
-        g_debug ("Device has storage, saving a print reference locally");
-      else
-        g_debug ("Device has not storage, saving print only locally");
-
-      /* Even if the device has storage, it may not be able to save all the
-       * metadata that the print contains, so we can always save a local copy
-       * containing the handle to the device print */
-      int r = print_data_save (print, enroll_data->finger,
-                               enroll_data->update_fingerprint);
-      if (r < 0)
+      if (!fp_device_has_storage (dev))
        {
-          g_warning ("Data save failed, code %d", r);
-          enroll_data->ret_value = EXIT_FAILURE;
+          g_debug ("Device has not storage, saving locally");
+          int r = print_data_save (print, enroll_data->finger);
+          if (r < 0)
+            {
+              g_warning ("Data save failed, code %d", r);
+              enroll_data->ret_value = EXIT_FAILURE;
+            }
        }
    }
  else
    {
-      g_warning ("Enroll failed with error %s", error->message);
+      g_warning ("Enroll failed with error %s\n", error->message);
    }

  fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed,
@@ -118,7 +105,7 @@ on_enroll_progress (FpDevice *device,
      return;
    }

-  if (print && fp_print_get_image (print) &&
+  if (fp_device_supports_capture (device) &&
      print_image_save (print, "enrolled.pgm"))
    printf ("Wrote scanned image to enrolled.pgm\n");

@@ -126,40 +113,6 @@ on_enroll_progress (FpDevice *device,
          fp_device_get_nr_enroll_stages (device));
 }

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

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

-  print_template = print_create_template (dev, enroll_data->finger, enroll_data->update_fingerprint);
-  fp_device_enroll (dev, print_template, enroll_data->cancellable,
-                    on_enroll_progress, NULL, NULL,
-                    (GAsyncReadyCallback) on_enroll_completed,
+  print_template = print_create_template (dev, enroll_data->finger);
+  fp_device_enroll (dev, print_template, NULL, on_enroll_progress, NULL,
+                    NULL, (GAsyncReadyCallback) on_enroll_completed,
                    enroll_data);
 }

-static gboolean
-sigint_cb (void *user_data)
-{
-  EnrollData *enroll_data = user_data;
-
-  g_cancellable_cancel (enroll_data->cancellable);
-
-  return G_SOURCE_CONTINUE;
-}
-
 int
 main (void)
 {
@@ -220,9 +149,11 @@ main (void)
  FpDevice *dev;
  FpFinger finger;

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

  g_print ("Choose the finger to enroll:\n");
  finger = finger_chooser ();
@@ -255,15 +186,8 @@ main (void)
  enroll_data->finger = finger;
  enroll_data->ret_value = EXIT_FAILURE;
  enroll_data->loop = g_main_loop_new (NULL, FALSE);
-  enroll_data->cancellable = g_cancellable_new ();
-  enroll_data->sigint_handler = g_unix_signal_add_full (G_PRIORITY_HIGH,
-                                                        SIGINT,
-                                                        sigint_cb,
-                                                        enroll_data,
-                                                        NULL);

-  fp_device_open (dev, enroll_data->cancellable,
-                  (GAsyncReadyCallback) on_device_opened,
+  fp_device_open (dev, NULL, (GAsyncReadyCallback) on_device_opened,
                  enroll_data);

  g_main_loop_run (enroll_data->loop);
@@ -1,321 +0,0 @@
-/*
- * Example fingerprint verification program, which verifies the
- * finger which has been previously enrolled to disk.
- * Copyright (C) 2020 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
- */
-
-#define FP_COMPONENT "example-identify"
-
-#include <stdio.h>
-#include <libfprint/fprint.h>
-#include <glib-unix.h>
-
-#include "storage.h"
-#include "utilities.h"
-
-typedef struct _IdentifyData
-{
-  GMainLoop    *loop;
-  GCancellable *cancellable;
-  unsigned int  sigint_handler;
-  int           ret_value;
-} IdentifyData;
-
-static void
-identify_data_free (IdentifyData *identify_data)
-{
-  g_clear_handle_id (&identify_data->sigint_handler, g_source_remove);
-  g_clear_object (&identify_data->cancellable);
-  g_main_loop_unref (identify_data->loop);
-  g_free (identify_data);
-}
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (IdentifyData, identify_data_free)
-
-static void
-on_device_closed (FpDevice *dev, GAsyncResult *res, void *user_data)
-{
-  IdentifyData *identify_data = user_data;
-
-  g_autoptr(GError) error = NULL;
-
-  fp_device_close_finish (dev, res, &error);
-
-  if (error)
-    g_warning ("Failed closing device %s", error->message);
-
-  g_main_loop_quit (identify_data->loop);
-}
-
-static void
-identify_quit (FpDevice     *dev,
-               IdentifyData *identify_data)
-{
-  if (!fp_device_is_open (dev))
-    {
-      g_main_loop_quit (identify_data->loop);
-      return;
-    }
-
-  fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed, identify_data);
-}
-
-static void start_identification (FpDevice     *dev,
-                                  IdentifyData *identify_data);
-
-static void
-on_identify_completed (FpDevice *dev, GAsyncResult *res, void *user_data)
-{
-  IdentifyData *identify_data = user_data;
-
-  g_autoptr(FpPrint) print = NULL;
-  g_autoptr(FpPrint) match = NULL;
-  g_autoptr(GError) error = NULL;
-  char buffer[20];
-
-  if (!fp_device_identify_finish (dev, res, &match, &print, &error))
-    {
-      g_warning ("Failed to identify print: %s", error->message);
-      identify_data->ret_value = EXIT_FAILURE;
-
-      if (error->domain != FP_DEVICE_RETRY)
-        {
-          identify_quit (dev, identify_data);
-          return;
-        }
-    }
-
-  g_print ("Identify again? [Y/n]? ");
-  if (fgets (buffer, sizeof (buffer), stdin) &&
-      (buffer[0] == 'Y' || buffer[0] == 'y' || buffer[0] == '\n'))
-    {
-      start_identification (dev, identify_data);
-      return;
-    }
-
-  identify_quit (dev, identify_data);
-}
-
-static FpPrint *
-get_stored_print (FpDevice *dev, FpPrint *print)
-{
-  g_autoptr(GPtrArray) gallery = gallery_data_load (dev);
-  guint index;
-
-  if (g_ptr_array_find_with_equal_func (gallery, print,
-                                        (GEqualFunc) fp_print_equal,
-                                        &index))
-    return g_object_ref (g_ptr_array_index (gallery, index));
-
-  return NULL;
-}
-
-static void
-on_identify_cb (FpDevice *dev, FpPrint *match, FpPrint *print,
-                gpointer user_data, GError *error)
-{
-  IdentifyData *identify_data = user_data;
-
-  if (error)
-    {
-      g_warning ("Identify report: No finger matched, retry error reported: %s",
-                 error->message);
-      return;
-    }
-
-  if (print && fp_print_get_image (print) &&
-      print_image_save (print, "identify.pgm"))
-    g_print ("Print image saved as identify.pgm\n");
-
-  if (match)
-    {
-      g_autoptr(FpPrint) matched_print = g_object_ref (match);
-      const GDate *date;
-      char date_str[128] = {};
-
-      identify_data->ret_value = EXIT_SUCCESS;
-
-      if (fp_print_get_device_stored (match))
-        {
-          FpPrint *stored_print = get_stored_print (dev, match);
-
-          if (stored_print)
-            matched_print = g_steal_pointer (&stored_print);
-        }
-
-      date = fp_print_get_enroll_date (matched_print);
-      if (date && g_date_valid (date))
-        g_date_strftime (date_str, G_N_ELEMENTS (date_str), "%Y-%m-%d\0",
-                         fp_print_get_enroll_date (matched_print));
-      else
-        strcpy (date_str, "<unknown>");
-
-      g_debug ("Identify report: device %s matched finger %s successfully "
-               "with print '%s', enrolled on date %s by user %s",
-               fp_device_get_name (dev),
-               finger_to_string (fp_print_get_finger (matched_print)),
-               fp_print_get_description (matched_print), date_str,
-               fp_print_get_username (matched_print));
-
-      g_print ("IDENTIFIED!\n");
-    }
-  else
-    {
-      g_debug ("Identification report: No finger matched");
-      g_print ("NOT IDENTIFIED!\n");
-    }
-}
-
-static void
-on_list_completed (FpDevice *dev, GAsyncResult *res, gpointer user_data)
-{
-  IdentifyData *identify_data = user_data;
-
-  g_autoptr(GPtrArray) gallery = NULL;
-  g_autoptr(GError) error = NULL;
-
-  gallery = fp_device_list_prints_finish (dev, res, &error);
-
-  if (!error)
-    {
-      if (!gallery->len)
-        {
-          g_warning ("No prints saved on device");
-          identify_quit (dev, identify_data);
-          return;
-        }
-
-      g_debug ("Identifying with %u prints in gallery", gallery->len);
-      fp_device_identify (dev, gallery, identify_data->cancellable,
-                          on_identify_cb, identify_data, NULL,
-                          (GAsyncReadyCallback) on_identify_completed,
-                          identify_data);
-    }
-  else
-    {
-      g_warning ("Loading prints failed with error %s", error->message);
-      identify_quit (dev, identify_data);
-    }
-}
-
-static void
-start_identification (FpDevice *dev, IdentifyData *identify_data)
-{
-  if (fp_device_has_feature (dev, FP_DEVICE_FEATURE_STORAGE))
-    {
-      g_print ("Creating finger template, using device storage...\n");
-      fp_device_list_prints (dev, NULL,
-                             (GAsyncReadyCallback) on_list_completed,
-                             identify_data);
-    }
-  else
-    {
-      g_autoptr(GPtrArray) gallery = gallery_data_load (dev);
-
-      if (!gallery)
-        {
-          identify_quit (dev, identify_data);
-          return;
-        }
-
-      g_print ("Gallery loaded. Time to identify!\n");
-      fp_device_identify (dev, gallery, identify_data->cancellable,
-                          on_identify_cb, identify_data, NULL,
-                          (GAsyncReadyCallback) on_identify_completed,
-                          identify_data);
-    }
-}
-
-static void
-on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
-{
-  IdentifyData *identify_data = user_data;
-
-  g_autoptr(GError) error = NULL;
-
-  if (!fp_device_open_finish (dev, res, &error))
-    {
-      g_warning ("Failed to open device: %s", error->message);
-      identify_quit (dev, identify_data);
-      return;
-    }
-
-  g_print ("Opened device. ");
-
-  start_identification (dev, identify_data);
-}
-
-static gboolean
-sigint_cb (void *user_data)
-{
-  IdentifyData *identify_data = user_data;
-
-  g_cancellable_cancel (identify_data->cancellable);
-
-  return G_SOURCE_CONTINUE;
-}
-
-int
-main (void)
-{
-  g_autoptr(FpContext) ctx = NULL;
-  g_autoptr(IdentifyData) identify_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;
-    }
-
-  if (!fp_device_has_feature (dev, FP_DEVICE_FEATURE_IDENTIFY))
-    {
-      g_warning ("Device %s does not support identification.",
-                 fp_device_get_name (dev));
-      return EXIT_FAILURE;
-    }
-
-  identify_data = g_new0 (IdentifyData, 1);
-  identify_data->ret_value = EXIT_FAILURE;
-  identify_data->loop = g_main_loop_new (NULL, FALSE);
-  identify_data->cancellable = g_cancellable_new ();
-  identify_data->sigint_handler = g_unix_signal_add_full (G_PRIORITY_HIGH,
-                                                          SIGINT,
-                                                          sigint_cb,
-                                                          identify_data,
-                                                          NULL);
-  fp_device_open (dev, identify_data->cancellable,
-                  (GAsyncReadyCallback) on_device_opened,
-                  identify_data);
-
-  g_main_loop_run (identify_data->loop);
-
-  return identify_data->ret_value;
-}
@@ -1,192 +0,0 @@
-/*
- * Example fingerprint verification program, which verifies the
- * finger which has been previously enrolled to disk.
- * Copyright (C) 2007 Daniel Drake <dsd@gentoo.org>
- * Copyright (C) 2019 Marco Trevisan <marco.trevisan@canonical.com>
- * Copyright (C) 2020 Vasily Khoruzhick <anarsoul@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-capture"
-
-#include <stdio.h>
-#include <libfprint/fprint.h>
-#include <glib-unix.h>
-
-#include "storage.h"
-#include "utilities.h"
-
-typedef struct CaptureData
-{
-  GMainLoop    *loop;
-  GCancellable *cancellable;
-  unsigned int  sigint_handler;
-  int           ret_value;
-  const char   *filename;
-} CaptureData;
-
-static void
-capture_data_free (CaptureData *capture_data)
-{
-  g_clear_handle_id (&capture_data->sigint_handler, g_source_remove);
-  g_clear_object (&capture_data->cancellable);
-  g_main_loop_unref (capture_data->loop);
-  g_free (capture_data);
-}
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (CaptureData, capture_data_free)
-
-static void
-on_device_closed (FpDevice *dev, GAsyncResult *res, void *user_data)
-{
-  CaptureData *capture_data = user_data;
-
-  g_autoptr(GError) error = NULL;
-
-  fp_device_close_finish (dev, res, &error);
-
-  if (error)
-    g_warning ("Failed closing device %s", error->message);
-
-  g_main_loop_quit (capture_data->loop);
-}
-
-static void
-capture_quit (FpDevice    *dev,
-              CaptureData *capture_data)
-{
-  if (!fp_device_is_open (dev))
-    {
-      g_main_loop_quit (capture_data->loop);
-      return;
-    }
-
-  fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed, capture_data);
-}
-
-static void
-dev_capture_cb (FpDevice     *dev,
-                GAsyncResult *res,
-                void         *user_data)
-{
-  g_autoptr(GError) error = NULL;
-  CaptureData *capture_data = user_data;
-  FpImage *image = NULL;
-
-  g_clear_object (&capture_data->cancellable);
-
-  image = fp_device_capture_finish (dev, res, &error);
-  if (!image)
-    {
-      g_warning ("Error capturing data: %s", error->message);
-      capture_quit (dev, capture_data);
-      return;
-    }
-
-  save_image_to_pgm (image, capture_data->filename);
-
-  capture_quit (dev, capture_data);
-}
-
-static void
-start_capture (FpDevice *dev, CaptureData *capture_data)
-{
-  fp_device_capture (dev, TRUE, capture_data->cancellable, (GAsyncReadyCallback) dev_capture_cb, capture_data);
-}
-
-static void
-on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
-{
-  CaptureData *capture_data = user_data;
-
-  g_autoptr(GError) error = NULL;
-
-  if (!fp_device_open_finish (dev, res, &error))
-    {
-      g_warning ("Failed to open device: %s", error->message);
-      capture_quit (dev, capture_data);
-      return;
-    }
-
-  g_print ("Opened device. ");
-
-  start_capture (dev, capture_data);
-}
-
-static gboolean
-sigint_cb (void *user_data)
-{
-  CaptureData *capture_data = user_data;
-
-  g_cancellable_cancel (capture_data->cancellable);
-
-  return G_SOURCE_CONTINUE;
-}
-
-int
-main (int argc, const char *argv[])
-{
-  g_autoptr(FpContext) ctx = NULL;
-  g_autoptr(CaptureData) capture_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;
-    }
-
-  if (!fp_device_has_feature (dev, FP_DEVICE_FEATURE_CAPTURE))
-    {
-      g_warning ("Device %s doesn't support capture",
-                 fp_device_get_name (dev));
-      return EXIT_FAILURE;
-    }
-
-  capture_data = g_new0 (CaptureData, 1);
-  capture_data->ret_value = EXIT_FAILURE;
-  capture_data->loop = g_main_loop_new (NULL, FALSE);
-  capture_data->cancellable = g_cancellable_new ();
-  capture_data->sigint_handler = g_unix_signal_add_full (G_PRIORITY_HIGH,
-                                                         SIGINT,
-                                                         sigint_cb,
-                                                         capture_data,
-                                                         NULL);
-  if (argc == 2)
-    capture_data->filename = argv[1];
-  else
-    capture_data->filename = "finger.pgm";
-  fp_device_open (dev, capture_data->cancellable,
-                  (GAsyncReadyCallback) on_device_opened,
-                  capture_data);
-
-  g_main_loop_run (capture_data->loop);
-
-  return capture_data->ret_value;
-}
@@ -18,8 +18,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#define FP_COMPONENT "example-mange-prints"
-
 #include <stdio.h>

 #include <libfprint/fprint.h>
@@ -54,7 +52,7 @@ on_device_closed (FpDevice     *dev,
  fp_device_close_finish (dev, res, &error);

  if (error)
-    g_warning ("Failed closing device %s", error->message);
+    g_warning ("Failed closing device %s\n", error->message);

  g_main_loop_quit (list_data->loop);
 }
@@ -86,7 +84,7 @@ delete_next_print (FpDevice *dev,
  g_assert_nonnull (list_data->to_delete);
  print = list_data->to_delete->data;

-  g_debug ("Deleting print %s", fp_print_get_description (print));
+  g_debug ("Deleting print %s\n", fp_print_get_description (print));
  fp_device_delete_print (dev, print, NULL,
                          (GAsyncReadyCallback) on_print_deleted, list_data);
 }
@@ -161,7 +159,7 @@ on_list_completed (FpDevice     *dev,
                   finger_to_string (fp_print_get_finger (print)),
                   fp_print_get_username (print));

-          if (date && g_date_valid (date))
+          if (date)
            {
              g_date_strftime (buf, G_N_ELEMENTS (buf), "%Y-%m-%d\0", date);
              g_print (", enrolled on %s", buf);
@@ -231,7 +229,7 @@ on_device_opened (FpDevice     *dev,
      return;
    }

-  if (!fp_device_has_feature (dev, FP_DEVICE_FEATURE_STORAGE))
+  if (!fp_device_has_storage (dev))
    {
      g_warning ("Device %s doesn't support storage", fp_device_get_name (dev));
      g_main_loop_quit (list_data->loop);
@@ -1,13 +1,5 @@

-examples = [
-    'enroll',
-    'identify',
-    'img-capture',
-    'manage-prints',
-    'verify',
-    'clear-storage',
-]
-
+examples = [ 'enroll', 'verify', 'manage-prints' ]
 foreach example: examples
    executable(example,
        [ example + '.c', 'storage.c', 'utilities.c' ],
@@ -22,8 +14,3 @@ executable('cpp-test',
    'cpp-test.cpp',
    dependencies: libfprint_dep,
 )
-
-if installed_tests
-    install_subdir('prints',
-        install_dir: installed_tests_testdir)
-endif
@@ -2,7 +2,7 @@
 * Trivial storage driver for example programs
 *
 * Copyright (C) 2019 Benjamin Berg <bberg@redhat.com>
- * Copyright (C) 2019-2020 Marco Trevisan <marco.trevisan@canonical.com>
+ * Copyright (C) 2019 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
@@ -19,14 +19,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#define FP_COMPONENT "example-storage"
-
 #include <libfprint/fprint.h>
-#include <libfprint/fpi-compat.h>
 #include "storage.h"

 #include <errno.h>
-#include <glib/gstdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -56,24 +52,12 @@ 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)
 {
  GVariantDict *res;
  GVariant *var;
-  gchar *contents = NULL;
+  g_autofree gchar *contents = NULL;
  gsize length = 0;

  if (!g_file_get_contents (STORAGE_FILE, &contents, &length, NULL))
@@ -82,12 +66,7 @@ load_data (void)
      return g_variant_dict_new (NULL);
    }

-  var = g_variant_new_from_data (G_VARIANT_TYPE_VARDICT,
-                                 contents,
-                                 length,
-                                 FALSE,
-                                 g_free,
-                                 contents);
+  var = g_variant_new_from_data (G_VARIANT_TYPE_VARDICT, contents, length, FALSE, NULL, NULL);

  res = g_variant_dict_new (var);
  g_variant_unref (var);
@@ -115,23 +94,8 @@ save_data (GVariant *data)
  return 0;
 }

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

@@ -165,142 +129,51 @@ print_data_load (FpDevice *dev, FpFinger finger)

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

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

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

  return NULL;
 }

-GPtrArray *
-gallery_data_load (FpDevice *dev)
-{
-  g_autoptr(GVariantDict) dict = NULL;
-  g_autoptr(GVariant) dict_variant = NULL;
-  g_autofree char *dev_prefix = NULL;
-  GPtrArray *gallery;
-  GVariantIter iter;
-  GVariant *value;
-  gchar *key;
-
-  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);
-
-  g_variant_iter_init (&iter, dict_variant);
-  while (g_variant_iter_loop (&iter, "{sv}", &key, &value))
-    {
-      FpPrint *print;
-      const guchar *stored_data;
-      g_autoptr(GError) error = NULL;
-      gsize stored_len;
-
-      if (!g_str_has_prefix (key, dev_prefix))
-        continue;
-
-      stored_data = (const guchar *) g_variant_get_fixed_array (value, &stored_len, 1);
-      print = fp_print_deserialize (stored_data, stored_len, &error);
-
-      if (error)
-        {
-          g_warning ("Error deserializing data: %s", error->message);
-          continue;
-        }
-
-      g_ptr_array_add (gallery, print);
-    }
-
-  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)
+print_create_template (FpDevice *dev, FpFinger finger)
 {
-  g_autoptr(GVariantDict) dict = NULL;
  g_autoptr(GDateTime) datetime = NULL;
-  g_autoptr(GDate) date = NULL;
-  g_autoptr(GVariant) existing_val = NULL;
-  g_autofree gchar *descr = get_print_data_descriptor (NULL, dev, finger);
  FpPrint *template = NULL;
+  GDate *date = NULL;
  gint year, month, day;

-  if (load_existing)
-    {
-      dict = load_data ();
-      existing_val = g_variant_dict_lookup_value (dict, descr, G_VARIANT_TYPE ("ay"));
-      if (existing_val != NULL)
-        template = load_print_from_data (existing_val);
-    }
-  if (template == NULL)
-    {
-      template = fp_print_new (dev);
-      fp_print_set_finger (template, finger);
-      fp_print_set_username (template, g_get_user_name ());
-    }
-
+  template = fp_print_new (dev);
+  fp_print_set_finger (template, finger);
+  fp_print_set_username (template, g_get_user_name ());
  datetime = g_date_time_new_now_local ();
  g_date_time_get_ymd (datetime, &year, &month, &day);
  date = g_date_new_dmy (day, month, year);
  fp_print_set_enroll_date (template, date);
+  g_date_free (date);

  return template;
 }


-gboolean
+static gboolean
 save_image_to_pgm (FpImage *img, const char *path)
 {
  FILE *fd = fopen (path, "w");
@@ -340,7 +213,7 @@ save_image_to_pgm (FpImage *img, const char *path)
 gboolean
 print_image_save (FpPrint *print, const char *path)
 {
-  FpImage *img = NULL;
+  g_autoptr(FpImage) img = NULL;

  g_return_val_if_fail (FP_IS_PRINT (print), FALSE);
  g_return_val_if_fail (path != NULL, FALSE);
@@ -18,23 +18,17 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __STORAGE_H
+#define __STORAGE_H

-#include <glib.h>
-#include <libfprint/fprint.h>

 int print_data_save (FpPrint *print,
-                     FpFinger finger,
-                     gboolean update_fingerprint);
+                     FpFinger finger);
 FpPrint * print_data_load (FpDevice *dev,
                           FpFinger  finger);
-GPtrArray * gallery_data_load (FpDevice *dev);
-gboolean clear_saved_prints (FpDevice *dev,
-                             GError  **error);
-FpPrint * print_create_template (FpDevice      *dev,
-                                 FpFinger       finger,
-                                 const gboolean load_existing);
+FpPrint * print_create_template (FpDevice *dev,
+                                 FpFinger  finger);
 gboolean print_image_save (FpPrint    *print,
                           const char *path);
-gboolean save_image_to_pgm (FpImage    *img,
-                            const char *path);
+
+#endif /* __STORAGE_H */
@@ -18,8 +18,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#define FP_COMPONENT "example-utilities"
-
 #include <libfprint/fprint.h>
 #include <stdio.h>

@@ -101,7 +99,6 @@ finger_to_string (FpFinger finger)
    case FP_FINGER_RIGHT_LITTLE:
      return "right little";

-    case FP_FINGER_UNKNOWN:
    default:
      return "unknown";
    }
@@ -110,19 +107,29 @@ finger_to_string (FpFinger finger)
 FpFinger
 finger_chooser (void)
 {
-  int i = FP_FINGER_UNKNOWN;
+  int i;
+  const FpFinger all_fingers[] = {
+    FP_FINGER_LEFT_THUMB,
+    FP_FINGER_LEFT_INDEX,
+    FP_FINGER_LEFT_MIDDLE,
+    FP_FINGER_LEFT_RING,
+    FP_FINGER_LEFT_LITTLE,
+    FP_FINGER_RIGHT_THUMB,
+    FP_FINGER_RIGHT_INDEX,
+    FP_FINGER_RIGHT_MIDDLE,
+    FP_FINGER_RIGHT_RING,
+    FP_FINGER_RIGHT_LITTLE,
+  };

-  for (i = FP_FINGER_FIRST; i <= FP_FINGER_LAST; ++i)
-    g_print ("  [%d] %s\n", (i - FP_FINGER_FIRST), finger_to_string (i));
+  for (i = all_fingers[0]; i <= G_N_ELEMENTS (all_fingers); ++i)
+    g_print ("  [%d] %s\n", (i - all_fingers[0]), finger_to_string (i));

  g_print ("> ");
  if (!scanf ("%d%*c", &i))
    return FP_FINGER_UNKNOWN;

-  i += FP_FINGER_FIRST;
-
-  if (i < FP_FINGER_FIRST || i > FP_FINGER_LAST)
+  if (i < 0 || i >= G_N_ELEMENTS (all_fingers))
    return FP_FINGER_UNKNOWN;

-  return i;
+  return all_fingers[i];
 }
@@ -18,8 +18,11 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __UTILITIES_H
+#define __UTILITIES_H

 FpDevice * discover_device (GPtrArray *devices);
 FpFinger finger_chooser (void);
 const char * finger_to_string (FpFinger finger);
+
+#endif /* __UTILITIES_H */
@@ -19,29 +19,22 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#define FP_COMPONENT "example-verify"
-
 #include <stdio.h>
 #include <libfprint/fprint.h>
-#include <glib-unix.h>

 #include "storage.h"
 #include "utilities.h"

 typedef struct _VerifyData
 {
-  GMainLoop    *loop;
-  GCancellable *cancellable;
-  unsigned int  sigint_handler;
-  FpFinger      finger;
-  int           ret_value;
+  GMainLoop *loop;
+  FpFinger   finger;
+  int        ret_value;
 } VerifyData;

 static void
 verify_data_free (VerifyData *verify_data)
 {
-  g_clear_handle_id (&verify_data->sigint_handler, g_source_remove);
-  g_clear_object (&verify_data->cancellable);
  g_main_loop_unref (verify_data->loop);
  g_free (verify_data);
 }
@@ -57,24 +50,11 @@ on_device_closed (FpDevice *dev, GAsyncResult *res, void *user_data)
  fp_device_close_finish (dev, res, &error);

  if (error)
-    g_warning ("Failed closing device %s", error->message);
+    g_warning ("Failed closing device %s\n", error->message);

  g_main_loop_quit (verify_data->loop);
 }

-static void
-verify_quit (FpDevice   *dev,
-             VerifyData *verify_data)
-{
-  if (!fp_device_is_open (dev))
-    {
-      g_main_loop_quit (verify_data->loop);
-      return;
-    }
-
-  fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed, verify_data);
-}
-
 static void start_verification (FpDevice   *dev,
                                VerifyData *verify_data);

@@ -91,87 +71,35 @@ on_verify_completed (FpDevice *dev, GAsyncResult *res, void *user_data)
  if (!fp_device_verify_finish (dev, res, &match, &print, &error))
    {
      g_warning ("Failed to verify print: %s", error->message);
-      verify_data->ret_value = EXIT_FAILURE;
+      g_main_loop_quit (verify_data->loop);
+      return;
+    }

-      if (error->domain != FP_DEVICE_RETRY)
-        {
-          verify_quit (dev, verify_data);
-          return;
-        }
+  if (match)
+    {
+      g_print ("MATCH!\n");
+      if (fp_device_supports_capture (dev) &&
+          print_image_save (print, "verify.pgm"))
+        g_print ("Print image saved as verify.pgm");
+
+      verify_data->ret_value = EXIT_SUCCESS;
+    }
+  else
+    {
+      g_print ("NO MATCH!\n");
+      verify_data->ret_value = EXIT_FAILURE;
    }

  g_print ("Verify again? [Y/n]? ");
  if (fgets (buffer, sizeof (buffer), stdin) &&
-      (buffer[0] == 'Y' || buffer[0] == 'y' || buffer[0] == '\n'))
+      (buffer[0] == 'Y' || buffer[0] == 'y'))
    {
      start_verification (dev, verify_data);
      return;
    }

-  verify_quit (dev, verify_data);
-}
-
-static void
-on_match_cb (FpDevice *dev, FpPrint *match, FpPrint *print,
-             gpointer user_data, GError *error)
-{
-  VerifyData *verify_data = user_data;
-
-  if (error)
-    {
-      g_warning ("Match report: Finger not matched, retry error reported: %s",
-                 error->message);
-      return;
-    }
-
-  if (print && fp_print_get_image (print) &&
-      print_image_save (print, "verify.pgm"))
-    g_print ("Print image saved as verify.pgm\n");
-
-  if (match)
-    {
-      const GDate *date = fp_print_get_enroll_date (match);
-      char date_str[128] = "<unknown>";
-
-      verify_data->ret_value = EXIT_SUCCESS;
-
-      if (date && g_date_valid (date))
-        g_date_strftime (date_str, G_N_ELEMENTS (date_str), "%Y-%m-%d\0",
-                         fp_print_get_enroll_date (match));
-      g_debug ("Match report: device %s matched finger %s successifully "
-               "with print %s, enrolled on date %s by user %s",
-               fp_device_get_name (dev),
-               finger_to_string (fp_print_get_finger (match)),
-               fp_print_get_description (match), date_str,
-               fp_print_get_username (match));
-
-      g_print ("MATCH!\n");
-    }
-  else
-    {
-      g_debug ("Match report: Finger not matched");
-      g_print ("NO MATCH!\n");
-    }
-}
-
-static FpPrint *
-get_stored_print (FpDevice *dev, VerifyData *verify_data)
-{
-  FpPrint *verify_print;
-
-  g_print ("Loading previously enrolled %s finger data...\n",
-           finger_to_string (verify_data->finger));
-
-  verify_print = print_data_load (dev, verify_data->finger);
-
-  if (!verify_print)
-    {
-      g_warning ("Failed to load fingerprint data");
-      g_warning ("Did you remember to enroll your %s finger first?",
-                 finger_to_string (verify_data->finger));
-    }
-
-  return verify_print;
+  fp_device_close (dev, NULL, (GAsyncReadyCallback) on_device_closed,
+                   verify_data);
 }

 static void
@@ -187,27 +115,15 @@ on_list_completed (FpDevice *dev, GAsyncResult *res, gpointer user_data)
  if (!error)
    {
      FpPrint *verify_print = NULL;
-      g_autoptr(FpPrint) stored_print = NULL;
      guint i;

      if (!prints->len)
-        {
-          g_warning ("No prints saved on device");
-          verify_quit (dev, verify_data);
-          return;
-        }
-
-      stored_print = get_stored_print (dev, verify_data);
+        g_warning ("No prints saved on device");

      for (i = 0; i < prints->len; ++i)
        {
          FpPrint *print = prints->pdata[i];

-          if (stored_print && fp_print_equal (stored_print, print))
-            /* If the private print data matches, let's use the stored print
-             * as it contains more metadata to show */
-            print = stored_print;
-
          if (fp_print_get_finger (print) == verify_data->finger &&
              g_strcmp0 (fp_print_get_username (print), g_get_user_name ()) == 0)
            {
@@ -225,7 +141,9 @@ on_list_completed (FpDevice *dev, GAsyncResult *res, gpointer user_data)

      if (!verify_print)
        {
-          verify_quit (dev, verify_data);
+          g_warning ("Did you remember to enroll your %s finger first?",
+                     finger_to_string (verify_data->finger));
+          g_main_loop_quit (verify_data->loop);
          return;
        }

@@ -233,36 +151,32 @@ on_list_completed (FpDevice *dev, GAsyncResult *res, gpointer user_data)
               fp_print_get_description (verify_print));

      g_print ("Print loaded. Time to verify!\n");
-      fp_device_verify (dev, verify_print, verify_data->cancellable,
-                        on_match_cb, verify_data, NULL,
+      fp_device_verify (dev, verify_print, NULL,
                        (GAsyncReadyCallback) on_verify_completed,
                        verify_data);
    }
  else
    {
      g_warning ("Loading prints failed with error %s", error->message);
-      verify_quit (dev, verify_data);
+      g_main_loop_quit (verify_data->loop);
    }
 }

 static void
 start_verification (FpDevice *dev, VerifyData *verify_data)
 {
-  if (verify_data->finger == FP_FINGER_UNKNOWN)
-    {
-      g_print ("Choose the finger to verify:\n");
-      verify_data->finger = finger_chooser ();
-    }
+  g_print ("Choose the finger to verify:\n");
+  verify_data->finger = finger_chooser ();

  if (verify_data->finger == FP_FINGER_UNKNOWN)
    {
      g_warning ("Unknown finger selected");
      verify_data->ret_value = EXIT_FAILURE;
-      verify_quit (dev, verify_data);
+      g_main_loop_quit (verify_data->loop);
      return;
    }

-  if (fp_device_has_feature (dev, FP_DEVICE_FEATURE_STORAGE))
+  if (fp_device_has_storage (dev))
    {
      g_print ("Creating finger template, using device storage...\n");
      fp_device_list_prints (dev, NULL,
@@ -271,17 +185,23 @@ start_verification (FpDevice *dev, VerifyData *verify_data)
    }
  else
    {
-      g_autoptr(FpPrint) verify_print = get_stored_print (dev, verify_data);
+      g_print ("Loading previously enrolled %s finger data...\n",
+               finger_to_string (verify_data->finger));
+      g_autoptr(FpPrint) verify_print = NULL;
+
+      verify_print = print_data_load (dev, verify_data->finger);

      if (!verify_print)
        {
-          verify_quit (dev, verify_data);
+          g_warning ("Failed to load fingerprint data");
+          g_warning ("Did you remember to enroll your %s finger first?",
+                     finger_to_string (verify_data->finger));
+          g_main_loop_quit (verify_data->loop);
          return;
        }

      g_print ("Print loaded. Time to verify!\n");
-      fp_device_verify (dev, verify_print, verify_data->cancellable,
-                        on_match_cb, verify_data, NULL,
+      fp_device_verify (dev, verify_print, NULL,
                        (GAsyncReadyCallback) on_verify_completed,
                        verify_data);
    }
@@ -297,7 +217,7 @@ on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
  if (!fp_device_open_finish (dev, res, &error))
    {
      g_warning ("Failed to open device: %s", error->message);
-      verify_quit (dev, verify_data);
+      g_main_loop_quit (verify_data->loop);
      return;
    }

@@ -306,16 +226,6 @@ on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
  start_verification (dev, verify_data);
 }

-static gboolean
-sigint_cb (void *user_data)
-{
-  VerifyData *verify_data = user_data;
-
-  g_cancellable_cancel (verify_data->cancellable);
-
-  return G_SOURCE_CONTINUE;
-}
-
 int
 main (void)
 {
@@ -346,14 +256,8 @@ main (void)
  verify_data = g_new0 (VerifyData, 1);
  verify_data->ret_value = EXIT_FAILURE;
  verify_data->loop = g_main_loop_new (NULL, FALSE);
-  verify_data->cancellable = g_cancellable_new ();
-  verify_data->sigint_handler = g_unix_signal_add_full (G_PRIORITY_HIGH,
-                                                        SIGINT,
-                                                        sigint_cb,
-                                                        verify_data,
-                                                        NULL);
-  fp_device_open (dev, verify_data->cancellable,
-                  (GAsyncReadyCallback) on_device_opened,
+
+  fp_device_open (dev, NULL, (GAsyncReadyCallback) on_device_opened,
                  verify_data);

  g_main_loop_run (verify_data->loop);
@@ -1 +0,0 @@
-gcov-ignore-parse-errors = suspicious_hits.warn
@@ -135,8 +135,10 @@ generic_read_ignore_data (FpiSsm *ssm, FpDevice *dev,
                          size_t bytes)
 {
  FpiUsbTransfer *transfer = fpi_usb_transfer_new (dev);
+  unsigned char *data;

-  fpi_usb_transfer_fill_bulk (transfer, EP_IN, bytes);
+  data = g_malloc (bytes);
+  fpi_usb_transfer_fill_bulk_full (transfer, EP_IN, data, bytes, NULL);
  transfer->ssm = ssm;
  transfer->short_is_error = TRUE;
  fpi_usb_transfer_submit (transfer, BULK_TIMEOUT, NULL,
@@ -612,7 +614,6 @@ capture_read_strip_cb (FpiUsbTransfer *transfer, FpDevice *device,
      self->strips = g_slist_reverse (self->strips);
      fpi_do_movement_estimation (&assembling_ctx, self->strips);
      img = fpi_assemble_frames (&assembling_ctx, self->strips);
-      img->flags |= FPI_IMAGE_PARTIAL;

      g_slist_free_full (self->strips, g_free);
      self->strips = NULL;
@@ -18,12 +18,11 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __AES1660_H
+#define __AES1660_H

 #define AES1660_FRAME_SIZE 0x244

-/* *INDENT-OFF* */
-
 /* First init sequence, 0x07 cmd returns following before INIT1:
 * { 0x07, 0x05, 0x00, 0x8f, 0x16, 0x25, 0x01, 0x00  }
 */
@@ -1987,3 +1986,5 @@ static const unsigned char aes1660_start_imaging_cmd[] = {
  0x55, 0x07, 0x00, 0x80, 0x42, 0x00, 0x7f, 0x00, 0x00, 0x14,
  0x49, 0x03, 0x00, 0x20, 0x00, 0xc8
 };
+
+#endif
@@ -458,7 +458,6 @@ capture_read_strip_cb (FpiUsbTransfer *transfer, FpDevice *_dev,
          fpi_do_movement_estimation (&assembling_ctx, self->strips);
          img = fpi_assemble_frames (&assembling_ctx,
                                     self->strips);
-          img->flags |= FPI_IMAGE_PARTIAL;
          g_slist_free_full (self->strips, g_free);
          self->strips = NULL;
          self->strips_len = 0;
@@ -19,7 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __AES2501_H
+#define __AES2501_H

 enum aes2501_regs {
  AES2501_REG_CTRL1 = 0x80,
@@ -171,3 +172,5 @@ enum aes2501_sensor_gain2 {

 #define AES2501_SUM_HIGH_THRESH 1000
 #define AES2501_SUM_LOW_THRESH 700
+
+#endif  /* __AES2501_H */
@@ -197,12 +197,12 @@ process_strip_data (FpiSsm *ssm, FpImageDevice *dev,

  if (data[0] != AES2550_EDATA_MAGIC)
    {
-      fp_dbg ("Bogus magic: %.2x", (int) (data[0]));
+      fp_dbg ("Bogus magic: %.2x\n", (int) (data[0]));
      return FALSE;
    }
  len = data[1] * 256 + data[2];
  if (len != (AES2550_STRIP_SIZE - 3))
-    fp_dbg ("Bogus frame len: %.4x", len);
+    fp_dbg ("Bogus frame len: %.4x\n", len);
  stripe = g_malloc0 (FRAME_WIDTH * FRAME_HEIGHT / 2 + sizeof (struct fpi_frame));     /* 4 bits per pixel */
  stripe->delta_x = (int8_t) data[6];
  stripe->delta_y = -(int8_t) data[7];
@@ -230,7 +230,6 @@ capture_set_idle_reqs_cb (FpiUsbTransfer *transfer,

      self->strips = g_slist_reverse (self->strips);
      img = fpi_assemble_frames (&assembling_ctx, self->strips);
-      img->flags |= FPI_IMAGE_PARTIAL;
      g_slist_free_full (self->strips, g_free);
      self->strips = NULL;
      self->strips_len = 0;
@@ -17,7 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __AES2550_H
+#define __AES2550_H

 /* Registers bits */

@@ -109,3 +110,5 @@ enum aes2550_cmds {
 #define AES2550_HEARTBEAT_MAGIC 0xdb

 #define AES2550_EP_IN_BUF_SIZE 8192
+
+#endif
@@ -17,12 +17,11 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __AES2660_H
+#define __AES2660_H

 #define AES2660_FRAME_SIZE 0x354

-/* *INDENT-OFF* */
-
 /* First init sequence, 0x07 cmd returns following before INIT1:
 * { 0x07, 0x05, 0x00, 0x91, 0x26, 0x21, 0x00, 0x00  }
 */
@@ -1961,3 +1960,5 @@ static const unsigned char aes2660_start_imaging_cmd[] = {
  0x55, 0x07, 0x00, 0x80, 0x42, 0x00, 0xbf, 0x00, 0x00, 0x18,
  0x49, 0x03, 0x00, 0x20, 0x08, 0xc8
 };
+
+#endif
@@ -106,9 +106,7 @@ static struct aes_regwrite init_reqs[] = {
  { 0x9e, 0x53 },       /* clear challenge word bits */
  { 0x9f, 0x6b },       /* set some challenge word bits */
  { 0, 0 },
-};

-static struct aes_regwrite capture_reqs[] = {
  { 0x80, 0x00 },
  { 0x81, 0x00 },
  { 0, 0 },
@@ -157,6 +155,4 @@ fpi_device_aes3500_class_init (FpiDeviceAes3500Class *klass)
  aes_class->enlarge_factor = ENLARGE_FACTOR;
  aes_class->init_reqs = init_reqs;
  aes_class->init_reqs_len = G_N_ELEMENTS (init_reqs);
-  aes_class->capture_reqs = capture_reqs;
-  aes_class->capture_reqs_len = G_N_ELEMENTS (capture_reqs);
 }
@@ -42,10 +42,8 @@

 typedef struct
 {
-  /* This is used both as a flag that we are in a capture operation
-   * and for cancellation.
-   */
-  GCancellable *img_capture_cancel;
+  FpiUsbTransfer *img_trf;
+  gboolean        deactivating;
 } FpiDeviceAes3kPrivate;

 #define CTRL_TIMEOUT 1000
@@ -86,8 +84,7 @@ img_cb (FpiUsbTransfer *transfer, FpDevice *device,
  FpImage *img;
  int i;

-  /* Image capture operation is finished (error/completed) */
-  g_clear_object (&priv->img_capture_cancel);
+  priv->img_trf = NULL;

  if (error)
    {
@@ -95,14 +92,14 @@ img_cb (FpiUsbTransfer *transfer, FpDevice *device,
                           G_IO_ERROR,
                           G_IO_ERROR_CANCELLED))
        {
-          /* Cancellation implies we are deactivating. */
+          /* Deactivation was completed. */
          g_error_free (error);
-          fpi_image_device_deactivate_complete (dev, NULL);
+          if (priv->deactivating)
+            fpi_image_device_deactivate_complete (dev, NULL);
          return;
        }

      fpi_image_device_session_error (dev, error);
-      return;
    }

  fpi_image_device_report_finger_status (dev, TRUE);
@@ -126,69 +123,43 @@ img_cb (FpiUsbTransfer *transfer, FpDevice *device,
  fpi_image_device_image_captured (dev, img);

  /* FIXME: rather than assuming finger has gone, we should poll regs until
-   * it really has. */
+   * it really has, then restart the capture */
  fpi_image_device_report_finger_status (dev, FALSE);

-  /* Note: The transfer is re-started when we switch to the AWAIT_FINGER_ON state. */
+  do_capture (dev);
 }

 static void
 do_capture (FpImageDevice *dev)
 {
-  g_autoptr(FpiUsbTransfer) img_trf = NULL;
  FpiDeviceAes3k *self = FPI_DEVICE_AES3K (dev);
  FpiDeviceAes3kPrivate *priv = fpi_device_aes3k_get_instance_private (self);
  FpiDeviceAes3kClass *cls = FPI_DEVICE_AES3K_GET_CLASS (self);

-  img_trf = fpi_usb_transfer_new (FP_DEVICE (dev));
-  fpi_usb_transfer_fill_bulk (img_trf, EP_IN, cls->data_buflen);
-  img_trf->short_is_error = TRUE;
-  fpi_usb_transfer_submit (g_steal_pointer (&img_trf), 0,
-                           priv->img_capture_cancel,
+  priv->img_trf = fpi_usb_transfer_new (FP_DEVICE (dev));
+  fpi_usb_transfer_fill_bulk (priv->img_trf, EP_IN, cls->data_buflen);
+  priv->img_trf->short_is_error = TRUE;
+  fpi_usb_transfer_submit (priv->img_trf, 0,
+                           fpi_device_get_cancellable (FP_DEVICE (dev)),
                           img_cb, NULL);
 }

-static void
-capture_reqs_cb (FpImageDevice *dev, GError *result, void *user_data)
-{
-  FpiDeviceAes3k *self = FPI_DEVICE_AES3K (dev);
-  FpiDeviceAes3kPrivate *priv = fpi_device_aes3k_get_instance_private (self);
-
-  if (result)
-    {
-      g_clear_object (&priv->img_capture_cancel);
-      fpi_image_device_session_error (dev, result);
-      return;
-    }
-
-  /* FIXME: we never cancel a pending capture. So we are likely leaving the
-   * hardware in a bad state should we abort the capture operation and the
-   * user does not touch the device.
-   * But, we don't know how we might cancel, so just leave it as is. */
-  do_capture (dev);
-}
-
-static void
-do_capture_start (FpImageDevice *dev)
-{
-  FpiDeviceAes3k *self = FPI_DEVICE_AES3K (dev);
-  FpiDeviceAes3kClass *cls = FPI_DEVICE_AES3K_GET_CLASS (self);
-
-  aes_write_regv (dev, cls->capture_reqs, cls->capture_reqs_len, capture_reqs_cb, NULL);
-}
-
 static void
 init_reqs_cb (FpImageDevice *dev, GError *result, void *user_data)
 {
  fpi_image_device_activate_complete (dev, result);
+  if (!result)
+    do_capture (dev);
 }

 static void
 aes3k_dev_activate (FpImageDevice *dev)
 {
  FpiDeviceAes3k *self = FPI_DEVICE_AES3K (dev);
+  FpiDeviceAes3kPrivate *priv = fpi_device_aes3k_get_instance_private (self);
  FpiDeviceAes3kClass *cls = FPI_DEVICE_AES3K_GET_CLASS (self);

+  priv->deactivating = FALSE;
  aes_write_regv (dev, cls->init_reqs, cls->init_reqs_len, init_reqs_cb, NULL);
 }

@@ -198,26 +169,10 @@ aes3k_dev_deactivate (FpImageDevice *dev)
  FpiDeviceAes3k *self = FPI_DEVICE_AES3K (dev);
  FpiDeviceAes3kPrivate *priv = fpi_device_aes3k_get_instance_private (self);

-  /* If a capture is running, then deactivation finishes from the cancellation handler */
-  if (priv->img_capture_cancel)
-    g_cancellable_cancel (priv->img_capture_cancel);
-  else
-    fpi_image_device_deactivate_complete (dev, NULL);
-}
-
-static void
-aes3k_dev_change_state (FpImageDevice *dev, FpiImageDeviceState state)
-{
-  FpiDeviceAes3k *self = FPI_DEVICE_AES3K (dev);
-  FpiDeviceAes3kPrivate *priv = fpi_device_aes3k_get_instance_private (self);
-
-  if (state == FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON)
-    {
-      g_assert (!priv->img_capture_cancel);
-      priv->img_capture_cancel = g_cancellable_new ();
-
-      do_capture_start (dev);
-    }
+  priv->deactivating = TRUE;
+  if (priv->img_trf)
+    return;
+  fpi_image_device_deactivate_complete (dev, NULL);
 }

 static void
@@ -262,7 +217,6 @@ fpi_device_aes3k_class_init (FpiDeviceAes3kClass *klass)
  img_class->img_open = aes3k_dev_init;
  img_class->img_close = aes3k_dev_deinit;
  img_class->activate = aes3k_dev_activate;
-  img_class->change_state = aes3k_dev_change_state;
  img_class->deactivate = aes3k_dev_deactivate;

  /* Extremely low due to low image quality. */
@@ -57,6 +57,4 @@ struct _FpiDeviceAes3kClass
  gsize                data_buflen;    /* buffer length of usb bulk transfer */
  struct aes_regwrite *init_reqs;       /* initial values sent to device */
  gsize                init_reqs_len;
-  struct aes_regwrite *capture_reqs;       /* capture values sent to device */
-  gsize                capture_reqs_len;
 };
@@ -103,9 +103,7 @@ static struct aes_regwrite init_reqs[] = {
  { 0x9e, 0x53 },       /* clear challenge word bits */
  { 0x9f, 0x6b },       /* set some challenge word bits */
  { 0, 0 },
-};

-static struct aes_regwrite capture_reqs[] = {
  { 0x80, 0x00 },
  { 0x81, 0x00 },
  { 0, 0 },
@@ -124,7 +122,7 @@ G_DEFINE_TYPE (FpiDeviceAes4000, fpi_device_aes4000, FPI_TYPE_DEVICE_AES3K);


 static const FpIdEntry id_table[] = {
-  { .vid = 0x08ff, .pid = 0x5501 },
+  { .pid = 0x08ff, .vid = 0x5501 },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },
 };

@@ -154,6 +152,4 @@ fpi_device_aes4000_class_init (FpiDeviceAes4000Class *klass)
  aes_class->enlarge_factor = ENLARGE_FACTOR;
  aes_class->init_reqs = init_reqs;
  aes_class->init_reqs_len = G_N_ELEMENTS (init_reqs);
-  aes_class->capture_reqs = capture_reqs;
-  aes_class->capture_reqs_len = G_N_ELEMENTS (capture_reqs);
 }
@@ -19,11 +19,13 @@

 #define FP_COMPONENT "aeslib"

-#include "drivers_api.h"
+#include "fp_internal.h"

 #include <errno.h>
 #include <string.h>

+#include "fpi-usb-transfer.h"
+#include "fpi-assembling.h"
 #include "aeslib.h"

 #define MAX_REGWRITES_PER_REQUEST 16
@@ -17,7 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __AESLIB_H__
+#define __AESLIB_H__

 #include <fprint.h>

@@ -44,3 +45,5 @@ unsigned char aes_get_pixel (struct fpi_frame_asmbl_ctx *ctx,
                             struct fpi_frame           *frame,
                             unsigned int                x,
                             unsigned int                y);
+
+#endif
@@ -54,7 +54,6 @@ static void complete_deactivation (FpImageDevice *dev);
 #define CALIBRATE_DATA_LEN 4
 #define FINGER_DET_DATA_LEN 4

-FP_GNUC_ACCESS (read_only, 3, 4)
 static void
 aesX660_send_cmd_timeout (FpiSsm                *ssm,
                          FpDevice              *_dev,
@@ -71,7 +70,6 @@ aesX660_send_cmd_timeout (FpiSsm                *ssm,
  fpi_usb_transfer_submit (transfer, timeout, NULL, callback, NULL);
 }

-FP_GNUC_ACCESS (read_only, 3, 4)
 static void
 aesX660_send_cmd (FpiSsm                *ssm,
                  FpDevice              *dev,
@@ -91,12 +89,13 @@ aesX660_read_response (FpiSsm                *ssm,
                       FpiUsbTransferCallback callback)
 {
  FpiUsbTransfer *transfer = fpi_usb_transfer_new (_dev);
+  unsigned char *data;
  GCancellable *cancel = NULL;

  if (cancellable)
    cancel = fpi_device_get_cancellable (_dev);
-
-  fpi_usb_transfer_fill_bulk (transfer, EP_IN, buf_len);
+  data = g_malloc (buf_len);
+  fpi_usb_transfer_fill_bulk_full (transfer, EP_IN, data, buf_len, NULL);
  transfer->ssm = ssm;
  transfer->short_is_error = short_is_error;
  fpi_usb_transfer_submit (transfer, BULK_TIMEOUT, cancel, callback, NULL);
@@ -117,7 +116,7 @@ aesX660_read_calibrate_data_cb (FpiUsbTransfer *transfer,
  /* Calibrate response was read correctly? */
  if (data[AESX660_RESPONSE_TYPE_OFFSET] != AESX660_CALIBRATE_RESPONSE)
    {
-      fp_dbg ("Bogus calibrate response: %.2x", data[0]);
+      fp_dbg ("Bogus calibrate response: %.2x\n", data[0]);
      fpi_ssm_mark_failed (transfer->ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
                                                     "Bogus calibrate "
@@ -156,14 +155,14 @@ finger_det_read_fd_data_cb (FpiUsbTransfer *transfer,

  if (error)
    {
-      fp_dbg ("Failed to read FD data");
+      fp_dbg ("Failed to read FD data\n");
      fpi_ssm_mark_failed (transfer->ssm, error);
      return;
    }

  if (data[AESX660_RESPONSE_TYPE_OFFSET] != AESX660_FINGER_DET_RESPONSE)
    {
-      fp_dbg ("Bogus FD response: %.2x", data[0]);
+      fp_dbg ("Bogus FD response: %.2x\n", data[0]);
      fpi_ssm_mark_failed (transfer->ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
                                                     "Bogus FD response %.2x",
@@ -178,7 +177,7 @@ finger_det_read_fd_data_cb (FpiUsbTransfer *transfer,
    }
  else
    {
-      fp_dbg ("Wait for finger returned %.2x as result",
+      fp_dbg ("Wait for finger returned %.2x as result\n",
              data[AESX660_FINGER_PRESENT_OFFSET]);
      fpi_ssm_jump_to_state (transfer->ssm, FINGER_DET_SEND_FD_CMD);
    }
@@ -332,7 +331,6 @@ capture_set_idle_cmd_cb (FpiUsbTransfer *transfer, FpDevice *device,

      priv->strips = g_slist_reverse (priv->strips);
      img = fpi_assemble_frames (cls->assembling_ctx, priv->strips);
-      img->flags |= FPI_IMAGE_PARTIAL;
      g_slist_foreach (priv->strips, (GFunc) g_free, NULL);
      g_slist_free (priv->strips);
      priv->strips = NULL;
@@ -365,7 +363,7 @@ capture_read_stripe_data_cb (FpiUsbTransfer *transfer,
      return;
    }

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

      still_needed_len = MAX (0, AESX660_HEADER_SIZE + payload_length - (gssize) priv->stripe_packet->len);
      copy_len = MIN (actual_length, still_needed_len);
@@ -406,7 +404,7 @@ capture_read_stripe_data_cb (FpiUsbTransfer *transfer,
      g_byte_array_set_size (priv->stripe_packet, 0);
    }

-  fp_dbg ("finger %s", finger_missing ? "missing" : "present");
+  fp_dbg ("finger %s\n", finger_missing ? "missing" : "present");

  if (finger_missing)
    fpi_ssm_next_state (transfer->ssm);
@@ -441,7 +439,7 @@ capture_run_state (FpiSsm *ssm, FpDevice *_dev)
      break;

    case CAPTURE_SET_IDLE:
-      fp_dbg ("Got %" G_GSIZE_FORMAT " frames", priv->strips_len);
+      fp_dbg ("Got %lu frames\n", priv->strips_len);
      aesX660_send_cmd (ssm, _dev, set_idle_cmd, sizeof (set_idle_cmd),
                        capture_set_idle_cmd_cb);
      break;
@@ -514,19 +512,19 @@ activate_read_id_cb (FpiUsbTransfer *transfer, FpDevice *device,

  if (error)
    {
-      fp_dbg ("read_id cmd failed");
+      fp_dbg ("read_id cmd failed\n");
      fpi_ssm_mark_failed (transfer->ssm, error);
      return;
    }
  /* ID was read correctly */
  if (data[0] == 0x07)
    {
-      fp_dbg ("Sensor device id: %.2x%2x, bcdDevice: %.2x.%.2x, init status: %.2x",
+      fp_dbg ("Sensor device id: %.2x%2x, bcdDevice: %.2x.%.2x, init status: %.2x\n",
              data[4], data[3], data[5], data[6], data[7]);
    }
  else
    {
-      fp_dbg ("Bogus read ID response: %.2x", data[AESX660_RESPONSE_TYPE_OFFSET]);
+      fp_dbg ("Bogus read ID response: %.2x\n", data[AESX660_RESPONSE_TYPE_OFFSET]);
      fpi_ssm_mark_failed (transfer->ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
                                                     "Bogus read ID response %.2x",
@@ -554,7 +552,7 @@ activate_read_id_cb (FpiUsbTransfer *transfer, FpDevice *device,
      break;

    default:
-      fp_dbg ("Failed to init device! init status: %.2x", data[7]);
+      fp_dbg ("Failed to init device! init status: %.2x\n", data[7]);
      fpi_ssm_mark_failed (transfer->ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
                                                     "Failed to init device %.2x",
@@ -571,11 +569,11 @@ activate_read_init_cb (FpiUsbTransfer *transfer, FpDevice *device,
  FpiDeviceAesX660Private *priv = fpi_device_aes_x660_get_instance_private (self);
  unsigned char *data = transfer->buffer;

-  fp_dbg ("read_init_cb");
+  fp_dbg ("read_init_cb\n");

  if (error)
    {
-      fp_dbg ("read_init transfer status: %s, actual_len: %d", error->message,
+      fp_dbg ("read_init transfer status: %s, actual_len: %d\n", error->message,
              (gint) transfer->actual_length);
      fpi_ssm_mark_failed (transfer->ssm, error);
      return;
@@ -583,7 +581,7 @@ activate_read_init_cb (FpiUsbTransfer *transfer, FpDevice *device,
  /* ID was read correctly */
  if (data[0] != 0x42 || data[3] != 0x01)
    {
-      fp_dbg ("Bogus read init response: %.2x %.2x", data[0],
+      fp_dbg ("Bogus read init response: %.2x %.2x\n", data[0],
              data[3]);
      fpi_ssm_mark_failed (transfer->ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -615,13 +613,13 @@ activate_run_state (FpiSsm *ssm, FpDevice *_dev)
    {
    case ACTIVATE_SET_IDLE:
      priv->init_seq_idx = 0;
-      fp_dbg ("Activate: set idle");
+      fp_dbg ("Activate: set idle\n");
      aesX660_send_cmd (ssm, _dev, set_idle_cmd, sizeof (set_idle_cmd),
                        fpi_ssm_usb_transfer_cb);
      break;

    case ACTIVATE_SEND_READ_ID_CMD:
-      fp_dbg ("Activate: read ID");
+      fp_dbg ("Activate: read ID\n");
      aesX660_send_cmd (ssm, _dev, read_id_cmd, sizeof (read_id_cmd),
                        fpi_ssm_usb_transfer_cb);
      break;
@@ -631,7 +629,7 @@ activate_run_state (FpiSsm *ssm, FpDevice *_dev)
      break;

    case ACTIVATE_SEND_INIT_CMD:
-      fp_dbg ("Activate: send init seq #%d cmd #%d",
+      fp_dbg ("Activate: send init seq #%d cmd #%d\n",
              priv->init_seq_idx,
              priv->init_cmd_idx);
      aesX660_send_cmd (ssm, _dev,
@@ -641,7 +639,7 @@ activate_run_state (FpiSsm *ssm, FpDevice *_dev)
      break;

    case ACTIVATE_READ_INIT_RESPONSE:
-      fp_dbg ("Activate: read init response");
+      fp_dbg ("Activate: read init response\n");
      aesX660_read_response (ssm, _dev, TRUE, FALSE, INIT_LEN, activate_read_init_cb);
      break;

@@ -1,444 +0,0 @@
-/*
- * Egis Technology Inc. (aka. LighTuning) 0570 driver for libfprint
- * Copyright (C) 2021 Maxim Kolesnikov <kolesnikov@svyazcom.ru>
- * Copyright (C) 2021 Saeed/Ali Rk <saeed.ali.rahimi@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#define FP_COMPONENT "egis0570"
-
-#include "egis0570.h"
-#include "drivers_api.h"
-
-/* Packet types */
-#define PKT_TYPE_INIT 0
-#define PKT_TYPE_REPEAT 1
-
-/* Struct */
-struct _FpDeviceEgis0570
-{
-  FpImageDevice parent;
-
-  gboolean      running;
-  gboolean      stop;
-
-  GSList       *strips;
-  guint8       *background;
-  gsize         strips_len;
-
-  int           pkt_num;
-  int           pkt_type;
-};
-G_DECLARE_FINAL_TYPE (FpDeviceEgis0570, fpi_device_egis0570, FPI, DEVICE_EGIS0570, FpImageDevice);
-G_DEFINE_TYPE (FpDeviceEgis0570, fpi_device_egis0570, FP_TYPE_IMAGE_DEVICE);
-
-static unsigned char
-egis_get_pixel (struct fpi_frame_asmbl_ctx *ctx, struct fpi_frame *frame, unsigned int x, unsigned int y)
-{
-  return frame->data[x + y * ctx->frame_width];
-}
-
-static struct fpi_frame_asmbl_ctx assembling_ctx = {
-  .frame_width = EGIS0570_IMGWIDTH,
-  .frame_height = EGIS0570_RFMGHEIGHT,
-  .image_width = EGIS0570_IMGWIDTH * 4 / 3,
-  .get_pixel = egis_get_pixel,
-};
-
-/*
- * Service
- */
-
-static gboolean
-is_last_pkt (FpDevice *dev)
-{
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-
-  int type = self->pkt_type;
-  int num = self->pkt_num;
-
-  gboolean r;
-
-  r = ((type == PKT_TYPE_INIT) && (num == (EGIS0570_INIT_TOTAL - 1)));
-  r |= ((type == PKT_TYPE_REPEAT) && (num == (EGIS0570_REPEAT_TOTAL - 1)));
-
-  return r;
-}
-
-/*
- * Returns a bit for each frame on whether or not a finger has been detected.
- * e.g. 00110 means that there is a finger in frame two and three.
- */
-static char
-postprocess_frames (FpDeviceEgis0570 *self, guint8 * img)
-{
-  size_t mean[EGIS0570_IMGCOUNT] = {0, 0, 0, 0, 0};
-
-  if (!self->background)
-    {
-      self->background = g_malloc (EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT);
-      memset (self->background, 255, EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT);
-
-      for (size_t k = 0; k < EGIS0570_IMGCOUNT; k += 1)
-        {
-          guint8 * frame = &img[(k * EGIS0570_IMGSIZE) + EGIS0570_RFMDIS * EGIS0570_IMGWIDTH];
-
-          for (size_t i = 0; i < EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT; i += 1)
-            self->background[i] = MIN (self->background[i], frame[i]);
-        }
-
-      return 0;
-    }
-
-  for (size_t k = 0; k < EGIS0570_IMGCOUNT; k += 1)
-    {
-      guint8 * frame = &img[(k * EGIS0570_IMGSIZE) + EGIS0570_RFMDIS * EGIS0570_IMGWIDTH];
-
-      for (size_t i = 0; i < EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT; i += 1)
-        {
-          if (frame[i] - EGIS0570_MARGIN  > self->background[i])
-            frame[i] -= self->background[i];
-          else
-            frame[i] = 0;
-
-          mean[k] += frame[i];
-        }
-
-      mean[k] /= EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT;
-    }
-
-  char result = 0;
-
-  for (size_t k = 0; k < EGIS0570_IMGCOUNT; k += 1)
-    {
-      fp_dbg ("Finger status (picture number, mean) : %ld , %ld", k, mean[k]);
-      if (mean[k] > EGIS0570_MIN_MEAN)
-        result |= 1 << k;
-    }
-
-  return result;
-}
-
-/*
- * Device communication
- */
-
-static void
-data_resp_cb (FpiUsbTransfer *transfer, FpDevice *dev, gpointer user_data, GError *error)
-{
-  unsigned char *stripdata;
-  gboolean end = FALSE;
-  FpImageDevice *img_self = FP_IMAGE_DEVICE (dev);
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-
-  if (error)
-    {
-      fpi_ssm_mark_failed (transfer->ssm, error);
-      return;
-    }
-
-  int where_finger_is = postprocess_frames (self, transfer->buffer);
-
-  if (where_finger_is > 0)
-    {
-      FpiImageDeviceState state;
-
-      fpi_image_device_report_finger_status (img_self, TRUE);
-
-      g_object_get (dev, "fpi-image-device-state", &state, NULL);
-      if (state == FPI_IMAGE_DEVICE_STATE_CAPTURE)
-        {
-          for (size_t k = 0; k < EGIS0570_IMGCOUNT; k += 1)
-            {
-              if (where_finger_is & (1 << k))
-                {
-                  struct fpi_frame *stripe = g_malloc (EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT + sizeof (struct fpi_frame));
-                  stripe->delta_x = 0;
-                  stripe->delta_y = 0;
-                  stripdata = stripe->data;
-                  memcpy (stripdata, (transfer->buffer) + (((k) * EGIS0570_IMGSIZE) + EGIS0570_IMGWIDTH * EGIS0570_RFMDIS), EGIS0570_IMGWIDTH * EGIS0570_RFMGHEIGHT);
-                  self->strips = g_slist_prepend (self->strips, stripe);
-                  self->strips_len += 1;
-                }
-              else
-                {
-                  end = TRUE;
-                  break;
-                }
-            }
-        }
-    }
-  else
-    {
-      end = TRUE;
-    }
-
-  if (end)
-    {
-      if (!self->stop && (self->strips_len > 0))
-        {
-          g_autoptr(FpImage) img = NULL;
-          self->strips = g_slist_reverse (self->strips);
-          fpi_do_movement_estimation (&assembling_ctx, self->strips);
-          img = fpi_assemble_frames (&assembling_ctx, self->strips);
-          img->flags |= (FPI_IMAGE_COLORS_INVERTED | FPI_IMAGE_PARTIAL);
-          g_slist_free_full (self->strips, g_free);
-          self->strips = NULL;
-          self->strips_len = 0;
-          FpImage *resizeImage = fpi_image_resize (img, EGIS0570_RESIZE, EGIS0570_RESIZE);
-          fpi_image_device_image_captured (img_self, g_steal_pointer (&resizeImage));
-        }
-
-      fpi_image_device_report_finger_status (img_self, FALSE);
-    }
-
-  fpi_ssm_next_state (transfer->ssm);
-}
-
-static void
-recv_data_resp (FpiSsm *ssm, FpDevice *dev)
-{
-  FpiUsbTransfer *transfer = fpi_usb_transfer_new (dev);
-
-  fpi_usb_transfer_fill_bulk (transfer, EGIS0570_EPIN, EGIS0570_INPSIZE);
-
-  transfer->ssm = ssm;
-  transfer->short_is_error = TRUE;
-
-  fpi_usb_transfer_submit (transfer, EGIS0570_TIMEOUT, NULL, data_resp_cb, NULL);
-}
-
-static void
-cmd_resp_cb (FpiUsbTransfer *transfer, FpDevice *dev, gpointer user_data, GError *error)
-{
-  if (error)
-    fpi_ssm_mark_failed (transfer->ssm, error);
-}
-
-static void
-recv_cmd_resp (FpiSsm *ssm, FpDevice *dev)
-{
-  FpiUsbTransfer *transfer = fpi_usb_transfer_new (dev);
-
-  fpi_usb_transfer_fill_bulk (transfer, EGIS0570_EPIN, EGIS0570_PKTSIZE);
-
-  transfer->ssm = ssm;
-
-  fpi_usb_transfer_submit (transfer, EGIS0570_TIMEOUT, NULL, cmd_resp_cb, NULL);
-}
-
-static void
-send_cmd_req (FpiSsm *ssm, FpDevice *dev, unsigned char *pkt)
-{
-  FpiUsbTransfer *transfer = fpi_usb_transfer_new (dev);
-
-  fpi_usb_transfer_fill_bulk_full (transfer, EGIS0570_EPOUT, pkt, EGIS0570_PKTSIZE, NULL);
-
-  transfer->ssm = ssm;
-  transfer->short_is_error = TRUE;
-
-  fpi_usb_transfer_submit (transfer, EGIS0570_TIMEOUT, NULL, fpi_ssm_usb_transfer_cb, NULL);
-}
-
-/*
- * SSM States
- */
-
-enum sm_states {
-  SM_INIT,
-  SM_START,
-  SM_REQ,
-  SM_RESP,
-  SM_REC_DATA,
-  SM_DONE,
-  SM_STATES_NUM
-};
-
-static void
-ssm_run_state (FpiSsm *ssm, FpDevice *dev)
-{
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-  FpImageDevice *img_dev = FP_IMAGE_DEVICE (dev);
-
-  switch (fpi_ssm_get_cur_state (ssm))
-    {
-    case SM_INIT:
-      self->pkt_type = PKT_TYPE_INIT;
-      fpi_ssm_next_state (ssm);
-      break;
-
-    case SM_START:
-      if (self->stop)
-        {
-          fp_dbg ("deactivating, marking completed");
-          fpi_ssm_mark_completed (ssm);
-          fpi_image_device_deactivate_complete (img_dev, NULL);
-        }
-      else
-        {
-          self->pkt_num = 0;
-          fpi_ssm_next_state (ssm);
-        }
-      break;
-
-    case SM_REQ:
-      if (self->pkt_type == PKT_TYPE_INIT)
-        send_cmd_req (ssm, dev, init_pkts[self->pkt_num]);
-      else
-        send_cmd_req (ssm, dev, repeat_pkts[self->pkt_num]);
-      break;
-
-    case SM_RESP:
-      if (is_last_pkt (dev) == FALSE)
-        {
-          recv_cmd_resp (ssm, dev);
-          self->pkt_num += 1;
-          fpi_ssm_jump_to_state (ssm, SM_REQ);
-        }
-      else
-        {
-          if (self->pkt_type == PKT_TYPE_INIT)
-            self->pkt_type = PKT_TYPE_REPEAT;
-
-          fpi_ssm_next_state (ssm);
-        }
-      break;
-
-    case SM_REC_DATA:
-      recv_data_resp (ssm, dev);
-      break;
-
-    case SM_DONE:
-      fpi_ssm_jump_to_state (ssm, SM_START);
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-}
-
-/*
- * Activation
- */
-
-static void
-loop_complete (FpiSsm *ssm, FpDevice *dev, GError *error)
-{
-  FpImageDevice *img_dev = FP_IMAGE_DEVICE (dev);
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-
-  self->running = FALSE;
-  g_clear_pointer (&self->background, g_free);
-
-  if (error)
-    fpi_image_device_session_error (img_dev, error);
-}
-
-static void
-dev_activate (FpImageDevice *dev)
-{
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (dev), ssm_run_state, SM_STATES_NUM);
-
-  self->stop    = FALSE;
-
-  fpi_ssm_start (ssm, loop_complete);
-
-  self->running = TRUE;
-
-  fpi_image_device_activate_complete (dev, NULL);
-}
-
-/*
- * Opening
- */
-
-static void
-dev_init (FpImageDevice *dev)
-{
-  GError *error = NULL;
-
-  g_usb_device_claim_interface (fpi_device_get_usb_device (FP_DEVICE (dev)), 0, 0, &error);
-
-  fpi_image_device_open_complete (dev, error);
-}
-
-/*
- * Closing
- */
-
-static void
-dev_deinit (FpImageDevice *dev)
-{
-  GError *error = NULL;
-
-  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (dev)), 0, 0, &error);
-
-  fpi_image_device_close_complete (dev, error);
-}
-
-/*
- * Deactivation
- */
-
-static void
-dev_deactivate (FpImageDevice *dev)
-{
-  FpDeviceEgis0570 *self = FPI_DEVICE_EGIS0570 (dev);
-
-  if (self->running)
-    self->stop = TRUE;
-  else
-    fpi_image_device_deactivate_complete (dev, NULL);
-}
-
-/*
- * Driver data
- */
-
-static const FpIdEntry id_table[] = {
-  { .vid = 0x1c7a, .pid = 0x0570, },
-  { .vid = 0x1c7a, .pid = 0x0571, },
-  { .vid = 0,      .pid = 0, },
-};
-
-static void
-fpi_device_egis0570_init (FpDeviceEgis0570 *self)
-{
-}
-
-static void
-fpi_device_egis0570_class_init (FpDeviceEgis0570Class *klass)
-{
-  FpDeviceClass *dev_class = FP_DEVICE_CLASS (klass);
-  FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_CLASS (klass);
-
-  dev_class->id = "egis0570";
-  dev_class->full_name = "Egis Technology Inc. (aka. LighTuning) 0570";
-  dev_class->type = FP_DEVICE_TYPE_USB;
-  dev_class->id_table = id_table;
-  dev_class->scan_type = FP_SCAN_TYPE_SWIPE;
-
-  img_class->img_open = dev_init;
-  img_class->img_close = dev_deinit;
-  img_class->activate = dev_activate;
-  img_class->deactivate = dev_deactivate;
-
-  img_class->img_width = EGIS0570_IMGWIDTH;
-  img_class->img_height = -1;
-
-  img_class->bz3_threshold = EGIS0570_BZ3_THRESHOLD; /* security issue */
-}
@@ -1,177 +0,0 @@
-/*
- * Egis Technology Inc. (aka. LighTuning) 0570 driver for libfprint
- * Copyright (C) 2021 Maxim Kolesnikov <kolesnikov@svyazcom.ru>
- * Copyright (C) 2021 Saeed/Ali Rk <saeed.ali.rahimi@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __EGIS0570_H
-
-#define __EGIS0570_H 1
-
-/*
- * Device data
- */
-
-#define EGIS0570_CONF 1
-#define EGIS0570_INTF 0
-
-/*
- * Device endpoints
- */
-
-#define EGIS0570_EPOUT 0x04 /* ( 4 | FPI_USB_ENDPOINT_OUT ) */
-#define EGIS0570_EPIN 0x83  /* ( 3 | FPI_USB_ENDPOINT_IN ) */
-
-/*
- * Initialization packets (7 bytes each)
- *
- * First 4 bytes are equivalent to string "EGIS", which must be just a company identificator
- * Other 3 bytes are not recognized yet and may be not important, as they are always the same
-
- * Answers for each packet contain 7 bytes again
- * First 4 bytes are reversed "EGIS", which is "SIGE", which is company ID again
- * Other 3 bytes are not recognized yet
- * But there is a pattern.
- * Sending last packet makes sensor return image
- */
-
-#define EGIS0570_TIMEOUT 10000
-#define EGIS0570_PKTSIZE 7
-
-#define EGIS0570_INIT_TOTAL (sizeof ((init_pkts)) / sizeof ((init_pkts[0])))
-
-static unsigned char init_pkts[][EGIS0570_PKTSIZE] =
-{
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x20, 0x3f },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x58, 0x3f },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x21, 0x09 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x57, 0x09 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x22, 0x03 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x56, 0x03 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x23, 0x01 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x55, 0x01 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x24, 0x01 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x54, 0x01 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x16, 0x3e },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x09, 0x0b },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x14, 0x03 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x15, 0x00 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x0f },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x10, 0x00 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x11, 0x38 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x12, 0x00 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x13, 0x71 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x03, 0x80 },
-  { 0x45, 0x47, 0x49, 0x53, 0x00, 0x02, 0x80 },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x2f },
-  { 0x45, 0x47, 0x49, 0x53, 0x06, 0x00, 0xfe }        /* image returned after this packet */
-};
-
-/* There is another Packet !
- * That just Work the same !!
- * And the Size is different !!!
- */
-
-/*
-
- #define EGIS0570_INIT_TOTAL2 (sizeof((init_pkts2)) / sizeof((init_pkts2[0])))
-
-   static unsigned char init_pkts2[][EGIS0570_PKTSIZE] =
-   {
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x10, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x11, 0x38},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x12, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x13, 0x71},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x20, 0x3f},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x58, 0x3f},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x21, 0x07},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x57, 0x07},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x22, 0x02},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x56, 0x02},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x23, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x55, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x24, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x54, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x25, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x53, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x15, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x16, 0x3b},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x09, 0x0a},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x14, 0x00},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x0f},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x03, 0x80},
-        {0x45, 0x47, 0x49, 0x53, 0x00, 0x02, 0x80},
-        {0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x2f},
-        {0x45, 0x47, 0x49, 0x53, 0x06, 0x00, 0xfe}
-   };
-
- */
-
-/*
- * After sending initial packets device returns image data (32512 bytes)
- * To ask device to send image data again, host needs to send four additional packets
- * Further work is to repeatedly send four repeat packets and read image data
- */
-
-#define EGIS0570_INPSIZE 32512
-
-/* 5 image with captured in different time of size 114 * 57 = 6498
- * 5 * 6498 = 32490 plus 22 extra unrecognized char size data
- * Two continuous image in this 5 images may have time delay of less than 20ms
- */
-
-#define EGIS0570_IMGSIZE 6498
-#define EGIS0570_IMGWIDTH 114
-#define EGIS0570_IMGHEIGHT 57
-
-/* size of middle area that is used from each frame */
-#define EGIS0570_RFMGHEIGHT 17
-/* rows to ignore from top and bottom of the image*/
-#define EGIS0570_RFMDIS (EGIS0570_IMGHEIGHT - EGIS0570_RFMGHEIGHT) / 2
-#define EGIS0570_IMGCOUNT 5
-
-/*
- * Image repeat request
- * First 4 bytes are the same as in initialization packets
- * Have no idea what the other 3 bytes mean
- */
-
-#define EGIS0570_REPEAT_TOTAL (sizeof ((repeat_pkts)) / sizeof ((repeat_pkts[0])))
-
-static unsigned char repeat_pkts[][EGIS0570_PKTSIZE] =
-{
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x0f },
-  { 0x45, 0x47, 0x49, 0x53, 0x00, 0x02, 0x0f },
-  { 0x45, 0x47, 0x49, 0x53, 0x01, 0x02, 0x2f },
-  { 0x45, 0x47, 0x49, 0x53, 0x06, 0x00, 0xfe }         /* image returned after this packet */
-};
-
-/*
- * This sensor is small so I decided to reduce bz3_threshold from
- * 40 to 10 to have more success to fail ratio
- * Bozorth3 Algorithm seems not fine at the end
- * foreget about security :))
- */
-
-#define EGIS0570_BZ3_THRESHOLD 25 /* and even less What a joke */
-
-#define EGIS0570_MIN_MEAN 20
-#define EGIS0570_MARGIN 3
-
-#define EGIS0570_RESIZE 2
-
-#endif
@@ -1,230 +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
-
-#pragma pack(push, 1)
-typedef struct
-{
-  guchar  reserve_para_1;
-  gushort reserve_para_2;
-  gushort reserve_para_3;
-  guchar  reserve_para_4[EGIS_ETU905_PARA_4_SIZE];
-} EgismocSidData;
-#pragma pack(pop)
-
-/* standard prefixes for all read/writes */
-
-static const guchar egis_etu905_write_prefix[] = {'E', 'G', 'I', 'S', 0x00, 0x00, 0x00, 0x01};
-static const gsize egis_etu905_write_prefix_len = sizeof (egis_etu905_write_prefix) / sizeof (egis_etu905_write_prefix[0]);
-
-static const guchar egis_etu905_read_prefix[] = {'S', 'I', 'G', 'E', 0x00, 0x00, 0x00, 0x01};
-static const gsize egis_etu905_read_prefix_len = sizeof (egis_etu905_read_prefix) / sizeof (egis_etu905_read_prefix[0]);
-
-
-/* hard-coded command payloads */
-
-static const guchar cmd_fw_version[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x0c};
-static const gsize cmd_fw_version_len = sizeof (cmd_fw_version) / sizeof (cmd_fw_version[0]);
-static const guchar rsp_fw_version_suffix[] = {0x90, 0x00};
-static const gsize rsp_fw_version_suffix_len = sizeof (rsp_fw_version_suffix) / sizeof (rsp_fw_version_suffix[0]);
-
-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 gsize cmd_init_len = sizeof (cmd_init) / sizeof (cmd_init[0]);
-
-static const guchar cmd_list[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x19, 0x04, 0x00, 0x00, 0x01, 0x40};
-static const gsize cmd_list_len = sizeof (cmd_list) / sizeof (cmd_list[0]);
-
-static const guchar cmd_sensor_reset[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x1a, 0x00, 0x00};
-static const gsize cmd_sensor_reset_len = sizeof (cmd_sensor_reset) / sizeof (cmd_sensor_reset[0]);
-
-static const guchar cmd_sensor_check[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x02, 0x00};
-static const gsize cmd_sensor_check_len = sizeof (cmd_sensor_check) / sizeof (cmd_sensor_check[0]);
-
-static const guchar cmd_sensor_identify[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x01, 0x01};
-static const gsize cmd_sensor_identify_len = sizeof (cmd_sensor_identify) / sizeof (cmd_sensor_identify[0]);
-
-static const guchar rsp_identify_match_suffix[] = {0x90, 0x00};
-static const gsize rsp_identify_match_suffix_len = sizeof (rsp_identify_match_suffix) / sizeof (rsp_identify_match_suffix[0]);
-
-static const guchar rsp_identify_notmatch_suffix[] = {0x90, 0x04};
-static const gsize rsp_identify_notmatch_suffix_len = sizeof (rsp_identify_notmatch_suffix) / sizeof (rsp_identify_notmatch_suffix[0]);
-
-static const guchar cmd_enroll_starting[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x01, 0x00, 0x00, 0x00, 0x20};
-static const gsize cmd_enroll_starting_len = sizeof (cmd_enroll_starting) / sizeof (cmd_enroll_starting[0]);
-
-static const guchar cmd_sensor_start_capture[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x16, 0x02, 0x01};
-static const gsize cmd_sensor_start_capture_len = sizeof (cmd_sensor_start_capture) / sizeof (cmd_sensor_start_capture[0]);
-
-static const guchar cmd_read_capture[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x02, 0x02, 0x00, 0x00, 0x02};
-static const gsize cmd_read_capture_len = sizeof (cmd_read_capture) / sizeof (cmd_read_capture[0]);
-
-static const guchar cmd_duplicate_check[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x16, 0x05, 0x00};
-static const gsize cmd_duplicate_check_len = sizeof (cmd_duplicate_check) / sizeof (cmd_duplicate_check[0]);
-
-static const guchar rsp_read_success_prefix[] = {0x00, 0x00, 0x00, 0x04};
-static const gsize rsp_read_success_prefix_len = sizeof (rsp_read_success_prefix) / sizeof (rsp_read_success_prefix[0]);
-static const guchar rsp_read_success_suffix[] = {0x90, 0x00};
-static const gsize rsp_read_success_suffix_len = sizeof (rsp_read_success_suffix) / sizeof (rsp_read_success_suffix[0]);
-static const guchar rsp_read_offcenter_prefix[] = {0x00, 0x00, 0x00, 0x04};
-static const gsize rsp_read_offcenter_prefix_len = sizeof (rsp_read_offcenter_prefix) / sizeof (rsp_read_offcenter_prefix[0]);
-static const guchar rsp_read_offcenter_suffix[] = {0x64, 0x91};
-static const gsize rsp_read_offcenter_suffix_len = sizeof (rsp_read_offcenter_suffix) / sizeof (rsp_read_offcenter_suffix[0]);
-static const guchar rsp_read_dirty_prefix[] = {0x00, 0x00, 0x00, 0x02, 0x64};
-static const gsize rsp_read_dirty_prefix_len = sizeof (rsp_read_dirty_prefix) / sizeof (rsp_read_dirty_prefix[0]);
-
-static const guchar cmd_commit_starting[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x05, 0x00, 0x00, 0x00, 0x20};
-static const gsize cmd_commit_starting_len = sizeof (cmd_commit_starting) / sizeof (cmd_commit_starting[0]);
-
-static const guchar cmd_enroll_discard[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x04, 0x00, 0x00, 0x00, 0x20};
-static const gsize cmd_enroll_discard_len = sizeof (cmd_enroll_discard) / sizeof (cmd_enroll_discard[0]);
-
-static const guchar cmd_identify_cancel[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x04, 0x01, 0x00};
-static const gsize cmd_identify_cancel_len = sizeof (cmd_identify_cancel) / sizeof (cmd_identify_cancel[0]);
-
-static const guchar cmd_identify_cancel_result[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x04, 0x02, 0x00};
-static const gsize cmd_identify_cancel_result_len = sizeof (cmd_identify_cancel_result) / sizeof (cmd_identify_cancel_result[0]);
-
-/* 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 gsize cmd_new_print_prefix_type2_len = sizeof (cmd_new_print_prefix_type2) / sizeof (cmd_new_print_prefix_type2[0]);
-
-static const guchar cmd_delete_prefix[] = {0x50, 0x18, 0x04, 0x00, 0x00};
-static const gsize cmd_delete_prefix_len = sizeof (cmd_delete_prefix) / sizeof (cmd_delete_prefix[0]);
-static const guchar rsp_delete_success_prefix[] = {0x00, 0x00, 0x00, 0x02, 0x90, 0x00};
-static const gsize rsp_delete_success_prefix_len = sizeof (rsp_delete_success_prefix) / sizeof (rsp_delete_success_prefix[0]);
-
-static const guchar cmd_check_prefix_type1[] = {0x50, 0x17, 0x03, 0x00, 0x00};
-static const gsize cmd_check_prefix_type1_len = sizeof (cmd_check_prefix_type1) / sizeof (cmd_check_prefix_type1[0]);
-static const guchar cmd_check_prefix_type2[] = {0x50, 0x17, 0x03, 0x80, 0x00};
-static const gsize cmd_check_prefix_type2_len = sizeof (cmd_check_prefix_type2) / sizeof (cmd_check_prefix_type2[0]);
-static const guchar cmd_check_suffix[] = {0x00, 0x40};
-static const gsize cmd_check_suffix_len = sizeof (cmd_check_suffix) / sizeof (cmd_check_suffix[0]);
-static const guchar rsp_check_not_yet_enrolled_suffix[] = {0x90, 0x04};
-static const gsize rsp_check_not_yet_enrolled_suffix_len = sizeof (rsp_check_not_yet_enrolled_suffix) / sizeof (rsp_check_not_yet_enrolled_suffix[0]);
-
-
-/* SSM task states and various status enums */
-
-typedef enum {
-  CMD_SEND,
-  CMD_GET,
-  CMD_STATES,
-} CommandStates;
-
-typedef enum {
-  DEV_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_SEND_CANCEL_RESULT,
-  IDENTIFY_COMPLETE_SENSOR_RESET,
-  IDENTIFY_COMPLETE,
-
-  /* Cleanup states follow */
-  IDENTIFY_CANCEL,
-  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,
-
-  /* Cleanup states follow */
-  ENROLL_CANCEL,
-  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;
@@ -1,223 +0,0 @@
-/*
- * Driver for Egis Technology (LighTuning) Match-On-Chip sensors
- * Originally authored 2023 by Joshua Grisham <josh@joshuagrisham.com>
- *
- * Portions of code and logic inspired from the elanmoc libfprint driver
- * which is copyright (C) 2021 Elan Microelectronics Inc (see elanmoc.c)
- *
- * Based on original reverse-engineering work by Joshua Grisham. The protocol has
- * been reverse-engineered from captures of the official Windows driver, and by
- * testing commands on the sensor with a multiplatform Python prototype driver:
- * https://github.com/joshuagrisham/galaxy-book2-pro-linux/tree/main/fingerprint/
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include "fpi-device.h"
-#include "fpi-ssm.h"
-
-G_DECLARE_FINAL_TYPE (FpiDeviceEgisMoc, fpi_device_egismoc, FPI, DEVICE_EGISMOC, FpDevice)
-
-#define EGISMOC_DRIVER_FULLNAME "Egis Technology (LighTuning) Match-on-Chip"
-
-#define EGISMOC_DRIVER_CHECK_PREFIX_TYPE1 (1 << 0)
-#define EGISMOC_DRIVER_CHECK_PREFIX_TYPE2 (1 << 1)
-#define EGISMOC_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)
-#define EGISMOC_EP_CMD_INTERRUPT_IN 0x83
-
-#define EGISMOC_USB_CONTROL_TIMEOUT 5000
-#define EGISMOC_USB_SEND_TIMEOUT 5000
-#define EGISMOC_USB_RECV_TIMEOUT 5000
-#define EGISMOC_USB_INTERRUPT_TIMEOUT 60000
-
-#define EGISMOC_USB_IN_RECV_LENGTH 4096
-#define EGISMOC_USB_INTERRUPT_IN_RECV_LENGTH 64
-
-#define EGISMOC_MAX_ENROLL_STAGES_DEFAULT 10
-#define EGISMOC_MAX_ENROLL_NUM 10
-#define EGISMOC_FINGERPRINT_DATA_SIZE 32
-#define EGISMOC_LIST_RESPONSE_PREFIX_SIZE 14
-#define EGISMOC_LIST_RESPONSE_SUFFIX_SIZE 2
-
-/* standard prefixes for all read/writes */
-
-static guchar egismoc_write_prefix[] = {'E', 'G', 'I', 'S', 0x00, 0x00, 0x00, 0x01};
-static gsize egismoc_write_prefix_len = sizeof (egismoc_write_prefix) / sizeof (egismoc_write_prefix[0]);
-
-static guchar egismoc_read_prefix[] = {'S', 'I', 'G', 'E', 0x00, 0x00, 0x00, 0x01};
-static gsize egismoc_read_prefix_len = sizeof (egismoc_read_prefix) / sizeof (egismoc_read_prefix[0]);
-
-
-/* hard-coded command payloads */
-
-static guchar cmd_fw_version[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x0c};
-static gsize cmd_fw_version_len = sizeof (cmd_fw_version) / sizeof (cmd_fw_version[0]);
-static guchar rsp_fw_version_suffix[] = {0x90, 0x00};
-static gsize rsp_fw_version_suffix_len = sizeof (rsp_fw_version_suffix) / sizeof (rsp_fw_version_suffix[0]);
-
-static guchar cmd_list[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x19, 0x04, 0x00, 0x00, 0x01, 0x40};
-static gsize cmd_list_len = sizeof (cmd_list) / sizeof (cmd_list[0]);
-
-static guchar cmd_sensor_reset[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x1a, 0x00, 0x00};
-static gsize cmd_sensor_reset_len = sizeof (cmd_sensor_reset) / sizeof (cmd_sensor_reset[0]);
-
-static guchar cmd_sensor_check[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x02, 0x00};
-static gsize cmd_sensor_check_len = sizeof (cmd_sensor_check) / sizeof (cmd_sensor_check[0]);
-
-static guchar cmd_sensor_identify[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x01, 0x01};
-static gsize cmd_sensor_identify_len = sizeof (cmd_sensor_identify) / sizeof (cmd_sensor_identify[0]);
-static guchar rsp_identify_match_suffix[] = {0x90, 0x00};
-static gsize rsp_identify_match_suffix_len = sizeof (rsp_identify_match_suffix) / sizeof (rsp_identify_match_suffix[0]);
-static guchar rsp_identify_notmatch_suffix[] = {0x90, 0x04};
-static gsize rsp_identify_notmatch_suffix_len = sizeof (rsp_identify_notmatch_suffix) / sizeof (rsp_identify_notmatch_suffix[0]);
-
-static guchar cmd_sensor_enroll[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x17, 0x01, 0x00};
-static gsize cmd_sensor_enroll_len = sizeof (cmd_sensor_enroll) / sizeof (cmd_sensor_enroll[0]);
-
-static guchar cmd_enroll_starting[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x01, 0x00, 0x00, 0x00, 0x20};
-static gsize cmd_enroll_starting_len = sizeof (cmd_enroll_starting) / sizeof (cmd_enroll_starting[0]);
-
-static guchar cmd_sensor_start_capture[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x16, 0x02, 0x01};
-static gsize cmd_sensor_start_capture_len = sizeof (cmd_sensor_start_capture) / sizeof (cmd_sensor_start_capture[0]);
-
-static guchar cmd_read_capture[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x02, 0x02, 0x00, 0x00, 0x02};
-static gsize cmd_read_capture_len = sizeof (cmd_read_capture) / sizeof (cmd_read_capture[0]);
-static guchar rsp_read_success_prefix[] = {0x00, 0x00, 0x00, 0x04};
-static gsize rsp_read_success_prefix_len = sizeof (rsp_read_success_prefix) / sizeof (rsp_read_success_prefix[0]);
-static guchar rsp_read_success_suffix[] = {0x90, 0x00};
-static gsize rsp_read_success_suffix_len = sizeof (rsp_read_success_suffix) / sizeof (rsp_read_success_suffix[0]);
-static guchar rsp_read_offcenter_prefix[] = {0x00, 0x00, 0x00, 0x04};
-static gsize rsp_read_offcenter_prefix_len = sizeof (rsp_read_offcenter_prefix) / sizeof (rsp_read_offcenter_prefix[0]);
-static guchar rsp_read_offcenter_suffix[] = {0x64, 0x91};
-static gsize rsp_read_offcenter_suffix_len = sizeof (rsp_read_offcenter_suffix) / sizeof (rsp_read_offcenter_suffix[0]);
-static guchar rsp_read_dirty_prefix[] = {0x00, 0x00, 0x00, 0x02, 0x64};
-static gsize rsp_read_dirty_prefix_len = sizeof (rsp_read_dirty_prefix) / sizeof (rsp_read_dirty_prefix[0]);
-
-static guchar cmd_commit_starting[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x16, 0x05, 0x00, 0x00, 0x00, 0x20};
-static gsize cmd_commit_starting_len = sizeof (cmd_commit_starting) / sizeof (cmd_commit_starting[0]);
-
-
-/* commands which exist on the device but are currently not used */
-/*
-   static guchar cmd_sensor_cancel[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x16, 0x04, 0x00};
-   static gsize cmd_sensor_cancel_len = sizeof(cmd_sensor_cancel) / sizeof(cmd_sensor_cancel[0]);
-
-   static guchar cmd_sensor_verify[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x04, 0x01, 0x00};
-   static gsize cmd_sensor_verify_len = sizeof(cmd_sensor_verify) / sizeof(cmd_sensor_verify[0]);
-
-   static guchar cmd_read_verify[] = {0x00, 0x00, 0x00, 0x04, 0x50, 0x04, 0x02, 0x00};
-   static gsize cmd_read_verify_len = sizeof(cmd_read_verify) / sizeof(cmd_read_verify[0]);
- */
-
-
-/* prefixes/suffixes and other things for dynamically created command payloads */
-
-#define EGISMOC_CHECK_BYTES_LENGTH 2
-#define EGISMOC_IDENTIFY_RESPONSE_PRINT_ID_OFFSET 46
-#define EGISMOC_CMD_CHECK_SEPARATOR_LENGTH 32
-
-static guchar cmd_new_print_prefix[] = {0x00, 0x00, 0x00, 0x27, 0x50, 0x16, 0x03, 0x00, 0x00, 0x00, 0x20};
-static gsize cmd_new_print_prefix_len = sizeof (cmd_new_print_prefix) / sizeof (cmd_new_print_prefix[0]);
-
-static guchar cmd_delete_prefix[] = {0x50, 0x18, 0x04, 0x00, 0x00};
-static gsize cmd_delete_prefix_len = sizeof (cmd_delete_prefix) / sizeof (cmd_delete_prefix[0]);
-static guchar rsp_delete_success_prefix[] = {0x00, 0x00, 0x00, 0x02, 0x90, 0x00};
-static gsize rsp_delete_success_prefix_len = sizeof (rsp_delete_success_prefix) / sizeof (rsp_delete_success_prefix[0]);
-
-static guchar cmd_check_prefix_type1[] = {0x50, 0x17, 0x03, 0x00, 0x00};
-static gsize cmd_check_prefix_type1_len = sizeof (cmd_check_prefix_type1) / sizeof (cmd_check_prefix_type1[0]);
-static guchar cmd_check_prefix_type2[] = {0x50, 0x17, 0x03, 0x80, 0x00};
-static gsize cmd_check_prefix_type2_len = sizeof (cmd_check_prefix_type2) / sizeof (cmd_check_prefix_type2[0]);
-static guchar cmd_check_suffix[] = {0x00, 0x40};
-static gsize cmd_check_suffix_len = sizeof (cmd_check_suffix) / sizeof (cmd_check_suffix[0]);
-static guchar rsp_check_not_yet_enrolled_suffix[] = {0x90, 0x04};
-static gsize rsp_check_not_yet_enrolled_suffix_len = sizeof (rsp_check_not_yet_enrolled_suffix) / sizeof (rsp_check_not_yet_enrolled_suffix[0]);
-
-
-/* SSM task states and various status enums */
-
-typedef enum {
-  CMD_SEND,
-  CMD_GET,
-  CMD_STATES,
-} CommandStates;
-
-typedef enum {
-  DEV_INIT_CONTROL1,
-  DEV_INIT_CONTROL2,
-  DEV_INIT_CONTROL3,
-  DEV_INIT_CONTROL4,
-  DEV_INIT_CONTROL5,
-  DEV_GET_FW_VERSION,
-  DEV_INIT_STATES,
-} DeviceInitStates;
-
-typedef enum {
-  IDENTIFY_GET_ENROLLED_IDS,
-  IDENTIFY_CHECK_ENROLLED_NUM,
-  IDENTIFY_SENSOR_RESET,
-  IDENTIFY_SENSOR_IDENTIFY,
-  IDENTIFY_WAIT_FINGER,
-  IDENTIFY_SENSOR_CHECK,
-  IDENTIFY_CHECK,
-  IDENTIFY_COMPLETE_SENSOR_RESET,
-  IDENTIFY_COMPLETE,
-  IDENTIFY_STATES,
-} IdentifyStates;
-
-typedef enum {
-  ENROLL_GET_ENROLLED_IDS,
-  ENROLL_CHECK_ENROLLED_NUM,
-  ENROLL_SENSOR_RESET,
-  ENROLL_SENSOR_ENROLL,
-  ENROLL_WAIT_FINGER,
-  ENROLL_SENSOR_CHECK,
-  ENROLL_CHECK,
-  ENROLL_START,
-  ENROLL_CAPTURE_SENSOR_RESET,
-  ENROLL_CAPTURE_SENSOR_START_CAPTURE,
-  ENROLL_CAPTURE_WAIT_FINGER,
-  ENROLL_CAPTURE_READ_RESPONSE,
-  ENROLL_COMMIT_START,
-  ENROLL_COMMIT,
-  ENROLL_COMMIT_SENSOR_RESET,
-  ENROLL_COMPLETE,
-  ENROLL_STATES,
-} EnrollStates;
-
-typedef enum {
-  ENROLL_STATUS_DEVICE_FULL,
-  ENROLL_STATUS_DUPLICATE,
-  ENROLL_STATUS_PARTIAL_OK,
-  ENROLL_STATUS_RETRY,
-  ENROLL_STATUS_COMPLETE,
-} EnrollStatus;
-
-typedef enum {
-  LIST_GET_ENROLLED_IDS,
-  LIST_RETURN_ENROLLED_PRINTS,
-  LIST_STATES,
-} ListStates;
-
-typedef enum {
-  DELETE_GET_ENROLLED_IDS,
-  DELETE_DELETE,
-  DELETE_STATES,
-} DeleteStates;
@@ -73,19 +73,22 @@ struct _FpiDeviceElan
  /* end commands */

  /* state */
-  gboolean        active;
-  gboolean        deactivating;
-  unsigned char  *last_read;
-  unsigned char   calib_atts_left;
-  unsigned char   calib_status;
-  unsigned short *background;
-  unsigned char   frame_width;
-  unsigned char   frame_height;
-  unsigned char   raw_frame_height;
-  int             num_frames;
-  GSList         *frames;
+  gboolean           deactivating;
+  FpImageDeviceState dev_state;
+  FpImageDeviceState dev_state_next;
+  unsigned char     *last_read;
+  unsigned char      calib_atts_left;
+  unsigned char      calib_status;
+  unsigned short    *background;
+  unsigned char      frame_width;
+  unsigned char      frame_height;
+  unsigned char      raw_frame_height;
+  int                num_frames;
+  GSList            *frames;
  /* end state */
 };
+G_DECLARE_FINAL_TYPE (FpiDeviceElan, fpi_device_elan, FPI, DEVICE_ELAN,
+                      FpImageDevice);
 G_DEFINE_TYPE (FpiDeviceElan, fpi_device_elan, FP_TYPE_IMAGE_DEVICE);

 static int
@@ -204,7 +207,6 @@ elan_save_img_frame (FpiDeviceElan *elandev)

  unsigned int frame_size = elandev->frame_width * elandev->frame_height;
  unsigned short *frame = g_malloc (frame_size * sizeof (short));
-
  elan_save_frame (elandev, frame);
  unsigned int sum = 0;

@@ -242,7 +244,6 @@ elan_process_frame_linear (unsigned short *raw_frame,
  G_DEBUG_HERE ();

  unsigned short min = 0xffff, max = 0;
-
  for (int i = 0; i < frame_size; i++)
    {
      if (raw_frame[i] < min)
@@ -254,7 +255,6 @@ elan_process_frame_linear (unsigned short *raw_frame,
  g_assert (max != min);

  unsigned short px;
-
  for (int i = 0; i < frame_size; i++)
    {
      px = raw_frame[i];
@@ -278,7 +278,6 @@ elan_process_frame_thirds (unsigned short *raw_frame,

  unsigned short lvl0, lvl1, lvl2, lvl3;
  unsigned short *sorted = g_malloc (frame_size * sizeof (short));
-
  memcpy (sorted, raw_frame, frame_size * sizeof (short));
  qsort (sorted, frame_size, sizeof (short), cmp_short);
  lvl0 = sorted[0];
@@ -288,7 +287,6 @@ elan_process_frame_thirds (unsigned short *raw_frame,
  g_free (sorted);

  unsigned short px;
-
  for (int i = 0; i < frame_size; i++)
    {
      px = raw_frame[i];
@@ -322,7 +320,6 @@ elan_submit_image (FpImageDevice *dev)
  g_slist_foreach (raw_frames, (GFunc) self->process_frame, &frames);
  fpi_do_movement_estimation (&assembling_ctx, frames);
  img = fpi_assemble_frames (&assembling_ctx, frames);
-  img->flags |= FPI_IMAGE_PARTIAL;

  g_slist_free_full (frames, g_free);

@@ -357,7 +354,7 @@ elan_cmd_cb (FpiUsbTransfer *transfer, FpDevice *dev,
  if (transfer->endpoint & FPI_USB_ENDPOINT_IN)
    {
      /* just finished receiving */
-      self->last_read = g_memdup2 (transfer->buffer, transfer->actual_length);
+      self->last_read = g_memdup (transfer->buffer, transfer->actual_length);
      elan_cmd_done (ssm);
    }
  else
@@ -484,7 +481,7 @@ stop_capture_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)


  /* The device is inactive at this point. */
-  self->active = FALSE;
+  self->dev_state = FP_IMAGE_DEVICE_STATE_INACTIVE;

  if (self->deactivating)
    {
@@ -502,15 +499,16 @@ stop_capture_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)
 }

 static void
-elan_stop_capture (FpiDeviceElan *self)
+elan_stop_capture (FpDevice *dev)
 {
+  FpiDeviceElan *self = FPI_DEVICE_ELAN (dev);
+
  G_DEBUG_HERE ();

  elan_dev_reset_state (self);

  FpiSsm *ssm =
-    fpi_ssm_new (FP_DEVICE (self), stop_capture_run_state, STOP_CAPTURE_NUM_STATES);
-
+    fpi_ssm_new (dev, stop_capture_run_state, STOP_CAPTURE_NUM_STATES);
  fpi_ssm_start (ssm, stop_capture_complete);
 }

@@ -540,6 +538,8 @@ capture_run_state (FpiSsm *ssm, FpDevice *dev)
      break;

    case CAPTURE_READ_DATA:
+      self->dev_state = FP_IMAGE_DEVICE_STATE_CAPTURE;
+
      /* 0x55 - finger present
       * 0xff - device not calibrated (probably) */
      if (self->last_read && self->last_read[0] == 0x55)
@@ -547,20 +547,9 @@ 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)))
-            fpi_ssm_mark_completed (ssm);
-          else
-            fpi_ssm_mark_failed (ssm, fpi_device_error_new (FP_DEVICE_ERROR_PROTO));
+          fpi_ssm_mark_failed (ssm, fpi_device_error_new (FP_DEVICE_ERROR_PROTO));
        }
      break;

@@ -592,6 +581,8 @@ capture_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)

  G_DEBUG_HERE ();

+  /* XXX: cancellation was specially handled by doing nothing! */
+
  /* either max frames captured or timed out waiting for the next frame */
  if (!error ||
      (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT) &&
@@ -614,22 +605,18 @@ capture_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)
      fpi_image_device_session_error (dev, error);
    }

-  /* Note: We always stop capturing even if that may not be needed always.
-   * Doing this between captures appears to make it at least less likely for
-   * devices to end up in a bad state.
-   */
-  elan_stop_capture (self);
 }

 static void
-elan_capture (FpiDeviceElan *self)
+elan_capture (FpDevice *dev)
 {
+  FpiDeviceElan *self = FPI_DEVICE_ELAN (dev);
+
  G_DEBUG_HERE ();

  elan_dev_reset_state (self);
  FpiSsm *ssm =
-    fpi_ssm_new (FP_DEVICE (self), capture_run_state, CAPTURE_NUM_STATES);
-
+    fpi_ssm_new (dev, capture_run_state, CAPTURE_NUM_STATES);
  fpi_ssm_start (ssm, capture_complete);
 }

@@ -744,7 +731,7 @@ calibrate_run_state (FpiSsm *ssm, FpDevice *dev)
          fp_dbg ("calibration failed");
          fpi_ssm_mark_failed (ssm,
                               fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
-                                                         "Calibration failed!"));
+                                                         "Callibration failed!"));
        }
      break;

@@ -767,7 +754,7 @@ calibrate_run_state (FpiSsm *ssm, FpDevice *dev)
          if (self->calib_status == 0x00 &&
              self->last_read[0] == 0x01)
            self->calib_status = 0x01;
-          fpi_ssm_next_state_delayed (ssm, 50);
+          fpi_ssm_next_state_delayed (ssm, 50, NULL);
        }
      break;

@@ -780,33 +767,34 @@ calibrate_run_state (FpiSsm *ssm, FpDevice *dev)
 static void
 calibrate_complete (FpiSsm *ssm, FpDevice *dev, GError *error)
 {
+  FpiDeviceElan *self = FPI_DEVICE_ELAN (dev);
+
  G_DEBUG_HERE ();

  if (error)
    {
+      self->dev_state = FP_IMAGE_DEVICE_STATE_INACTIVE;
      fpi_image_device_session_error (FP_IMAGE_DEVICE (dev), error);
-      elan_stop_capture (FPI_DEVICE_ELAN (dev));
    }
  else
    {
-      elan_capture (FPI_DEVICE_ELAN (dev));
+      elan_capture (dev);
    }
+
 }

 static void
-elan_calibrate (FpiDeviceElan *self)
+elan_calibrate (FpDevice *dev)
 {
+  FpiDeviceElan *self = FPI_DEVICE_ELAN (dev);
+
  G_DEBUG_HERE ();

  elan_dev_reset_state (self);
+  self->calib_atts_left = ELAN_CALIBRATION_ATTEMPTS;

-  g_return_if_fail (!self->active);
-  self->active = TRUE;
-  self->calib_atts_left = ELAN_CALIBRATION_ATTEMPTS (self->dev_type);
-
-  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (self), calibrate_run_state,
+  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (dev), calibrate_run_state,
                             CALIBRATE_NUM_STATES);
-
  fpi_ssm_start (ssm, calibrate_complete);
 }

@@ -902,7 +890,6 @@ elan_activate (FpImageDevice *dev)
  FpiSsm *ssm =
    fpi_ssm_new (FP_DEVICE (dev), activate_run_state,
                 ACTIVATE_NUM_STATES);
-
  fpi_ssm_start (ssm, activate_complete);
 }

@@ -960,18 +947,94 @@ dev_activate (FpImageDevice *dev)
 }

 static void
-dev_change_state (FpImageDevice *dev, FpiImageDeviceState state)
+elan_change_state (FpImageDevice *idev)
+{
+  FpDevice *dev = FP_DEVICE (idev);
+  FpiDeviceElan *self = FPI_DEVICE_ELAN (dev);
+  FpImageDeviceState next_state = self->dev_state_next;
+
+  if (self->dev_state == next_state)
+    {
+      fp_dbg ("already in %d", next_state);
+      return;
+    }
+  else
+    {
+      fp_dbg ("changing to %d", next_state);
+    }
+
+  switch (next_state)
+    {
+    case FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON:
+      /* activation completed or another enroll stage started */
+      self->dev_state = FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON;
+      elan_calibrate (dev);
+      break;
+
+    case FP_IMAGE_DEVICE_STATE_CAPTURE:
+      /* not used */
+      break;
+
+    case FP_IMAGE_DEVICE_STATE_INACTIVE:
+    case FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF:
+      elan_stop_capture (dev);
+      break;
+    }
+}
+
+static void
+elan_change_state_async (FpDevice *dev,
+                         void     *data)
+{
+  g_message ("state change dev: %p", dev);
+  elan_change_state (FP_IMAGE_DEVICE (dev));
+}
+
+static void
+dev_change_state (FpImageDevice *dev, FpImageDeviceState state)
 {
  FpiDeviceElan *self = FPI_DEVICE_ELAN (dev);
+  GSource *timeout;

  G_DEBUG_HERE ();

-  /* Note: We always calibrate even if that may not be needed always.
-   * Doing this for each capture appears to make it at least less likely for
-   * devices to end up in a bad state.
-   */
-  if (state == FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON)
-    elan_calibrate (self);
+  /* Inactive and await finger off are equivalent for the elan driver. */
+  if (state == FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF)
+    state = FP_IMAGE_DEVICE_STATE_INACTIVE;
+
+  if (self->dev_state_next == state)
+    fp_dbg ("change to state %d already queued", state);
+
+  switch (state)
+    {
+    case FP_IMAGE_DEVICE_STATE_INACTIVE:
+    case FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON:
+    case FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF: {
+        char *name;
+
+        /* schedule state change instead of calling it directly to allow all actions
+         * related to the previous state to complete */
+        self->dev_state_next = state;
+        timeout = fpi_device_add_timeout (FP_DEVICE (dev), 10,
+                                          elan_change_state_async,
+                                          NULL, NULL);
+
+        name = g_strdup_printf ("dev_change_state to %d", state);
+        g_source_set_name (timeout, name);
+        g_free (name);
+
+        break;
+      }
+
+    case FP_IMAGE_DEVICE_STATE_CAPTURE:
+      /* TODO MAYBE: split capture ssm into smaller ssms and use this state */
+      self->dev_state = state;
+      self->dev_state_next = state;
+      break;
+
+    default:
+      g_assert_not_reached ();
+    }
 }

 static void
@@ -981,14 +1044,19 @@ dev_deactivate (FpImageDevice *dev)

  G_DEBUG_HERE ();

-  if (!self->active)
-    /* The device is inactive already, complete the operation immediately. */
-    fpi_image_device_deactivate_complete (dev, NULL);
+  if (self->dev_state == FP_IMAGE_DEVICE_STATE_INACTIVE)
+    {
+      /* The device is inactive already, complete the operation immediately. */
+      fpi_image_device_deactivate_complete (dev, NULL);
+    }
  else
-    /* The device is not yet inactive, flag that we are deactivating (and
-     * need to signal back deactivation).
-     * Note that any running capture will be cancelled already if needed. */
-    self->deactivating = TRUE;
+    {
+      /* The device is not yet inactive, flag that we are deactivating (and
+       * need to signal back deactivation) and then ensure we will change
+       * to the inactive state eventually. */
+      self->deactivating = TRUE;
+      dev_change_state (dev, FP_IMAGE_DEVICE_STATE_INACTIVE);
+    }
 }

 static void
@@ -18,7 +18,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __ELAN_H
+#define __ELAN_H

 #include <glib.h>

@@ -31,7 +32,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 +45,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
@@ -73,9 +71,6 @@
 #define ELAN_CMD_TIMEOUT 10000
 #define ELAN_FINGER_TIMEOUT 200

-G_DECLARE_FINAL_TYPE (FpiDeviceElan, fpi_device_elan, FPI, DEVICE_ELAN,
-                      FpImageDevice);
-
 struct elan_cmd
 {
  unsigned char  cmd[ELAN_CMD_LEN];
@@ -216,14 +211,7 @@ static const FpIdEntry elan_id_table[] = {
  {.vid = ELAN_VEND_ID,  .pid = 0x0c31, .driver_data = ELAN_ALL_DEV},
  {.vid = ELAN_VEND_ID,  .pid = 0x0c32, .driver_data = ELAN_ALL_DEV},
  {.vid = ELAN_VEND_ID,  .pid = 0x0c33, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c3d, .driver_data = ELAN_ALL_DEV},
  {.vid = ELAN_VEND_ID,  .pid = 0x0c42, .driver_data = ELAN_0C42},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c4b, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c4d, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c4f, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c63, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c6e, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c58, .driver_data = ELAN_0C58},
  {.vid = 0,  .pid = 0,  .driver_data = 0},
 };

@@ -231,8 +219,10 @@ static void elan_cmd_done (FpiSsm *ssm);
 static void elan_cmd_read (FpiSsm   *ssm,
                           FpDevice *dev);

-static void elan_calibrate (FpiDeviceElan *self);
-static void elan_capture (FpiDeviceElan *self);
+static void elan_calibrate (FpDevice *dev);
+static void elan_capture (FpDevice *dev);

-static void dev_change_state (FpImageDevice      *dev,
-                              FpiImageDeviceState state);
+static void dev_change_state (FpImageDevice     *dev,
+                              FpImageDeviceState state);
+
+#endif
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2021 Elan Microelectronics
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include "fpi-device.h"
-#include "fpi-ssm.h"
-#include <libusb.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-G_DECLARE_FINAL_TYPE (FpiDeviceElanmoc, fpi_device_elanmoc, FPI, DEVICE_ELANMOC, FpDevice)
-
-#define ELAN_MOC_DRIVER_FULLNAME "Elan MOC Sensors"
-#define ELAN_M0C_CMD_LEN 0x3
-#define ELAN_EP_CMD_OUT (0x1 | LIBUSB_ENDPOINT_OUT)
-#define ELAN_EP_CMD_IN (0x3 | LIBUSB_ENDPOINT_IN)
-#define ELAN_EP_MOC_CMD_IN (0x4 | LIBUSB_ENDPOINT_IN)
-#define ELAN_EP_IMG_IN (0x2 | LIBUSB_ENDPOINT_IN)
-
-#define ELAN_MOC_CMD_TIMEOUT 5000
-#define ELAN_MOC_CAL_RETRY 500
-#define ELAN_MOC_ENROLL_TIMES 9
-#define ELAN_MAX_USER_ID_LEN 92
-#define ELAN_MAX_ENROLL_NUM 9
-
-#define ELAN_MSG_VERIFY_ERR 0xfd
-#define ELAN_MSG_DIRTY 0xfb
-#define ELAN_MSG_AREA_NOT_ENOUGH 0xfe
-#define ELAN_MSG_TOO_HIGH 0x41
-#define ELAN_MSG_TOO_LEFT 0x42
-#define ELAN_MSG_TOO_LOW 0x43
-#define ELAN_MSG_TOO_RIGHT 0x44
-#define ELAN_MSG_OK 0x00
-
-#define ELAN_MAX_HDR_LEN 3
-#define ELAN_USERDATE_SIZE (ELAN_MAX_USER_ID_LEN + 3)
-
-#define ELAN_MSG_DRIVER_VERSION "1004"
-
-struct elanmoc_cmd
-{
-  unsigned char cmd_header[ELAN_MAX_HDR_LEN];
-  int           cmd_len;
-  int           resp_len;
-};
-
-static const struct elanmoc_cmd fw_ver_cmd = {
-  .cmd_header = {0x40, 0x19},
-  .cmd_len = 2,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd sensor_dim_cmd = {
-  .cmd_header = {0x00, 0x0c},
-  .cmd_len = 2,
-  .resp_len = 4,
-};
-
-static const struct elanmoc_cmd cal_status_cmd = {
-  .cmd_header = {0x40, 0xff, 0x00},
-  .cmd_len = 3,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd enrolled_number_cmd = {
-  .cmd_header = {0x40, 0xff, 0x04},
-  .cmd_len = 3,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_verify_cmd = {
-  .cmd_header = {0x40, 0xff, 0x73},
-  .cmd_len = 5,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_above_cmd = {
-  .cmd_header = {0x40, 0xff, 0x02},
-  .cmd_len = 3,
-  .resp_len = 0,
-};
-
-static const struct elanmoc_cmd elanmoc_enroll_cmd = {
-  .cmd_header = {0x40, 0xff, 0x01},
-  .cmd_len = 7,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_delete_cmd = {
-  .cmd_header = {0x40, 0xff, 0x13},
-  .cmd_len = 128,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_enroll_commit_cmd = {
-  .cmd_header = {0x40, 0xff, 0x11},
-  .cmd_len = 128,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_remove_all_cmd = {
-  .cmd_header = {0x40, 0xff, 0x98},
-  .cmd_len = 3,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_get_userid_cmd = {
-  .cmd_header = {0x43, 0x21, 0x00},
-  .cmd_len = 3,
-  .resp_len = 97,
-};
-
-static const struct elanmoc_cmd elanmoc_set_mod_cmd = {
-  .cmd_header = {0x40, 0xff, 0x14},
-  .cmd_len = 4,
-  .resp_len = 2,
-};
-
-static const struct elanmoc_cmd elanmoc_check_reenroll_cmd = {
-  .cmd_header = {0x40, 0xff, 0x22},
-  .cmd_len = 3 + ELAN_USERDATE_SIZE,
-  .resp_len = 2,
-};
-
-typedef void (*ElanCmdMsgCallback) (FpiDeviceElanmoc *self,
-                                    GError           *error);
-
-enum moc_enroll_states {
-  MOC_ENROLL_GET_ENROLLED_NUM,
-  MOC_ENROLL_REENROLL_CHECK,
-  MOC_ENROLL_WAIT_FINGER,
-  MOC_ENROLL_COMMIT_RESULT,
-  MOC_ENROLL_NUM_STATES,
-};
-
-enum moc_list_states {
-  MOC_LIST_GET_ENROLLED,
-  MOC_LIST_GET_FINGER,
-  MOC_LIST_NUM_STATES,
-};
-
-enum delete_states {
-  DELETE_SEND_CMD,
-  DELETE_NUM_STATES,
-};
-
-enum dev_init_states {
-  DEV_WAIT_READY,
-  DEV_SET_MODE,
-  DEV_GET_VER,
-  DEV_GET_DIM,
-  DEV_GET_ENROLLED,
-  DEV_INIT_STATES,
-};
-
-enum dev_exit_states {
-  DEV_EXIT_ABOVE,
-  DEV_EXIT_STATES,
-};
-
-struct _FpiDeviceElanmoc
-{
-  FpDevice        parent;
-  FpiSsm         *task_ssm;
-  FpiSsm         *cmd_ssm;
-  FpiUsbTransfer *cmd_transfer;
-  gboolean        cmd_cancelable;
-  gsize           cmd_len_in;
-  unsigned short  fw_ver;
-  unsigned char   x_trace;
-  unsigned char   y_trace;
-  int             num_frames;
-  int             curr_enrolled;
-  int             max_moc_enroll_time;
-  int             cancel_result;
-  int             cmd_retry_cnt;
-  int             list_index;
-  GPtrArray      *list_result;
-};
@@ -1,384 +0,0 @@
-/*
- * Elan SPI driver for libfprint
- *
- * Copyright (C) 2021 Matthew Mirvish <matthew@mm12.xyz>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include <config.h>
-
-#ifndef HAVE_UDEV
-#error "elanspi requires udev"
-#endif
-
-#include <fp-device.h>
-#include <fpi-device.h>
-
-#define ELANSPI_TP_PID 0x04f3
-
-/* Sensor ID information copied from the windows driver */
-
-struct elanspi_sensor_entry
-{
-  unsigned char sensor_id, height, width, ic_version;
-  gboolean      is_otp_model;
-  const gchar * name;
-};
-
-static const struct elanspi_sensor_entry elanspi_sensor_table[] = {
-  {0x0, 0x78, 0x78, 0x0, 0x0, "eFSA120S"},
-  {0x1, 0x78, 0x78, 0x1, 0x1, "eFSA120SA"},
-  {0x2, 0xA0, 0xA0, 0x0, 0x0, "eFSA160S"},
-  {0x3, 0xd0, 0x50, 0x0, 0x0, "eFSA820R"},
-  {0x4, 0xC0, 0x38, 0x0, 0x0, "eFSA519R"},
-  {0x5, 0x60, 0x60, 0x0, 0x0, "eFSA96S"},
-  {0x6, 0x60, 0x60, 0x1, 0x1, "eFSA96SA"},
-  {0x7, 0x60, 0x60, 0x2, 0x1, "eFSA96SB"},
-  {0x8, 0xa0, 0x50, 0x1, 0x1, "eFSA816RA"},
-  {0x9, 0x90, 0x40, 0x1, 0x1, "eFSA614RA"},
-  {0xA, 0x90, 0x40, 0x2, 0x1, "eFSA614RB"},
-  {0xB, 0x40, 0x58, 0x1, 0x1, "eFSA688RA"},
-  {0xC, 0x50, 0x50, 0x1, 0x0, "eFSA80SA"},
-  {0xD, 0x47, 0x80, 0x1, 0x1, "eFSA712RA"},
-  {0xE, 0x50, 0x50, 0x2, 0x0, "eFSA80SC"},
-  {0,   0,    0,    0,   0,   NULL}
-};
-
-struct elanspi_reg_entry
-{
-  unsigned char addr, value;
-  /* terminates with 0xFF, 0xFF since register 0x0 is valid */
-};
-
-struct elanspi_regtable
-{
-  const struct elanspi_reg_entry *other;
-  struct
-  {
-    unsigned char                   sid;
-    const struct elanspi_reg_entry *table;
-  } entries[];
-};
-
-static const struct elanspi_reg_entry elanspi_calibration_table_default[] = {
-  {0x05, 0x60},
-  {0x06, 0xc0},
-  {0x07, 0x80},
-  {0x08, 0x04},
-  {0x0a, 0x97},
-  {0x0b, 0x72},
-  {0x0c, 0x69},
-  {0x0f, 0x2a},
-  {0x11, 0x2a},
-  {0x13, 0x27},
-  {0x15, 0x67},
-  {0x18, 0x04},
-  {0x21, 0x20},
-  {0x22, 0x36},
-  {0x2a, 0x5f},
-  {0x2b, 0xc0},
-  {0x2e, 0xff},
-
-  {0xff, 0xff}
-};
-
-static const struct elanspi_reg_entry elanspi_calibration_table_id6[] = {
-  {0x2A, 0x07},
-  {0x1,  0x00},
-  {0x2,  0x5f},
-  {0x3,  0x00},
-  {0x4,  0x5f},
-  {0x5,  0x60},
-  {0x6,  0xC0},
-  {0x7,  0x80},
-  {0x8,  0x04},
-  {0xA,  0x97},
-  {0xB,  0x72},
-  {0xC,  0x69},
-  {0xF,  0x2A},
-  {0x11, 0x2A},
-  {0x13, 0x27},
-  {0x15, 0x67},
-  {0x18, 0x04},
-  {0x21, 0x20},
-  {0x22, 0x36},
-  {0x29, 0x02},
-  {0x2A, 0x03},
-  {0x2A, 0x5F},
-  {0x2B, 0xC0},
-  {0x2C, 0x10},
-  {0x2E, 0xFF},
-
-  {0xff, 0xff}
-};
-
-static const struct elanspi_reg_entry elanspi_calibration_table_id57[] = {
-  {0x2A, 0x07},
-  {0x5,  0x60},
-  {0x6,  0xC0},
-  {0x7,  0x80},
-  {0x8,  0x04},
-  {0xA,  0x97},
-  {0xB,  0x72},
-  {0xC,  0x69},
-  {0xF,  0x2A},
-  {0x11, 0x2A},
-  {0x13, 0x27},
-  {0x15, 0x67},
-  {0x18, 0x04},
-  {0x21, 0x20},
-  {0x22, 0x36},
-  {0x2A, 0x5F},
-  {0x2B, 0xC0},
-  {0x2E, 0xFF},
-
-  {0xff, 0xff}
-};
-
-static const struct elanspi_reg_entry elanspi_calibration_table_id0[] = {
-  {0x5,  0x60},
-  {0x6,  0xC0},
-  {0x8,  0x04},
-  {0xA,  0x97},
-  {0xB,  0x72},
-  {0xC,  0x69},
-  {0xF,  0x2B},
-  {0x11, 0x2B},
-  {0x13, 0x28},
-  {0x15, 0x28},
-  {0x18, 0x04},
-  {0x21, 0x20},
-  {0x2A, 0x4B},
-
-  {0xff, 0xff}
-};
-
-// old style sensor calibration, with only one page of registers
-static const struct elanspi_regtable elanspi_calibration_table_old = {
-  .other = elanspi_calibration_table_default,
-  .entries = {
-    { .sid = 0x0, .table = elanspi_calibration_table_id0 },
-    { .sid = 0x5, .table = elanspi_calibration_table_id57 },
-    { .sid = 0x6, .table = elanspi_calibration_table_id6 },
-    { .sid = 0x7, .table = elanspi_calibration_table_id57 },
-    { .sid = 0x0, .table = NULL }
-  }
-};
-
-// new style sensor calibration, with two pages of registers
-static const struct elanspi_reg_entry elanspi_calibration_table_page0_id14[] = {
-  {0x00, 0x5a},
-  {0x01, 0x00},
-  {0x02, 0x4f},
-  {0x03, 0x00},
-  {0x04, 0x4f},
-  {0x05, 0xa0},
-  {0x06, 0x00},
-  {0x07, 0x00},
-  {0x08, 0x00},
-  {0x09, 0x04},
-  {0x0a, 0x74},
-  {0x0b, 0x05},
-  {0x0c, 0x08},
-  {0x0d, 0x00},
-  {0x0e, 0x00},
-  {0x0f, 0x14},
-  {0x10, 0x3c},
-  {0x11, 0x41},
-  {0x12, 0x0c},
-  {0x13, 0x00},
-  {0x14, 0x00},
-  {0x15, 0x04},
-  {0x16, 0x02},
-  {0x17, 0x00},
-  {0x18, 0x01},
-  {0x19, 0xf4},
-  {0x1a, 0x00},
-  {0x1b, 0x00},
-  {0x1c, 0x00},
-  {0x1d, 0x00},
-  {0x1e, 0x00},
-  {0x1f, 0x00},
-  {0x20, 0x00},
-  {0x21, 0x80},
-  {0x22, 0x06},
-  {0x23, 0x00},
-  {0x24, 0x00},
-  {0x25, 0x00},
-  {0x26, 0x00},
-  {0x27, 0x00},
-  {0x28, 0x00},
-  {0x29, 0x04},
-  {0x2a, 0x5f},
-  {0x2b, 0xe2},
-  {0x2c, 0xa0},
-  {0x2d, 0x00},
-  {0x2e, 0xff},
-  {0x2f, 0x40},
-  {0x30, 0x01},
-  {0x31, 0x38},
-  {0x32, 0x00},
-  {0x33, 0x00},
-  {0x34, 0x00},
-  {0x35, 0x1f},
-  {0x36, 0xff},
-  {0x37, 0x00},
-  {0x38, 0x00},
-  {0x39, 0x00},
-  {0x3a, 0x00},
-  {0xff, 0xff}
-};
-
-static const struct elanspi_reg_entry elanspi_calibration_table_page1_id14[] = {
-  {0x00, 0x7b},
-  {0x01, 0x7f},
-  {0x02, 0x77},
-  {0x03, 0xd4},
-  {0x04, 0x7d},
-  {0x05, 0x19},
-  {0x06, 0x80},
-  {0x07, 0x40},
-  {0x08, 0x11},
-  {0x09, 0x00},
-  {0x0a, 0x00},
-  {0x0b, 0x14},
-  {0x0c, 0x00},
-  {0x0d, 0x00},
-  {0x0e, 0x32},
-  {0x0f, 0x02},
-  {0x10, 0x08},
-  {0x11, 0x6c},
-  {0x12, 0x00},
-  {0x13, 0x00},
-  {0x14, 0x32},
-  {0x15, 0x01},
-  {0x16, 0x16},
-  {0x17, 0x01},
-  {0x18, 0x14},
-  {0x19, 0x01},
-  {0x1a, 0x16},
-  {0x1b, 0x01},
-  {0x1c, 0x17},
-  {0x1d, 0x01},
-  {0x1e, 0x0a},
-  {0x1f, 0x01},
-  {0x20, 0x0a},
-  {0x21, 0x02},
-  {0x22, 0x08},
-  {0x23, 0x29},
-  {0x24, 0x00},
-  {0x25, 0x0c},
-  {0x26, 0x1a},
-  {0x27, 0x30},
-  {0x28, 0x1a},
-  {0x29, 0x30},
-  {0x2a, 0x00},
-  {0x2b, 0x00},
-  {0x2c, 0x01},
-  {0x2d, 0x16},
-  {0x2e, 0x01},
-  {0x2f, 0x17},
-  {0x30, 0x03},
-  {0x31, 0x2d},
-  {0x32, 0x03},
-  {0x33, 0x2d},
-  {0x34, 0x14},
-  {0x35, 0x00},
-  {0x36, 0x00},
-  {0x37, 0x00},
-  {0x38, 0x00},
-  {0x39, 0x03},
-  {0x3a, 0xfe},
-  {0x3b, 0x00},
-  {0x3c, 0x00},
-  {0x3d, 0x02},
-  {0x3e, 0x00},
-  {0x3f, 0x00},
-  {0xff, 0xff}
-};
-
-static const struct elanspi_regtable elanspi_calibration_table_new_page0 = {
-  .other = NULL,
-  .entries = {
-    { .sid = 0xe, .table = elanspi_calibration_table_page0_id14 },
-    { .sid = 0x0, .table = NULL }
-  }
-};
-
-static const struct elanspi_regtable elanspi_calibration_table_new_page1 = {
-  .other = NULL,
-  .entries = {
-    { .sid = 0xe, .table = elanspi_calibration_table_page1_id14 },
-    { .sid = 0x0, .table = NULL }
-  }
-};
-
-#define ELANSPI_NO_ROTATE 0
-#define ELANSPI_90LEFT_ROTATE 1
-#define ELANSPI_180_ROTATE 2
-#define ELANSPI_90RIGHT_ROTATE 3
-
-#define ELANSPI_HV_FLIPPED 1
-
-#define ELANSPI_UDEV_TYPES FPI_DEVICE_UDEV_SUBTYPE_SPIDEV | FPI_DEVICE_UDEV_SUBTYPE_HIDRAW
-#define ELANSPI_TP_VID 0x04f3
-
-// using checkargs ACPI:HIDPID
-static const FpIdEntry elanspi_id_table[] = {
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 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},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN70A1", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x30b2}, .driver_data = ELANSPI_NO_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x309f}, .driver_data = ELANSPI_180_ROTATE},
-  {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x241f}, .driver_data = ELANSPI_NO_ROTATE},
-  {.udev_types = 0}
-};
-
-#define ELANSPI_MAX_OLD_STAGE1_CALIBRATION_MEAN 1000
-
-#define ELANSPI_MIN_OLD_STAGE2_CALBIRATION_MEAN 3000
-#define ELANSPI_MAX_OLD_STAGE2_CALBIRATION_MEAN 8000
-
-#define ELANSPI_HV_CALIBRATION_TARGET_MEAN 3000
-
-#define ELANSPI_MIN_EMPTY_INVALID_PERCENT 6
-#define ELANSPI_MAX_REAL_INVALID_PERCENT 3
-
-#define ELANSPI_MIN_REAL_STDDEV (592 * 592)
-#define ELANSPI_MAX_EMPTY_STDDEV (350 * 350)
-
-#define ELANSPI_MIN_FRAMES_DEBOUNCE 2
-
-#define ELANSPI_SWIPE_FRAMES_DISCARD 1
-#define ELANSPI_MIN_FRAMES_SWIPE (7 + ELANSPI_SWIPE_FRAMES_DISCARD)
-#define ELANSPI_MAX_FRAMES_SWIPE (20 + ELANSPI_SWIPE_FRAMES_DISCARD)
-
-#define ELANSPI_MAX_FRAME_HEIGHT 43
-#define ELANSPI_MIN_FRAME_TO_FRAME_DIFF (250 * 250)
-
-#define ELANSPI_HV_SENSOR_FRAME_DELAY 23
-
-#define ELANSPI_OTP_TIMEOUT_USEC (12 * 1000)
-
-#define ELANSPI_OLD_CAPTURE_TIMEOUT_USEC (100 * 1000)
-#define ELANSPI_HV_CAPTURE_TIMEOUT_USEC (50 * 1000)
@@ -859,29 +859,21 @@ m_capture_state (FpiSsm *ssm, FpDevice *dev)
        }
      else
        {
+          FpImage *img;
+          unsigned int img_size;
          /* Remove empty parts 2 times for the 2 frames */
          process_removefpi_end (self);
          process_removefpi_end (self);
-
-          if (self->fp_height >= FE_WIDTH)
-            {
-              FpImage *img = fp_image_new (FE_WIDTH, self->fp_height);
-              unsigned int img_size = self->fp_height * FE_WIDTH;
-
-              /* Images received are white on black, so invert it. */
-              /* TODO detect sweep direction */
-              img->flags = FPI_IMAGE_COLORS_INVERTED | FPI_IMAGE_V_FLIPPED;
-              img->height = self->fp_height;
-              process_4to8_bpp (self->fp, img_size / 2, img->data);
-              fp_dbg ("Sending the raw fingerprint image (%dx%d)",
-                      img->width, img->height);
-              fpi_image_device_image_captured (idev, img);
-            }
-          else
-            {
-              fpi_image_device_retry_scan (idev, FP_DEVICE_RETRY_TOO_SHORT);
-            }
-
+          img_size = self->fp_height * FE_WIDTH;
+          img = fp_image_new (FE_WIDTH, self->fp_height);
+          /* Images received are white on black, so invert it. */
+          /* TODO detect sweep direction */
+          img->flags = FPI_IMAGE_COLORS_INVERTED | FPI_IMAGE_V_FLIPPED;
+          img->height = self->fp_height;
+          process_4to8_bpp (self->fp, img_size / 2, img->data);
+          fp_dbg ("Sending the raw fingerprint image (%dx%d)",
+                  img->width, img->height);
+          fpi_image_device_image_captured (idev, img);
          fpi_image_device_report_finger_status (idev, FALSE);
          fpi_ssm_mark_completed (ssm);
        }
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2021 Focaltech Microelectronics
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include "fpi-device.h"
-#include "fpi-ssm.h"
-#include <libusb.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-G_DECLARE_FINAL_TYPE (FpiDeviceFocaltechMoc, fpi_device_focaltech_moc, FPI, DEVICE_FOCALTECH_MOC, FpDevice)
-
-#define FOCALTECH_MOC_DRIVER_FULLNAME "Focaltech MOC Sensors"
-
-#define FOCALTECH_MOC_CMD_TIMEOUT 1000
-#define FOCALTECH_MOC_MAX_FINGERS 10
-#define FOCALTECH_MOC_UID_PREFIX_LENGTH 8
-#define FOCALTECH_MOC_USER_ID_LENGTH 64
-
-typedef void (*FocaltechCmdMsgCallback) (FpiDeviceFocaltechMoc *self,
-                                         GError                *error);
-
-struct _FpiDeviceFocaltechMoc
-{
-  FpDevice        parent;
-  FpiSsm         *task_ssm;
-  FpiSsm         *cmd_ssm;
-  FpiUsbTransfer *cmd_transfer;
-  gboolean        cmd_cancelable;
-  gsize           cmd_len_in;
-  int             num_frames;
-  int             delete_slot;
-  guint8          bulk_in_ep;
-  guint8          bulk_out_ep;
-};
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2022 Fingerprint Cards AB <tech@fingerprints.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include "fpi-device.h"
-#include "fpi-ssm.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define TEMPLATE_ID_SIZE (32)
-#define MAX_FW_VERSION_STR_LEN (16)
-#define FPC_CMD_INIT (0x01)
-#define FPC_CMD_ARM (0x02)
-#define FPC_CMD_ABORT (0x03)
-#define FPC_CMD_INDICATE_S_STATE (0x08)
-#define FPC_CMD_GET_IMG (0x09)
-#define FPC_CMD_GET_KPI (0x0C)
-#define FPC_CMD_LOAD_DB (0x60)
-#define FPC_CMD_STORE_DB (0x61)
-#define FPC_CMD_DELETE_DB (0x62)
-#define FPC_CMD_DELETE_TEMPLATE (0x63)
-#define FPC_CMD_BEGIN_ENROL (0x67)
-#define FPC_CMD_ENROL (0x68)
-#define FPC_CMD_END_ENROL (0x69)
-#define FPC_CMD_BIND_IDENTITY (0x6A)
-#define FPC_CMD_IDENTIFY (0x6B)
-#define FPC_CMD_ENUM (0x70)
-#define FPC_EVT_INIT_RESULT (0x02)
-#define FPC_EVT_FINGER_DWN (0x06)
-#define FPC_EVT_IMG (0x08)
-#define FPC_EVT_FID_DATA (0x31)
-#define FPC_DB_ID_LEN (16)
-#define FPC_IDENTITY_TYPE_WILDCARD (0x1)
-#define FPC_IDENTITY_TYPE_RESERVED (0x3)
-#define FPC_IDENTITY_WILDCARD (0x25066282)
-#define FPC_SUBTYPE_ANY (0xFF)
-#define FPC_SUBTYPE_RESERVED (0xF5)
-#define FPC_SUBTYPE_NOINFORMATION (0x00)
-#define FPC_CAPTUREID_RESERVED (0x701100F)
-#define FPC_SESSIONID_RESERVED (0x0077FF12)
-#define FPC_TEMPLATES_MAX (10)
-#define SECURITY_MAX_SID_SIZE (68)
-#define FPC_HOST_MS_S0 (0x10)
-#define FPC_HOST_MS_SX (0x11)
-
-G_DECLARE_FINAL_TYPE (FpiDeviceFpcMoc, fpi_device_fpcmoc, FPI,
-                      DEVICE_FPCMOC, FpDevice);
-
-typedef struct _FPC_FID_DATA
-{
-  guint32 identity_type;
-  guint32 reserved;
-  guint32 identity_size;
-  guint32 subfactor;
-  guint8  data[SECURITY_MAX_SID_SIZE];
-} FPC_FID_DATA, *PFPC_FID_DATA;
-
-typedef struct _FPC_LOAD_DB
-{
-  gint32  status;
-  guint32 reserved;
-  guint32 database_id_size;
-  guint8  data[FPC_DB_ID_LEN];
-} FPC_LOAD_DB, *PFPC_LOAD_DB;
-
-typedef union _FPC_DELETE_DB
-{
-  guint32 reserved;
-  guint32 database_id_size;
-  guint8  data[FPC_DB_ID_LEN];
-} FPC_DB_OP, *PFPC_DB_OP;
-
-typedef struct _FPC_BEGIN_ENROL
-{
-  gint32  status;
-  guint32 reserved1;
-  guint32 reserved2;
-} FPC_BEGIN_ENROL, *PFPC_BEGIN_ENROL;
-
-typedef struct _FPC_ENROL
-{
-  gint32  status;
-  guint32 remaining;
-} FPC_ENROL, *PFPC_ENROL;
-
-typedef struct _FPC_END_ENROL
-{
-  gint32  status;
-  guint32 fid;
-} FPC_END_ENROL, *PFPC_END_ENROL;
-
-typedef struct _FPC_IDENTIFY
-{
-  gint32  status;
-  guint32 identity_type;
-  guint32 identity_offset;
-  guint32 identity_size;
-  guint32 subfactor;
-  guint8  data[SECURITY_MAX_SID_SIZE];
-} FPC_IDENTIFY, *PFPC_IDENTIFY;
-
-typedef struct
-{
-  guint32 cmdid;
-  guint32 length;
-  guint32 status;
-} evt_hdr_t;
-
-typedef struct
-{
-  evt_hdr_t hdr;
-  guint16   sensor;
-  guint16   hw_id;
-  guint16   img_w;
-  guint16   img_h;
-  guint8    fw_version[MAX_FW_VERSION_STR_LEN];
-  guint16   fw_capabilities;
-} evt_initiated_t;
-
-typedef struct
-{
-  guint8  subfactor;
-  guint32 identity_type;
-  guint32 identity_size;
-  guint8  identity[SECURITY_MAX_SID_SIZE];
-} __attribute__((packed)) fpc_fid_data_t;
-
-typedef struct
-{
-  evt_hdr_t      hdr;
-  gint           status;
-  guint32        num_ids;
-  fpc_fid_data_t fid_data[FPC_TEMPLATES_MAX];
-} __attribute__((packed)) evt_enum_fids_t;
-
-typedef struct _fp_cmd_response
-{
-  union
-  {
-    evt_hdr_t       evt_hdr;
-    evt_initiated_t evt_inited;
-    evt_enum_fids_t evt_enum_fids;
-  };
-} fpc_cmd_response_t, *pfpc_cmd_response_t;
-
-enum {
-  FPC_ENROL_STATUS_COMPLETED = 0,
-  FPC_ENROL_STATUS_PROGRESS = 1,
-  FPC_ENROL_STATUS_FAILED_COULD_NOT_COMPLETE = 2,
-  FPC_ENROL_STATUS_FAILED_ALREADY_ENROLED = 3,
-  FPC_ENROL_STATUS_IMAGE_LOW_COVERAGE = 4,
-  FPC_ENROL_STATUS_IMAGE_TOO_SIMILAR = 5,
-  FPC_ENROL_STATUS_IMAGE_LOW_QUALITY = 6,
-};
-
-typedef enum {
-  FPC_CMDTYPE_UNKNOWN = 0,
-  FPC_CMDTYPE_TO_DEVICE,
-  FPC_CMDTYPE_TO_DEVICE_EVTDATA,
-  FPC_CMDTYPE_FROM_DEVICE,
-} FpcCmdType;
-
-typedef enum {
-  FPC_CMD_SEND = 0,
-  FPC_CMD_GET_DATA,
-  FPC_CMD_SUSPENDED,
-  FPC_CMD_RESUME,
-  FPC_CMD_NUM_STATES,
-} FpcCmdState;
-
-typedef enum {
-  FPC_INIT = 0,
-  FPC_INIT_LOAD_DB,
-  FPC_INIT_NUM_STATES,
-} FpcInitState;
-
-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;
-
-typedef enum {
-  FPC_VERIFY_CAPTURE = 0,
-  FPC_VERIFY_GET_IMG,
-  FPC_VERIFY_IDENTIFY,
-  FPC_VERIFY_CANCEL,
-  FPC_VERIFY_NUM_STATES,
-} FpcVerifyState;
-
-typedef enum {
-  FPC_CLEAR_DELETE_DB = 0,
-  FPC_CLEAR_CREATE_DB,
-  FPC_CLEAR_NUM_STATES,
-} FpClearState;
@@ -1,64 +0,0 @@
-/*
- * Goodix Moc driver for libfprint
- * Copyright (C) 2019 Shenzhen Goodix Technology Co., Ltd.
- *
- * 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 (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;
-
-
-typedef enum {
-  GOODIX_INIT_VERSION = 0,
-  GOODIX_INIT_CONFIG,
-  GOODIX_INIT_TEMPLATE_LIST,
-  GOODIX_INIT_RESET_DEVICE,
-  GOODIX_INIT_NUM_STATES,
-} GoodixInitState;
-
-
-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;
-
-typedef enum {
-  GOODIX_VERIFY_PWR_BTN_SHIELD_ON = 0,
-  GOODIX_VERIFY_CAPTURE,
-  GOODIX_VERIFY_IDENTIFY,
-  GOODIX_VERIFY_WAIT_FINGER_UP,
-  GOODIX_VERIFY_PWR_BTN_SHIELD_OFF,
-  GOODIX_VERIFY_NUM_STATES,
-} GoodixVerifyState;
@@ -1,511 +0,0 @@
-/*
- * Goodix Moc driver for libfprint
- * Copyright (C) 2019 Shenzhen Goodix Technology Co., Ltd.
- *
- * 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 <glib.h>
-#include <stdint.h>
-
-#include "goodix_proto.h"
-
-/*
- *  Crc functions
- */
-
-#define WIDTH (8 * sizeof (uint32_t))
-#define FINAL_XOR_VALUE 0xFFFFFFFF
-#define REFLECT_DATA(X)         ((uint8_t) reflect ((X), 8))
-#define REFLECT_REMAINDER(X)    ((unsigned int) reflect ((X), WIDTH))
-
-
-uint8_t
-gx_proto_crc8_calc (uint8_t *lubp_date, uint32_t lui_len)
-{
-  const uint8_t *data = lubp_date;
-  unsigned int crc = 0;
-  int i, j;
-
-  for (j = lui_len; j; j--, data++)
-    {
-      crc ^= (*data << 8);
-      for (i = 8; i; i--)
-        {
-          if (crc & 0x8000)
-            crc ^= (0x1070 << 3);
-          crc <<= 1;
-        }
-    }
-
-  crc >>= 8;
-  crc = ~crc;
-  return (uint8_t) crc;
-}
-
-typedef struct
-{
-  uint32_t crc;
-} gf_crc32_context;
-
-static uint32_t s_crc_table[256] =
-{ 0x0,         0x4c11db7,  0x9823b6e,  0xd4326d9, 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
-  0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
-  0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
-  0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
-  0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
-  0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
-  0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
-  0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
-  0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
-  0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x18aeb13,   0x54bf6a4,  0x808d07d,  0xcc9cdca,
-  0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
-  0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
-  0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
-  0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
-  0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
-  0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
-  0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
-  0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
-  0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
-  0x315d626,  0x7d4cb91,  0xa97ed48,  0xe56f0ff, 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
-  0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
-  0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
-  0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
-  0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
-  0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
-  0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
-  0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30, 0x29f3d35,  0x65e2082,   0xb1d065b,  0xfdc1bec,
-  0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
-  0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
-  0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
-  0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
-  0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
-
-static uint32_t
-reflect (uint32_t data, uint8_t n_bits)
-{
-  unsigned long reflection = 0x00000000;
-  uint8_t bit;
-
-  /*
-   * Reflect the data about the center bit.
-   */
-  for (bit = 0; bit < n_bits; ++bit)
-    {
-      /*
-       * If the LSB bit is set, set the reflection of it.
-       */
-      if (data & 0x01)
-        reflection |= (1LU << ((n_bits - 1) - bit));
-
-      data = (data >> 1);
-    }
-
-  return reflection;
-
-}
-
-static void
-crc32_init (gf_crc32_context *ctx)
-{
-  ctx->crc = 0xFFFFFFFF;
-}
-
-static void
-crc32_update (gf_crc32_context *ctx, const uint8_t *message, uint32_t n_bytes)
-{
-  uint8_t data;
-  uint32_t byte;
-
-  /*
-   * Divide the message by the polynomial, a byte at a time.
-   */
-  for (byte = 0; byte < n_bytes; ++byte)
-    {
-      data = REFLECT_DATA (message[byte]) ^ (ctx->crc >> (WIDTH - 8));
-      ctx->crc = s_crc_table[data] ^ (ctx->crc << 8);
-    }
-}
-
-static void
-crc32_final (gf_crc32_context *ctx, uint8_t *md)
-{
-  uint32_t crc = 0;
-
-  ctx->crc = (REFLECT_REMAINDER (ctx->crc) ^ FINAL_XOR_VALUE);
-  crc = GUINT32_TO_LE (ctx->crc);
-  memcpy (md, &crc, 4);
-}
-
-uint8_t
-gx_proto_crc32_calc (uint8_t *pchMsg, uint32_t wDataLen, uint8_t *pchMsgDst)
-{
-  gf_crc32_context context = { 0 };
-
-  if (!pchMsg)
-    return 0;
-
-  crc32_init (&context);
-
-  crc32_update (&context, pchMsg, wDataLen);
-
-  crc32_final (&context, pchMsgDst);
-
-
-  return 1;
-}
-/*
- *  protocol
- *
- */
-
-static uint8_t dump_seq = 0;
-
-static void
-init_pack_header (
-  ppack_header pheader,
-  uint16_t     len,
-  uint16_t     cmd,
-  uint8_t      packagenum
-                 )
-{
-  g_assert (pheader);
-
-  memset (pheader, 0, sizeof (*pheader));
-  pheader->cmd0 = HIBYTE (cmd);
-  pheader->cmd1 = LOBYTE (cmd);
-  pheader->packagenum = packagenum;
-  pheader->reserved = dump_seq++;
-  pheader->len = GUINT16_TO_LE (len + PACKAGE_CRC_SIZE);
-  pheader->crc8 = gx_proto_crc8_calc ((uint8_t *) pheader, 6);
-  pheader->rev_crc8 = ~pheader->crc8;
-}
-
-
-int
-gx_proto_build_package (uint8_t       *ppackage,
-                        uint32_t      *package_len,
-                        uint16_t       cmd,
-                        const uint8_t *payload,
-                        uint32_t       payload_size)
-{
-  pack_header header;
-
-  if (!ppackage || !package_len)
-    return -1;
-
-  if(*package_len < (payload_size + PACKAGE_HEADER_SIZE + PACKAGE_CRC_SIZE))
-    return -1;
-
-  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;
-
-  gx_proto_crc32_calc (ppackage, PACKAGE_HEADER_SIZE + payload_size, ppackage + PACKAGE_HEADER_SIZE + payload_size);
-
-  return 0;
-}
-
-
-int
-gx_proto_parse_header (FpiByteReader *reader,
-                       pack_header   *pheader)
-{
-  if (!pheader)
-    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);
-
-  pheader->len -= PACKAGE_CRC_SIZE;
-
-  return 0;
-}
-
-static int
-gx_proto_parse_fingerid (FpiByteReader     *reader,
-                         ptemplate_format_t template)
-{
-  uint8_t byte;
-  const uint8_t *buffer;
-
-  if (!template)
-    return -1;
-
-  if (!fpi_byte_reader_get_uint8 (reader, &byte) || byte != 67)
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_uint8 (reader, &template->type))
-    g_return_val_if_reached (-1);
-
-  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 (reader, sizeof (template->accountid), &buffer))
-    g_return_val_if_reached (-1);
-
-  memcpy (template->accountid, buffer, sizeof (template->accountid));
-
-  if (!fpi_byte_reader_get_data (reader, sizeof (template->tid), &buffer))
-    g_return_val_if_reached (-1);
-
-  memcpy (template->tid, buffer, sizeof (template->tid));
-
-  if (!fpi_byte_reader_get_uint8 (reader, &template->payload.size))
-    g_return_val_if_reached (-1);
-
-  if (!fpi_byte_reader_get_data (reader, template->payload.size, &buffer))
-    g_return_val_if_reached (-1);
-
-  memcpy (template->payload.data, buffer, template->payload.size);
-
-  return 0;
-}
-
-int
-gx_proto_parse_body (uint16_t cmd, FpiByteReader *byte_reader, pgxfp_cmd_response_t presp)
-{
-  if (!presp)
-    return -1;
-
-  if (!fpi_byte_reader_get_uint8 (byte_reader, &presp->result))
-    g_return_val_if_reached (-1);
-
-  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);
-      }
-      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;
-
-        if (fpi_byte_reader_skip (byte_reader, 1))
-          fpi_byte_reader_get_uint8 (byte_reader,
-                                     &presp->finger_config.max_stored_prints);
-      }
-      break;
-
-    case MOC_CMD0_COMMITENROLLMENT:
-    case MOC_CMD0_DELETETEMPLATE:
-      /* just check result */
-      break;
-
-    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");
-      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));
-      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);
-        }
-      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);
-      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);
-      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 (!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);
-        }
-      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);
-
-      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,
-                                       &presp->finger_list_resp.finger_list[num]) != 0)
-            {
-              g_warning ("Failed to parse finger list");
-              g_return_val_if_reached (-1);
-            }
-        }
-      break;
-
-    case MOC_CMD0_IDENTIFY:
-      {
-        uint32_t score = 0;
-        uint8_t study = 0;
-        uint16_t fingerid_size = 0;
-
-        presp->verify.match = (presp->result == 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)
-              {
-                presp->result = GX_FAILED;
-                break;
-              }
-            g_debug ("match, score: %d, study: %d", score, study);
-          }
-      }
-      break;
-
-    case MOC_CMD0_FINGER_MODE:
-      presp->finger_status.status = presp->result;
-      break;
-
-    default:
-      break;
-    }
-
-  return 0;
-}
-
-static uint8_t sensor_config[26] = {
-  0x00, 0x00, 0x64, 0x50, 0x0f, 0x41, 0x08, 0x0a, 0x18, 0x00, 0x00, 0x23, 0x00,
-  0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x05, 0x05
-};
-
-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));
-
-  //NOTICE: Do not change any value!
-  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, (uint8_t *) &crc32_calc);
-
-  memcpy (pconfig->crc_value, &crc32_calc, PACKAGE_CRC_SIZE);
-
-  return 0;
-}
@@ -1,251 +0,0 @@
-/*
- * Goodix Moc driver for libfprint
- * Copyright (C) 2019 Shenzhen Goodix Technology Co., Ltd.
- *
- * 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 <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "fpi-byte-reader.h"
-
-#define PACKAGE_CRC_SIZE (4)
-#define PACKAGE_HEADER_SIZE (8)
-
-#define FP_MAX_FINGERNUM (20)
-
-#define TEMPLATE_ID_SIZE (32)
-
-#define GX_VERSION_LEN (8)
-
-/* Type covert */
-#define MAKE_CMD_EX(cmd0, cmd1)    ((uint16_t) (((cmd0) << 8) | (cmd1)))
-#define LOBYTE(value) ((uint8_t) (value))
-#define HIBYTE(value) ((uint8_t) (((uint16_t) (value) >> 8) & 0xFF))
-
-
-/* Error code */
-#define GX_SUCCESS 0x00
-#define GX_FAILED 0x80
-#define GX_ERROR_FINGER_ID_NOEXIST 0x9C
-#define GX_ERROR_TEMPLATE_INCOMPLETE 0xB8
-#define GX_ERROR_WAIT_FINGER_UP_TIMEOUT 0xC7
-#define GX_ERROR_NO_AVAILABLE_SPACE 0x8F
-
-/* Command Type Define */
-#define RESPONSE_PACKAGE_CMD 0xAA
-
-#define MOC_CMD0_ENROLL 0xA0
-#define MOC_CMD0_ENROLL_INIT 0xA1
-#define MOC_CMD0_CAPTURE_DATA 0xA2
-#define MOC_CMD0_CHECK4DUPLICATE 0xA3
-#define MOC_CMD0_COMMITENROLLMENT 0xA4
-
-#define MOC_CMD0_IDENTIFY 0xA5
-#define MOC_CMD0_GETFINGERLIST 0xA6
-#define MOC_CMD0_DELETETEMPLATE 0xA7
-
-#define MOC_CMD1_DEFAULT 0x00
-#define MOC_CMD1_UNTIL_DOWN 0x00
-#define MOC_CMD1_WHEN_DOWN 0x01
-
-#define MOC_CMD1_DELETE_TEMPLATE 0x04
-#define MOC_CMD1_DELETE_ALL 0x01
-
-#define MOC_CMD0_GET_VERSION 0xD0
-
-#define MOC_CMD0_UPDATE_CONFIG 0xC0
-#define MOC_CMD1_NWRITE_CFG_TO_FLASH 0x00
-#define MOC_CMD1_WRITE_CFG_TO_FLASH 0x01
-
-#define MOC_CMD0_FINGER_MODE 0xB0
-#define MOC_CMD1_GET_FINGER_MODE 0x00
-#define MOC_CMD1_SET_FINGER_DOWN 0x01
-#define MOC_CMD1_SET_FINGER_UP 0x02
-
-#define MOC_CMD0_PWR_BTN_SHIELD 0xE0
-#define MOC_CMD1_PWR_BTN_SHIELD_OFF 0x00
-#define MOC_CMD1_PWR_BTN_SHIELD_ON 0x01
-
-/* */
-
-typedef struct _gxfp_version_info
-{
-  uint8_t format[2];
-  uint8_t fwtype[GX_VERSION_LEN];
-  uint8_t fwversion[GX_VERSION_LEN];
-  uint8_t customer[GX_VERSION_LEN];
-  uint8_t mcu[GX_VERSION_LEN];
-  uint8_t sensor[GX_VERSION_LEN];
-  uint8_t algversion[GX_VERSION_LEN];
-  uint8_t interface[GX_VERSION_LEN];
-  uint8_t protocol[GX_VERSION_LEN];
-  uint8_t flashVersion[GX_VERSION_LEN];
-  uint8_t reserved[38];
-} gxfp_version_info_t, *pgxfp_version_info_t;
-
-
-typedef struct _gxfp_parse_msg
-{
-  uint8_t ack_cmd;
-  bool    has_no_config;
-} gxfp_parse_msg_t, *pgxfp_parse_msg_t;
-
-
-typedef struct _gxfp_enroll_create
-{
-  uint8_t tid[TEMPLATE_ID_SIZE];
-} gxfp_enroll_create_t, *pgxfp_enroll_create_t;
-
-#pragma pack(push, 1)
-typedef struct _template_format
-{
-  uint8_t _0x43_byte;
-  uint8_t type;
-  uint8_t finger_index;
-  uint8_t pad0;
-  uint8_t accountid[32];
-  uint8_t tid[32];
-  struct
-  {
-    uint8_t size;
-    uint8_t data[56];
-  } payload;
-  uint8_t reserve[2];
-} template_format_t, *ptemplate_format_t;
-
-#pragma pack(pop)
-
-
-typedef struct _gxfp_verify
-{
-  bool     match;
-  uint16_t rejectdetail;
-  template_format_t  template;
-} gxfp_verify_t, *pgxfp_verify_t;
-
-
-typedef struct _gxfp_capturedata
-{
-  uint8_t img_quality;
-  uint8_t img_coverage;
-} gxfp_capturedata_t, *pgxfp_capturedata_t;
-
-typedef struct _gxfp_check_duplicate
-{
-  bool duplicate;
-  template_format_t  template;
-} gxfp_check_duplicate_t, *pgxfp_check_duplicate_t;
-
-
-typedef struct _gxfp_enroll_update
-{
-  bool    rollback;
-  uint8_t img_overlay;
-  uint8_t img_preoverlay;
-} gxfp_enroll_update_t, *Pgxfp_enroll_update_t;
-
-typedef struct _gxfp_enum_fingerlist
-{
-  uint8_t           finger_num;
-  template_format_t finger_list[FP_MAX_FINGERNUM];
-} gxfp_enum_fingerlist_t, *pgxfp_enum_fingerlist_t;
-
-typedef struct _gxfp_enroll_commit
-{
-  uint8_t result;
-} gxfp_enroll_commit_t, *pgxfp_enroll_commit_t;
-
-typedef struct _fp_finger_status
-{
-  uint8_t status;
-} fp_finger_status_t, *pfp_finger_status_t;
-
-typedef struct _fp_finger_config
-{
-  uint8_t status;
-  uint8_t max_stored_prints;
-} fp_finger_config_t, *pfp_finger_config_t;
-
-typedef struct _fp_pwr_btn_shield
-{
-  uint8_t resp_cmd1;
-} fp_pwr_btn_shield_t, *pfp_pwr_btn_shield_t;
-
-typedef struct _fp_cmd_response
-{
-  uint8_t result;
-  union
-  {
-    gxfp_parse_msg_t       parse_msg;
-    gxfp_verify_t          verify;
-    gxfp_enroll_create_t   enroll_create;
-    gxfp_capturedata_t     capture_data_resp;
-    gxfp_check_duplicate_t check_duplicate_resp;
-    gxfp_enroll_commit_t   enroll_commit;
-    gxfp_enroll_update_t   enroll_update;
-    gxfp_enum_fingerlist_t finger_list_resp;
-    gxfp_version_info_t    version_info;
-    fp_finger_status_t     finger_status;
-    fp_finger_config_t     finger_config;
-    fp_pwr_btn_shield_t    power_button_shield_resp;
-  };
-} gxfp_cmd_response_t, *pgxfp_cmd_response_t;
-
-
-typedef struct _pack_header
-{
-  uint8_t  cmd0;
-  uint8_t  cmd1;
-  uint8_t  packagenum;
-  uint8_t  reserved;
-  uint16_t len;
-  uint8_t  crc8;
-  uint8_t  rev_crc8;
-} pack_header, *ppack_header;
-
-
-typedef struct _gxfp_sensor_cfg
-{
-  uint8_t config[26];
-  uint8_t reserved[98];
-  uint8_t crc_value[4];
-} gxfp_sensor_cfg_t, *pgxfp_sensor_cfg_t;
-/* */
-
-int gx_proto_build_package (uint8_t       *ppackage,
-                            uint32_t      *package_len,
-                            uint16_t       cmd,
-                            const uint8_t *payload,
-                            uint32_t       payload_size);
-
-int gx_proto_parse_header (FpiByteReader *reader,
-                           pack_header   *pheader);
-
-int gx_proto_parse_body (uint16_t             cmd,
-                         FpiByteReader       *byte_reader,
-                         pgxfp_cmd_response_t presponse);
-
-int gx_proto_init_sensor_config (pgxfp_sensor_cfg_t pconfig);
-
-uint8_t gx_proto_crc8_calc (uint8_t *lubp_date,
-                            uint32_t lui_len);
-
-uint8_t gx_proto_crc32_calc (uint8_t *pchMsg,
-                             uint32_t wDataLen,
-                             uint8_t *pchMsgDst);
@@ -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_VERIFY_PWR_BTN_SHIELD_ON = 0,
-  MAPF_VERIFY_TEMPLATE_TABLE,
-  MAPF_VERIFY_GET_STARTUP_RESULT,
-  MAPF_VERIFY_GET_IMAGE,
-  MAPF_VERIFY_CHECK_INT_PARA,
-  MAPF_VERIFY_DETECT_MODE,
-  MAPF_VERIFY_ENABLE_INT,
-  MAPF_VERIFY_WAIT_INT,
-  MAPF_VERIFY_DISBALE_INT,
-  MAPF_VERIFY_REFRESH_INT_PARA,
-  MAPF_VERIFY_GENERATE_FEATURE,
-  MAPF_VERIFY_SEARCH_STEP, //match assigned id
-  MAPF_VERIFY_GET_TEMPLATE_INFO,
-  MAPF_VERIFY_EXIT,
-  MAPF_VERIFY_STATES,
-} MapfVerifyState;
-
-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;
@@ -1,445 +0,0 @@
-/*
- * Next Biometrics driver for libfprint
- *
- * Copyright (C) 2021 Huan Wang <fredwanghuan@gmail.com>
- * Copyright (C) 2011-2012 Andrej Krutak <dev@andree.sk>
- *
- * 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 "nb1010"
-#include "fpi-log.h"
-
-#include "drivers_api.h"
-
-#define FRAME_HEIGHT 180
-#define FRAME_WIDTH 256
-
-#define NB1010_EP_OUT 0x02 | FPI_USB_ENDPOINT_OUT
-#define NB1010_EP_IN 0x03 | FPI_USB_ENDPOINT_IN
-
-#define NB1010_SENSITIVITY_BIT 12
-
-#define NB1010_CMD_RECV_LEN 16
-#define NB1010_CAPTURE_RECV_LEN 540
-#define NB1010_CAPTURE_HEADER_LEN 25
-
-#define NB1010_LINE_PER_PARTIAL 2
-#define NB1010_N_PARTIAL (FRAME_HEIGHT / NB1010_LINE_PER_PARTIAL)
-
-#define NB1010_DEFAULT_TIMEOUT 500
-#define NB1010_TRANSITION_DELAY 50
-
-/* Loop ssm states */
-enum {
-  M_WAIT_PRINT,
-  M_REQUEST_PRINT,
-  M_CHECK_PRINT,
-  M_READ_PRINT_PRESTART,
-  M_READ_PRINT_START,
-  M_READ_PRINT_POLL,
-  M_SUBMIT_PRINT,
-
-  /* Number of states */
-  M_LOOP_NUM_STATES,
-};
-
-/*
- * The Follow Commands are obtained by decoding the usbcap, so it does not expose all the command available to the device.
- * Known:
- * 1. every command starts with 0x80
- * 2. second byte is the comand, third byte is the seqence nubmer, init with rand, gets incremented
- *    everytime a new instruction is sent to the device. However device does not care or check the sequence, just echo back
- *    whatever chosen by the host.
- * 3. cmd: 0x07 check, expect [0x80, 0x29...] as response
- * 4. cmd: 0x16 ???, expect [0x80, 0x20...] as response. Happens during device init.
- * 5. cmd: 0x13 print device, expect [0x80, 0x23...] as response. Response contains the device string
- * 6. cmd: 0x38 check finger, expect [0x80, 0x37...] as response. The 14th byte indicate whether finger present [0-255]
- * 7. cmd: 0x0d ???, expect [0x80, 0x20...] as response. Happens before capture.
- * 8. cmd: 0x12 capture, expect [0x80, 0x20...] as response. After capture read 90 times in sequence to get all the frame.
- */
-
-static guint8 nb1010_cmd_check_finger[] = {
-  0x80, 0x38, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00,
-};
-
-/* pre capture, dont know what does it do, but appears everytime a capture begins */
-static guint8 nb1010_cmd_precapture[] = {
-  0x80, 0x0d, 0x03, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
-};
-
-static guint8 nb1010_cmd_capture[] = {
-  0x80, 0x12, 0x04, 0x00, 0x20, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-};
-
-struct _FpiDeviceNb1010
-{
-  FpImageDevice parent;
-  FpiSsm       *ssm;
-  guint8       *scanline_buf;
-  gboolean      deactivating;
-  int           partial_received;
-};
-G_DECLARE_FINAL_TYPE (FpiDeviceNb1010, fpi_device_nb1010, FPI, DEVICE_NB1010, FpImageDevice);
-G_DEFINE_TYPE (FpiDeviceNb1010, fpi_device_nb1010, FP_TYPE_IMAGE_DEVICE);
-
-static void
-nb1010_dev_init (FpImageDevice *dev)
-{
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (dev);
-  GError *error = NULL;
-
-  g_usb_device_claim_interface (fpi_device_get_usb_device (FP_DEVICE (dev)), 0, 0, &error);
-
-  self->scanline_buf = g_malloc0 (FRAME_WIDTH * FRAME_HEIGHT);
-
-  fpi_image_device_open_complete (dev, error);
-  fp_dbg ("nb1010 Initialized");
-}
-
-static void
-nb1010_dev_deinit (FpImageDevice *dev)
-{
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (dev);
-  GError *error = NULL;
-
-  g_clear_pointer (&self->scanline_buf, g_free);
-
-  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (dev)), 0, 0, &error);
-  fpi_image_device_close_complete (dev, error);
-  fp_dbg ("nb1010 Deinitialized");
-}
-
-static void
-nb1010_dev_activate (FpImageDevice *dev)
-{
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (dev);
-
-  self->deactivating = FALSE;
-
-  fpi_image_device_activate_complete (dev, NULL);
-  fp_dbg ("nb1010 Activated");
-}
-
-static void
-nb1010_dev_deactivated (FpImageDevice *dev, GError * err)
-{
-  fpi_image_device_deactivate_complete (dev, err);
-  fp_dbg ("nb1010 Deactivated");
-}
-
-static void
-nb1010_dev_deactivate (FpImageDevice *dev)
-{
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (dev);
-
-  self->deactivating = TRUE;
-  if (self->ssm == NULL)
-    nb1010_dev_deactivated (dev, NULL);
-}
-
-static void
-nb1010_request_fingerprint (FpiDeviceNb1010 *dev)
-{
-  FpiUsbTransfer *transfer = NULL;
-
-  transfer = fpi_usb_transfer_new (FP_DEVICE ( dev));
-  transfer->short_is_error = TRUE;
-  transfer->ssm = dev->ssm;
-
-  fpi_usb_transfer_fill_bulk_full (transfer, NB1010_EP_OUT,
-                                   nb1010_cmd_check_finger, G_N_ELEMENTS (nb1010_cmd_check_finger),
-                                   NULL);
-  fpi_usb_transfer_submit (transfer, NB1010_DEFAULT_TIMEOUT,
-                           fpi_device_get_cancellable (FP_DEVICE (dev)),
-                           fpi_ssm_usb_transfer_cb, NULL);
-}
-
-static void
-nb1010_check_fingerprint_cb (FpiUsbTransfer *transfer, FpDevice *dev,
-                             gpointer unused_data, GError *error)
-{
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (dev);
-
-  if (error)
-    {
-      fpi_ssm_mark_failed (transfer->ssm, error);
-      return;
-    }
-  if (self->deactivating)
-    {
-      fpi_ssm_mark_completed (transfer->ssm);
-      return;
-    }
-
-  if (transfer->buffer[NB1010_SENSITIVITY_BIT] > 0x30)
-    fpi_ssm_next_state (transfer->ssm);
-  else
-    fpi_ssm_jump_to_state (transfer->ssm, M_WAIT_PRINT);
-}
-
-static void
-nb1010_cmd_check_fingerprint (FpiDeviceNb1010 *dev)
-{
-  FpiUsbTransfer *transfer = NULL;
-
-  transfer = fpi_usb_transfer_new (FP_DEVICE ( dev));
-  transfer->short_is_error = TRUE;
-  transfer->ssm = dev->ssm;
-
-  fpi_usb_transfer_fill_bulk (transfer, NB1010_EP_IN, NB1010_CMD_RECV_LEN);
-  fpi_usb_transfer_submit (transfer, NB1010_DEFAULT_TIMEOUT,
-                           fpi_device_get_cancellable (FP_DEVICE (dev)),
-                           nb1010_check_fingerprint_cb, NULL);
-}
-
-static void
-nb1010_read_ignore_data_cb (FpiUsbTransfer *transfer, FpDevice *dev,
-                            gpointer unused_data, GError *error)
-{
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (dev);
-  FpiUsbTransfer *new_transfer = NULL;
-
-  if (error)
-    {
-      fpi_ssm_mark_failed (transfer->ssm, error);
-      return;
-    }
-  if (self->deactivating)
-    {
-      fpi_ssm_mark_completed (transfer->ssm);
-      return;
-    }
-
-  new_transfer = fpi_usb_transfer_new ( dev );
-  new_transfer->short_is_error = TRUE;
-  new_transfer->ssm = transfer->ssm;
-
-  fpi_usb_transfer_fill_bulk (new_transfer, NB1010_EP_IN, NB1010_CMD_RECV_LEN);
-  fpi_usb_transfer_submit (new_transfer, NB1010_DEFAULT_TIMEOUT,
-                           fpi_device_get_cancellable (FP_DEVICE (dev)),
-                           fpi_ssm_usb_transfer_cb, NULL);
-}
-
-static void
-nb1010_write_ignore_read (FpiDeviceNb1010 *dev, guint8 *buf, gsize len)
-{
-  FpiUsbTransfer *transfer = NULL;
-
-  transfer = fpi_usb_transfer_new (FP_DEVICE ( dev));
-  transfer->short_is_error = TRUE;
-  transfer->ssm = dev->ssm;
-
-  fpi_usb_transfer_fill_bulk_full (transfer, NB1010_EP_OUT, buf, len, NULL);
-  fpi_usb_transfer_submit (transfer, NB1010_DEFAULT_TIMEOUT,
-                           fpi_device_get_cancellable (FP_DEVICE (dev)),
-                           nb1010_read_ignore_data_cb, NULL);
-}
-
-
-static void
-nb1010_read_capture_cb (FpiUsbTransfer *transfer, FpDevice *dev,
-                        gpointer unused_data, GError *error)
-{
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (dev);
-
-  if (error)
-    {
-      fpi_ssm_mark_failed (transfer->ssm, error);
-      return;
-    }
-  if (self->deactivating)
-    {
-      fpi_ssm_mark_completed (transfer->ssm);
-      return;
-    }
-
-  g_assert (transfer->actual_length == NB1010_CAPTURE_RECV_LEN);
-
-  size_t offset = self->partial_received * NB1010_LINE_PER_PARTIAL * FRAME_WIDTH;
-
-  memcpy (self->scanline_buf + offset,
-          transfer->buffer + NB1010_CAPTURE_HEADER_LEN, NB1010_LINE_PER_PARTIAL * FRAME_WIDTH);
-
-  self->partial_received++;
-  if (self->partial_received == NB1010_N_PARTIAL)
-    {
-      fpi_ssm_next_state (transfer->ssm);
-      return;
-    }
-
-  fpi_usb_transfer_submit (fpi_usb_transfer_ref (transfer), NB1010_DEFAULT_TIMEOUT,
-                           fpi_device_get_cancellable (FP_DEVICE (dev)),
-                           nb1010_read_capture_cb, NULL);
-}
-
-static void
-nb1010_read_capture (FpiDeviceNb1010 *dev)
-{
-  FpiUsbTransfer *transfer = NULL;
-
-  transfer = fpi_usb_transfer_new ( FP_DEVICE ( dev));
-  transfer->short_is_error = TRUE;
-  transfer->ssm = dev->ssm;
-
-  fpi_usb_transfer_fill_bulk (transfer, NB1010_EP_IN, NB1010_CAPTURE_RECV_LEN);
-  fpi_usb_transfer_submit (transfer, NB1010_DEFAULT_TIMEOUT,
-                           fpi_device_get_cancellable (FP_DEVICE (dev)),
-                           nb1010_read_capture_cb, NULL);
-}
-
-static int
-submit_image (FpiSsm        *ssm,
-              FpImageDevice *dev)
-{
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (dev);
-  FpImage *img;
-
-  img = fp_image_new (FRAME_WIDTH, FRAME_HEIGHT);
-  if (img == NULL)
-    return 0;
-
-  memcpy (img->data, self->scanline_buf, FRAME_WIDTH * FRAME_HEIGHT);
-  fpi_image_device_image_captured (dev, img);
-
-  return 1;
-}
-
-static void
-m_loop_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)
-{
-  fp_dbg ("nb1010 ssm complete cb");
-
-  FpImageDevice *dev = FP_IMAGE_DEVICE (_dev);
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (_dev);
-
-  self->ssm = NULL;
-
-  if (self->deactivating)
-    nb1010_dev_deactivated (dev, error);
-  else if (error != NULL)
-    fpi_image_device_session_error (dev, error);
-}
-
-static void
-m_loop_state (FpiSsm *ssm, FpDevice *_dev)
-{
-  FpImageDevice *dev = FP_IMAGE_DEVICE (_dev);
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (_dev);
-
-  if (self->deactivating)
-    {
-      fp_dbg ("deactivating, marking completed");
-      fpi_ssm_mark_completed (ssm);
-      return;
-    }
-
-  switch (fpi_ssm_get_cur_state (ssm))
-    {
-    case M_WAIT_PRINT:
-      /* Wait fingerprint scanning */
-      fpi_ssm_next_state_delayed (ssm, NB1010_TRANSITION_DELAY);
-      break;
-
-    case M_REQUEST_PRINT:
-      nb1010_request_fingerprint (self);
-      break;
-
-    case M_CHECK_PRINT:
-      nb1010_cmd_check_fingerprint (self);
-      break;
-
-    case M_READ_PRINT_PRESTART:
-      fpi_image_device_report_finger_status (dev, TRUE);
-      nb1010_write_ignore_read (self, nb1010_cmd_precapture, G_N_ELEMENTS (nb1010_cmd_precapture));
-      break;
-
-    case M_READ_PRINT_START:
-      self->partial_received = 0;
-      nb1010_write_ignore_read (self, nb1010_cmd_capture, G_N_ELEMENTS (nb1010_cmd_capture));
-      break;
-
-    case M_READ_PRINT_POLL:
-      nb1010_read_capture (self);
-      break;
-
-    case M_SUBMIT_PRINT:
-      if (submit_image (ssm, dev))
-        {
-          fpi_ssm_mark_completed (ssm);
-          fpi_image_device_report_finger_status (dev, FALSE);
-        }
-      else
-        {
-          fpi_ssm_jump_to_state (ssm, M_WAIT_PRINT);
-        }
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-}
-
-static void
-nb1010_dev_change_state (FpImageDevice *dev, FpiImageDeviceState state)
-{
-  FpiDeviceNb1010 *self = FPI_DEVICE_NB1010 (dev);
-  FpiSsm *ssm_loop;
-
-  if (state == FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON)
-    {
-      ssm_loop = fpi_ssm_new (FP_DEVICE (dev), m_loop_state, M_LOOP_NUM_STATES);
-      self->ssm = ssm_loop;
-      fpi_ssm_start (ssm_loop, m_loop_complete);
-    }
-}
-
-
-static const FpIdEntry id_table[] = {
-  { .vid = 0x298d,  .pid = 0x1010, },
-  { .vid = 0,  .pid = 0,  .driver_data = 0 },
-};
-
-static void
-fpi_device_nb1010_init (FpiDeviceNb1010 *self)
-{
-}
-
-static void
-fpi_device_nb1010_class_init (FpiDeviceNb1010Class *klass)
-{
-  FpDeviceClass *dev_class = FP_DEVICE_CLASS (klass);
-  FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_CLASS (klass);
-
-  dev_class->id = FP_COMPONENT;
-  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;
-
-  img_class->img_height = FRAME_HEIGHT;
-  img_class->img_width = FRAME_WIDTH;
-
-  img_class->bz3_threshold = 24;
-
-  img_class->img_open = nb1010_dev_init;
-  img_class->img_close = nb1010_dev_deinit;
-  img_class->activate = nb1010_dev_activate;
-  img_class->deactivate = nb1010_dev_deactivate;
-  img_class->change_state = nb1010_dev_change_state;
-}
@@ -1,246 +0,0 @@
-/*
- * Copyright (C) 2022-2023 Realtek Corp.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include "fpi-device.h"
-#include "fpi-ssm.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#define EP_IN (2 | FPI_USB_ENDPOINT_IN)
-#define EP_OUT (1 | FPI_USB_ENDPOINT_OUT)
-
-#define EP_IN_MAX_BUF_SIZE 2048
-
-#define FP_RTK_CMD_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 SUBFACTOR_OFFSET 2
-#define UID_OFFSET 3
-#define UID_PAYLOAD_LEN_DEFAULT 32
-
-/* Command transfer timeout :ms*/
-#define CMD_TIMEOUT 1000
-#define DATA_TIMEOUT 5000
-#define STATUS_TIMEOUT 2000
-
-#define MAX_ENROLL_SAMPLES 8
-#define DEFAULT_UID_LEN 28
-#define SUB_FINGER_01 0xFF
-
-#define GET_BULK_CMD_TYPE(val)              ((val & 0xC0) >> 6)
-#define GET_TRANS_DATA_LEN(len_h, len_l)    ((len_h << 8) | len_l)
-#define GET_LEN_L(total_data_len)           ((total_data_len) & 0xff)
-#define GET_LEN_H(total_data_len)           ((total_data_len) >> 8)
-
-G_DECLARE_FINAL_TYPE (FpiDeviceRealtek, fpi_device_realtek, FPI, DEVICE_REALTEK, FpDevice)
-
-typedef void (*SynCmdMsgCallback) (FpiDeviceRealtek *self,
-                                   uint8_t          *buffer_in,
-                                   GError           *error);
-
-typedef struct
-{
-  SynCmdMsgCallback callback;
-} CommandData;
-
-typedef enum {
-  FP_RTK_CMD_BULK_ONLY = 0,
-  FP_RTK_CMD_BULK_READ,
-  FP_RTK_CMD_BULK_WRITE,
-} FpRtkCmdType;
-
-typedef enum {
-  FP_RTK_MSG_DEFAULT = 0,
-  FP_RTK_MSG_NO_STATUS,
-} FpRtkMsgType;
-
-typedef enum {
-  FP_RTK_PURPOSE_VERIFY   = 0x01,
-  FP_RTK_PURPOSE_IDENTIFY = 0x02,
-  FP_RTK_PURPOSE_ENROLL   = 0x04,
-} FpRtkPurpose;
-
-typedef enum {
-  FP_RTK_SUCCESS = 0x0,
-  FP_RTK_TOO_HIGH,
-  FP_RTK_TOO_LOW,
-  FP_RTK_TOO_LEFT,
-  FP_RTK_TOO_RIGHT,
-  FP_RTK_TOO_FAST,
-  FP_RTK_TOO_SLOW,
-  FP_RTK_POOR_QUALITY,
-  FP_RTK_TOO_SKEWED,
-  FP_RTK_TOO_SHORT,
-  FP_RTK_MERGE_FAILURE,
-  FP_RTK_MATCH_FAIL,
-  FP_RTK_CMD_ERR,
-} FpRtkInStatus;
-
-typedef enum {
-  FP_RTK_ENROLL_GET_TEMPLATE = 0,
-  FP_RTK_ENROLL_BEGIN_POS,
-  FP_RTK_ENROLL_CAPTURE,
-  FP_RTK_ENROLL_FINISH_CAPTURE,
-  FP_RTK_ENROLL_ACCEPT_SAMPLE,
-  FP_RTK_ENROLL_CHECK_DUPLICATE,
-  FP_RTK_ENROLL_COMMIT,
-  FP_RTK_ENROLL_CANCEL_CAPTURE,
-  FP_RTK_ENROLL_NUM_STATES,
-} FpRtkEnrollState;
-
-typedef enum {
-  FP_RTK_VERIFY_GET_TEMPLATE = 0,
-  FP_RTK_VERIFY_CAPTURE,
-  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;
-
-typedef enum {
-  FP_RTK_DELETE_GET_POS = 0,
-  FP_RTK_DELETE_PRINT,
-  FP_RTK_DELETE_NUM_STATES,
-} FpRtkDeleteState;
-
-typedef enum {
-  FP_RTK_INIT_GET_DEVICE_INFO = 0,
-  FP_RTK_INIT_SELECT_OS,
-  FP_RTK_INIT_GET_ENROLL_NUM,
-  FP_RTK_INIT_NUM_STATES,
-} FpRtkInitState;
-
-typedef enum {
-  FP_RTK_CMD_SEND = 0,
-  FP_RTK_CMD_TRANS_DATA,
-  FP_RTK_CMD_GET_STATUS,
-  FP_RTK_CMD_NUM_STATES,
-} FpRtkCmdState;
-
-struct _FpiDeviceRealtek
-{
-  FpDevice        parent;
-  FpiSsm         *task_ssm;
-  FpiSsm         *cmd_ssm;
-  FpiUsbTransfer *cmd_transfer;
-  FpiUsbTransfer *data_transfer;
-  gint            cmd_type;
-  FpRtkMsgType    message_type;
-  gboolean        cmd_cancellable;
-  gint            enroll_stage;
-  gint            max_enroll_stage;
-  guchar         *read_data;
-  gsize           trans_data_len;
-  FpRtkPurpose    fp_purpose;
-  gint            pos_index;
-  gint            template_num;
-  gint            template_len;
-};
-
-struct rtk_cmd_bulk
-{
-  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];
-};
-
-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 = {
-  .cmd = {0x05, 0x05},
-};
-
-static struct rtk_cmd_bulk co_finish_capture = {
-  .cmd = {0x45, 0x06},
-  .data_len = {0x05},
-};
-
-static struct rtk_cmd_bulk co_accept_sample = {
-  .cmd = {0x45, 0x08},
-  .data_len = {0x09},
-};
-
-static struct rtk_cmd_bulk nor_identify_feature = {
-  .cmd = {0x45, 0x22},
-  .data_len = {0x2A},
-};
-
-static struct rtk_cmd_bulk co_get_enroll_num = {
-  .cmd = {0x45, 0x0d},
-  .data_len = {0x02},
-};
-
-static struct rtk_cmd_bulk co_get_template = {
-  .cmd = {0x45, 0x0E},
-};
-
-static struct rtk_cmd_bulk nor_enroll_begin = {
-  .cmd = {0x05, 0x20},
-};
-
-static struct rtk_cmd_bulk co_check_duplicate = {
-  .cmd = {0x45, 0x10},
-  .data_len = {0x22},
-};
-
-static struct rtk_cmd_bulk nor_enroll_commit = {
-  .cmd = {0x85, 0x21},
-};
-
-static struct rtk_cmd_bulk co_update_template = {
-  .cmd = {0x05, 0x11},
-};
-
-static struct rtk_cmd_bulk co_delete_record = {
-  .cmd = {0x05, 0x0F},
-};
-
-static struct rtk_cmd_bulk co_select_system = {
-  .cmd = {0x05, 0x13},
-};
-
-static struct rtk_cmd_bulk co_cancel_capture = {
-  .cmd = {0x05, 0x07},
-};
@@ -17,7 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef _BMKT_H_
+#define _BMKT_H_

 /**< User ID maximum length allowed */
 #define BMKT_MAX_USER_ID_LEN 100
@@ -227,3 +228,5 @@ typedef struct bmkt_user_id
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* _BMKT_H_ */
@@ -206,7 +206,6 @@ parse_get_enrolled_users_report (bmkt_msg_resp_t *msg_resp, bmkt_response_t *res
  get_enroll_templates_resp->query_sequence = extract8 (msg_resp->payload, &offset);

  int n = 0;
-
  for (n = 0; n < BMKT_MAX_NUM_TEMPLATES_INTERNAL_FLASH; n++)
    {
      if (offset >= msg_resp->payload_len)
@@ -256,8 +255,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;

@@ -16,7 +16,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+
+#ifndef BMKT_MESSAGE_H_
+#define BMKT_MESSAGE_H_
+

 #define BMKT_MESSAGE_HEADER_ID 0xFE
 #define BMKT_MESSAGE_HEADER_LEN (4)
@@ -87,3 +90,4 @@ int bmkt_parse_message_header (uint8_t         *resp_buf,
                               bmkt_msg_resp_t *msg_resp);
 int bmkt_parse_message_payload (bmkt_msg_resp_t *msg_resp,
                                bmkt_response_t *resp);
+#endif /* BMKT_MESSAGE_H_ */
@@ -17,7 +17,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+
+#ifndef _BMKT_RESPONSE_H_
+#define _BMKT_RESPONSE_H_

 #include "bmkt.h"

@@ -316,7 +318,7 @@ typedef struct bmkt_init_resp
 */
 typedef struct bmkt_enroll_resp
 {
-  int     progress;                             /**< Shows current progress status [0-100] */
+  int     progress;                             /**< Shows current progress stutus [0-100] */
  uint8_t finger_id;                            /**< User's finger id [1-10] */
  uint8_t user_id[BMKT_MAX_USER_ID_LEN];        /**< User name to be enrolled */
 } bmkt_enroll_resp_t;
@@ -468,7 +470,6 @@ typedef union
  bmkt_del_all_users_resp_t    del_all_users_resp;
  bmkt_enroll_templates_resp_t enroll_templates_resp;
  bmkt_del_user_resp_t         del_user_resp;
-  bmkt_del_all_users_resp_t    del_all_user_resp;
  bmkt_enrolled_fingers_resp_t enrolled_fingers_resp;
 } bmkt_response_data_t;

@@ -484,3 +485,5 @@ typedef struct bmkt_response
  int                  complete;        /**< Operation completion status 1: complete / 0: not completed */
  bmkt_response_data_t response;        /**< Operation specific response union */
 } bmkt_response_t;
+
+#endif /* _BMKT_RESPONSE_H_ */
@@ -16,7 +16,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef _SENSOR_H_
+#define _SENSOR_H_

 #include "usb_transport.h"
 #define BMKT_MAX_PENDING_SESSIONS 2
@@ -83,3 +84,4 @@ int bmkt_sensor_handle_response (bmkt_sensor_t   *sensor,
                                 bmkt_msg_resp_t *msg_resp);

 int bmkt_sensor_send_async_read_command (bmkt_sensor_t *sensor);
+#endif /* _SENSOR_H_ */
@@ -16,7 +16,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __synaptics_h__
+#define __synaptics_h__

 #include "fpi-device.h"
 #include "fpi-ssm.h"
@@ -93,8 +94,6 @@ typedef enum {
  SYNAPTICS_CMD_WAIT_INTERRUPT,
  SYNAPTICS_CMD_SEND_ASYNC,
  SYNAPTICS_CMD_RESTART,
-  SYNAPTICS_CMD_SUSPENDED,
-  SYNAPTICS_CMD_RESUME,
  SYNAPTICS_CMD_NUM_STATES,
 } SynapticsCmdState;

@@ -112,12 +111,11 @@ struct _FpiDeviceSynaptics
  FpiSsm               *cmd_ssm;
  FpiUsbTransfer       *cmd_pending_transfer;
  gboolean              cmd_complete_on_removal;
-  gboolean              cmd_suspended;
-  guint8                id_idx;
+  GError               *cmd_complete_error;
+  void                 *cmd_complete_data;

  bmkt_sensor_version_t mis_version;

-  gboolean              action_starting;
  GCancellable         *interrupt_cancellable;

  gint                  enroll_stage;
@@ -127,5 +125,6 @@ struct _FpiDeviceSynaptics

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

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

 #include <stdint.h>
@@ -47,11 +47,17 @@ enum {
 enum sonly_kill_transfers_action {
  NOT_KILLING = 0,

+  /* abort a SSM with an error code */
+  ABORT_SSM,
+
  /* report an image session error */
  IMG_SESSION_ERROR,

  /* iterate a SSM to the next state */
  ITERATE_SSM,
+
+  /* call a callback */
+  EXEC_CALLBACK,
 };

 enum sonly_fs {
@@ -74,24 +80,28 @@ struct _FpiDeviceUpeksonly
  FpiSsm       *loopsm;

  /* Do we really need multiple concurrent transfers? */
-  GCancellable  *img_cancellable;
-  GPtrArray     *img_transfers;
-  int            num_flying;
+  GCancellable                    *img_cancellable;
+  GPtrArray                       *img_transfers;
+  int                              num_flying;

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

-  int            wraparounds;
-  int            num_blank;
-  int            num_nonblank;
-  enum sonly_fs finger_state;
-  int            last_seqnum;
+  int                              wraparounds;
+  int                              num_blank;
+  int                              num_nonblank;
+  enum sonly_fs                    finger_state;
+  int                              last_seqnum;

  enum sonly_kill_transfers_action killing_transfers;
-  GError                   *kill_error;
-  FpiSsm                   *kill_ssm;
+  GError                          *kill_error;
+  union
+  {
+    FpiSsm *kill_ssm;
+    void    (*kill_cb)(FpImageDevice *dev);
+  };

  struct fpi_line_asmbl_ctx assembling_ctx;
 };
@@ -166,6 +176,11 @@ last_transfer_killed (FpImageDevice *dev)

  switch (self->killing_transfers)
    {
+    case ABORT_SSM:
+      fp_dbg ("abort ssm error %s", self->kill_error->message);
+      fpi_ssm_mark_failed (self->kill_ssm, g_steal_pointer (&self->kill_error));
+      return;
+
    case ITERATE_SSM:
      fp_dbg ("iterate ssm");
      fpi_ssm_next_state (self->kill_ssm);
@@ -176,7 +191,6 @@ last_transfer_killed (FpImageDevice *dev)
      fpi_image_device_session_error (dev, g_steal_pointer (&self->kill_error));
      return;

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

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

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

  g_slist_free_full (self->rows, g_free);
@@ -295,7 +309,7 @@ row_complete (FpImageDevice *dev)
          if (self->num_blank > FINGER_REMOVED_THRESHOLD)
            {
              self->finger_state = FINGER_REMOVED;
-              fp_dbg ("detected finger removal. Blank rows: %d, Full rows: %u",
+              fp_dbg ("detected finger removal. Blank rows: %d, Full rows: %lu",
                      self->num_blank, self->num_rows);
              handoff_img (dev);
              return;
@@ -517,14 +531,6 @@ img_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
      return;
    }

-  /* NOTE: The old code assume 4096 bytes are received each time
-   * but there is no reason we need to enforce that. However, we
-   * always need full lines. */
-  if (transfer->actual_length % 64 != 0)
-    error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                      "Data packets need to be multiple of 64 bytes, got %zi bytes",
-                                      transfer->actual_length);
-
  if (error)
    {
      fp_warn ("bad status %s, terminating session", error->message);
@@ -545,7 +551,7 @@ img_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
   * the first 2 bytes are a sequence number
   * then there are 62 bytes for image data
   */
-  for (i = 0; i + 64 <= transfer->actual_length; i += 64)
+  for (i = 0; i < 4096; i += 64)
    {
      if (!is_capturing (self))
        return;
@@ -554,7 +560,7 @@ img_data_cb (FpiUsbTransfer *transfer, FpDevice *device,

  if (is_capturing (self))
    {
-      fpi_usb_transfer_submit (fpi_usb_transfer_ref (transfer),
+      fpi_usb_transfer_submit (transfer,
                               0,
                               self->img_cancellable,
                               img_data_cb,
@@ -582,8 +588,6 @@ write_regs_finished (struct write_regs_data *wrdata, GError *error)
    fpi_ssm_next_state (wrdata->ssm);
  else
    fpi_ssm_mark_failed (wrdata->ssm, error);
-
-  g_free (wrdata);
 }

 static void write_regs_iterate (struct write_regs_data *wrdata);
@@ -630,9 +634,9 @@ write_regs_iterate (struct write_regs_data *wrdata)
                                 1);
  transfer->short_is_error = TRUE;
  transfer->ssm = wrdata->ssm;
-  transfer->buffer[0] = regwrite->value;
+  fpi_usb_transfer_submit (transfer, CTRL_TIMEOUT, NULL, write_regs_cb, NULL);

-  fpi_usb_transfer_submit (transfer, CTRL_TIMEOUT, NULL, write_regs_cb, wrdata);
+  transfer->buffer[0] = regwrite->value;
 }

 static void
@@ -671,10 +675,10 @@ sm_write_reg (FpiSsm        *ssm,
                                 1);
  transfer->short_is_error = TRUE;
  transfer->ssm = ssm;
-  transfer->buffer[0] = value;
-
  fpi_usb_transfer_submit (transfer, CTRL_TIMEOUT, NULL,
                           fpi_ssm_usb_transfer_cb, NULL);
+
+  transfer->buffer[0] = value;
 }

 static void
@@ -694,6 +698,8 @@ sm_read_reg_cb (FpiUsbTransfer *transfer, FpDevice *device,
      fp_dbg ("read reg result = %02x", self->read_reg_result);
      fpi_ssm_next_state (transfer->ssm);
    }
+
+  g_free (transfer->buffer);
 }

 static void
@@ -730,6 +736,7 @@ sm_await_intr_cb (FpiUsbTransfer *transfer, FpDevice *device,

  if (error)
    {
+      g_free (transfer->buffer);
      fpi_ssm_mark_failed (transfer->ssm, error);
      return;
    }
@@ -737,6 +744,7 @@ sm_await_intr_cb (FpiUsbTransfer *transfer, FpDevice *device,
  fp_dbg ("interrupt received: %02x %02x %02x %02x",
          transfer->buffer[0], transfer->buffer[1],
          transfer->buffer[2], transfer->buffer[3]);
+  g_free (transfer->buffer);

  self->finger_state = FINGER_DETECTED;
  fpi_image_device_report_finger_status (dev, TRUE);
@@ -900,7 +908,7 @@ capsm_fire_bulk (FpiSsm   *ssm,
  self->img_cancellable = g_cancellable_new ();
  for (i = 0; i < self->img_transfers->len; i++)
    {
-      fpi_usb_transfer_submit (fpi_usb_transfer_ref (g_ptr_array_index (self->img_transfers, i)),
+      fpi_usb_transfer_submit (g_ptr_array_index (self->img_transfers, i),
                               0,
                               self->img_cancellable,
                               img_data_cb,
@@ -1398,12 +1406,8 @@ dev_activate (FpImageDevice *dev)
  self->capturing = FALSE;

  self->num_flying = 0;
-  self->img_transfers = g_ptr_array_new_with_free_func ((GFreeFunc) fpi_usb_transfer_unref);

-  /* This might seem odd, but we do need multiple in-flight URBs so that
-   * we never stop polling the device for more data.
-   */
-  for (i = 0; i < NUM_BULK_TRANSFERS; i++)
+  for (i = 0; i < self->img_transfers->len; i++)
    {
      FpiUsbTransfer *transfer;

@@ -171,7 +171,7 @@ finger_present (unsigned char *img, size_t len, int sum_threshold)
    if (img[i] < 160)
      sum++;

-  fp_dbg ("finger_present: sum is %d", sum);
+  fp_dbg ("finger_present: sum is %d\n", sum);
  return sum < sum_threshold ? 0 : 1;
 }

@@ -184,7 +184,7 @@ finger_det_data_cb (FpiUsbTransfer *transfer, FpDevice *device,

  if (error)
    {
-      fp_dbg ("data transfer status %s", error->message);
+      fp_dbg ("data transfer status %s\n", error->message);
      fpi_image_device_session_error (dev, error);
      return;
    }
@@ -212,7 +212,7 @@ finger_det_cmd_cb (FpiUsbTransfer *t, FpDevice *device,

  if (error)
    {
-      fp_dbg ("req transfer status %s", error->message);
+      fp_dbg ("req transfer status %s\n", error->message);
      fpi_image_device_session_error (dev, error);
      return;
    }
@@ -411,7 +411,7 @@ dev_init (FpImageDevice *dev)
      break;

    default:
-      fp_err ("Device variant %" G_GUINT64_FORMAT " is not known", driver_data);
+      fp_err ("Device variant %lu is not known\n", driver_data);
      g_assert_not_reached ();
      fpi_image_device_open_complete (dev, fpi_device_error_new (FP_DEVICE_ERROR_GENERAL));
      return;
@@ -431,7 +431,6 @@ dev_deinit (FpImageDevice *dev)

 static const FpIdEntry id_table[] = {
  { .vid = 0x0483,  .pid = 0x2015, .driver_data = UPEKTC_2015 },
-  { .vid = 0x0483,  .pid = 0x2017, .driver_data = UPEKTC_2015 },
  { .vid = 0x147e,  .pid = 0x3001, .driver_data = UPEKTC_3001 },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },
 };
@@ -19,9 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-/* *INDENT-OFF* */
-
-#pragma once
+#ifndef __UPEKTC_H
+#define __UPEKTC_H

 #define UPEKTC_CMD_LEN 0x40
 #define IMAGE_WIDTH 208
@@ -1937,3 +1936,5 @@ static const unsigned char scan_cmd[0x40] = {
  0x05, 0x90, 0xf6, 0x77, 0x84, 0xf5, 0x2f, 0x01,
  0x05, 0x90, 0xf6, 0x00, 0xc8, 0x00, 0xec, 0x00
 };
+
+#endif
@@ -31,6 +31,10 @@ static void start_deactivation (FpImageDevice *dev);
 #define CTRL_TIMEOUT 4000
 #define BULK_TIMEOUT 4000

+#define IMAGE_WIDTH 144
+#define IMAGE_HEIGHT 384
+#define IMAGE_SIZE (IMAGE_WIDTH * IMAGE_HEIGHT)
+
 #define MAX_CMD_SIZE 64
 #define MAX_RESPONSE_SIZE 2052
 #define SHORT_RESPONSE_SIZE 64
@@ -43,10 +47,8 @@ struct _FpiDeviceUpektcImg
  unsigned char  response[MAX_RESPONSE_SIZE];
  unsigned char *image_bits;
  unsigned char  seq;
-  size_t         expected_image_size;
  size_t         image_size;
  size_t         response_rest;
-  gboolean       area_sensor;
  gboolean       deactivating;
 };
 G_DECLARE_FINAL_TYPE (FpiDeviceUpektcImg, fpi_device_upektc_img, FPI,
@@ -76,7 +78,6 @@ upektc_img_cmd_update_crc (unsigned char *cmd_buf, size_t size)
  cmd_buf[size - 1] = (crc & 0xff00) >> 8;
 }

-FP_GNUC_ACCESS (read_only, 3, 4)
 static void
 upektc_img_submit_req (FpiSsm                *ssm,
                       FpImageDevice         *dev,
@@ -178,7 +179,6 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
                      gpointer user_data, GError *error)
 {
  FpImageDevice *dev = FP_IMAGE_DEVICE (device);
-  FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_GET_CLASS (dev);
  FpiDeviceUpektcImg *self = FPI_DEVICE_UPEKTC_IMG (dev);
  unsigned char *data = self->response;
  FpImage *img;
@@ -193,7 +193,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,

  if (self->deactivating)
    {
-      fp_dbg ("Deactivate requested");
+      fp_dbg ("Deactivate requested\n");
      fpi_ssm_mark_completed (transfer->ssm);
      return;
    }
@@ -208,7 +208,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,

  if (fpi_ssm_get_cur_state (transfer->ssm) == CAPTURE_READ_DATA_TERM)
    {
-      fp_dbg ("Terminating SSM");
+      fp_dbg ("Terminating SSM\n");
      fpi_ssm_mark_completed (transfer->ssm);
      return;
    }
@@ -219,8 +219,8 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
      response_size += 9;           /* 7 bytes for header, 2 for CRC */
      if (response_size > transfer->actual_length)
        {
-          fp_dbg ("response_size is %lu, actual_length is %d",
-                  (gulong) response_size, (gint) transfer->actual_length);
+          fp_dbg ("response_size is %lu, actual_length is %d\n",
+                  response_size, (gint) transfer->actual_length);
          fp_dbg ("Waiting for rest of transfer");
          BUG_ON (self->response_rest);
          self->response_rest = response_size - transfer->actual_length;
@@ -237,7 +237,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
        {
        /* No finger */
        case 0x28:
-          fp_dbg ("18th byte is %.2x", data[18]);
+          fp_dbg ("18th byte is %.2x\n", data[18]);
          switch (data[18])
            {
            case 0x0c:
@@ -246,68 +246,43 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
                                     CAPTURE_ACK_00_28);
              break;

-            case 0x13:
-              /* finger is present keep your finger on reader */
-              fpi_device_report_finger_status_changes (device,
-                                                       FP_FINGER_STATUS_NEEDED,
-                                                       FP_FINGER_STATUS_NONE);
-              fpi_ssm_jump_to_state (transfer->ssm,
-                                     self->area_sensor ?
-                                     CAPTURE_ACK_00_28 : CAPTURE_ACK_00_28_TERM);
-              break;
-
            case 0x00:
              /* finger is present! */
-              fpi_device_report_finger_status_changes (device,
-                                                       FP_FINGER_STATUS_PRESENT,
-                                                       FP_FINGER_STATUS_NONE);
-              fpi_ssm_jump_to_state (transfer->ssm,
-                                     CAPTURE_ACK_00_28);
-              break;
-
-            case 0x01:
-              /* no finger! */
-              fpi_device_report_finger_status_changes (device,
-                                                       FP_FINGER_STATUS_NONE,
-                                                       FP_FINGER_STATUS_PRESENT);
              fpi_ssm_jump_to_state (transfer->ssm,
                                     CAPTURE_ACK_00_28);
              break;

            case 0x1e:
              /* short scan */
-              fp_err ("short scan, aborting");
+              fp_err ("short scan, aborting\n");
              fpi_image_device_retry_scan (dev,
                                           FP_DEVICE_RETRY_TOO_SHORT);
              fpi_image_device_report_finger_status (dev,
                                                     FALSE);
              fpi_ssm_jump_to_state (transfer->ssm,
-                                     self->area_sensor ?
-                                     CAPTURE_ACK_00_28 : CAPTURE_ACK_00_28_TERM);
+                                     CAPTURE_ACK_00_28_TERM);
              break;

            case 0x1d:
-              /* too much horizontal movement */
-              fp_err ("too much horizontal movement, aborting");
+              /* too much horisontal movement */
+              fp_err ("too much horisontal movement, aborting\n");
              fpi_image_device_retry_scan (dev,
                                           FP_DEVICE_RETRY_CENTER_FINGER);
              fpi_image_device_report_finger_status (dev,
                                                     FALSE);
              fpi_ssm_jump_to_state (transfer->ssm,
-                                     self->area_sensor ?
-                                     CAPTURE_ACK_00_28 : CAPTURE_ACK_00_28_TERM);
+                                     CAPTURE_ACK_00_28_TERM);
              break;

            default:
              /* some error happened, cancel scan */
-              fp_err ("something bad happened, stop scan");
+              fp_err ("something bad happened, stop scan\n");
              fpi_image_device_retry_scan (dev,
                                           FP_DEVICE_RETRY);
              fpi_image_device_report_finger_status (dev,
                                                     FALSE);
              fpi_ssm_jump_to_state (transfer->ssm,
-                                     self->area_sensor ?
-                                     CAPTURE_ACK_00_28 : CAPTURE_ACK_00_28_TERM);
+                                     CAPTURE_ACK_00_28_TERM);
              break;
            }
          break;
@@ -331,13 +306,12 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
          self->image_size +=
            upektc_img_process_image_frame (self->image_bits + self->image_size,
                                            data);
-          BUG_ON (self->image_size != self->expected_image_size);
-          fp_dbg ("Image size is %lu",
-                  (gulong) self->image_size);
-          img = fp_image_new (img_class->img_width, img_class->img_height);
-          img->flags |= FPI_IMAGE_PARTIAL;
-          memcpy (img->data, self->image_bits,
+          BUG_ON (self->image_size != IMAGE_SIZE);
+          fp_dbg ("Image size is %lu\n",
                  self->image_size);
+          img = fp_image_new (IMAGE_WIDTH, IMAGE_HEIGHT);
+          memcpy (img->data, self->image_bits,
+                  IMAGE_SIZE);
          fpi_image_device_image_captured (dev, img);
          fpi_image_device_report_finger_status (dev,
                                                 FALSE);
@@ -345,7 +319,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
          break;

        default:
-          fp_err ("Unknown response!");
+          fp_err ("Unknown response!\n");
          fpi_ssm_mark_failed (transfer->ssm, fpi_device_error_new (FP_DEVICE_ERROR_GENERAL));
          break;
        }
@@ -356,7 +330,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
      break;

    default:
-      fp_err ("Not handled response!");
+      fp_err ("Not handled response!\n");
      fpi_ssm_mark_failed (transfer->ssm, fpi_device_error_new (FP_DEVICE_ERROR_GENERAL));
    }
 }
@@ -370,12 +344,8 @@ capture_run_state (FpiSsm *ssm, FpDevice *_dev)
  switch (fpi_ssm_get_cur_state (ssm))
    {
    case CAPTURE_INIT_CAPTURE:
-      if (self->area_sensor)
-        upektc_img_submit_req (ssm, dev, upek2020_init_capture_press, sizeof (upek2020_init_capture_press),
-                               self->seq, capture_reqs_cb);
-      else
-        upektc_img_submit_req (ssm, dev, upek2020_init_capture, sizeof (upek2020_init_capture),
-                               self->seq, capture_reqs_cb);
+      upektc_img_submit_req (ssm, dev, upek2020_init_capture, sizeof (upek2020_init_capture),
+                             self->seq, capture_reqs_cb);
      self->seq++;
      break;

@@ -541,81 +511,15 @@ init_reqs_cb (FpiUsbTransfer *transfer, FpDevice *device,
    fpi_ssm_mark_failed (transfer->ssm, error);
 }

+/* TODO: process response properly */
 static void
 init_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
                   gpointer user_data, GError *error)
 {
-  FpImageDevice *dev = FP_IMAGE_DEVICE (device);
-  FpiDeviceUpektcImg *self = FPI_DEVICE_UPEKTC_IMG (dev);
-  unsigned char *data = self->response;
-
-  if (error)
-    {
-      fpi_ssm_mark_failed (transfer->ssm, error);
-      return;
-    }
-
-  if (data[12] == 0x06 && data[13] == 0x14)  /* if get_info */
-    {
-      FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_GET_CLASS (dev);
-      uint16_t width = (data[51] << 8) | data[50];
-      uint16_t height = (data[53] << 8) | data[52];
-
-      self->area_sensor = !(data[49] & 0x80);
-
-      switch (width)
-        {
-        case 256:
-          fp_dbg ("Sensor type : TCS1x, width x height: %hu x %hu", width, height); /* 360x256 --- 270x192 must be set */
-          BUG_ON (height != 360);
-          img_class->img_width = 192;
-          img_class->img_height = 270;
-          break;
-
-        case 208:
-          fp_dbg ("Sensor type : TCS2, width x height: %hu x %hu", width, height); /* 288x208 --- 216x156 must be set */
-          BUG_ON (height != 288);
-          img_class->img_width = 156;
-          img_class->img_height = 216;
-          break;
-
-        case 248:
-          fp_dbg ("Sensor type : TCS3, width x height: %hu x %hu", width, height); /* 360x248 --- 270x186 must be set */
-          BUG_ON (height != 360);
-          img_class->img_width = 186;
-          img_class->img_height = 270;
-          break;
-
-        case 192:
-          fp_dbg ("Sensor type : TCS4x, width x height: %hu x %hu", width, height); /* 512x192 --- 384x144 must be set */
-          BUG_ON (height != 512);
-          img_class->img_width = 144;
-          img_class->img_height = 384;
-          break;
-
-        case 144:
-          fp_dbg ("Sensor type : TCS5x, width x height: %hu x %hu", width, height); /* 512x144 --- 384x108 must be set */
-          BUG_ON (height != 512);
-          img_class->img_width = 108;
-          img_class->img_height = 384;
-          break;
-
-        default:
-          fp_dbg ("Sensor type : Unknown");
-
-          fpi_ssm_mark_failed (transfer->ssm,
-                               fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                                         "Unknown sensor type (reported size %dx%d)",
-                                                         width, height));
-
-          return;
-        }
-
-      self->expected_image_size = img_class->img_width * img_class->img_height;
-      self->image_bits = g_malloc0 (self->expected_image_size * 2);
-    }
-
-  fpi_ssm_next_state (transfer->ssm);
+  if (!error)
+    fpi_ssm_next_state (transfer->ssm);
+  else
+    fpi_ssm_mark_failed (transfer->ssm, error);
 }

 static void
@@ -710,6 +614,7 @@ dev_deactivate (FpImageDevice *dev)
 static void
 dev_init (FpImageDevice *dev)
 {
+  FpiDeviceUpektcImg *self = FPI_DEVICE_UPEKTC_IMG (dev);
  GError *error = NULL;

  /* TODO check that device has endpoints we're using */
@@ -720,6 +625,7 @@ dev_init (FpImageDevice *dev)
      return;
    }

+  self->image_bits = g_malloc0 (IMAGE_SIZE * 2);
  fpi_image_device_open_complete (dev, NULL);
 }

@@ -779,6 +685,6 @@ fpi_device_upektc_img_class_init (FpiDeviceUpektcImgClass *klass)

  img_class->bz3_threshold = 20;

-  img_class->img_width = -1;
-  img_class->img_height = -1;
+  img_class->img_width = IMAGE_WIDTH;
+  img_class->img_height = IMAGE_HEIGHT;
 }
@@ -17,7 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#ifndef __UPEKTC_IMG_H
+#define __UPEKTC_IMG_H

 static const unsigned char upek2020_init_1[] = {
  'C', 'i', 'a', 'o',
@@ -75,22 +76,6 @@ static const unsigned char upek2020_init_capture[] = {
  0x02,
  0x00, /* Wait for acceptable finger */
  0x02,
-  0x25, 0xa9 /* CRC */
-};
-
-static const unsigned char upek2020_init_capture_press[] = {
-  'C', 'i', 'a', 'o',
-  0x00,
-  0x00, 0x0e, /* Seq = 7, len = 0x00e */
-  0x28, /* CMD = 0x28 */
-  0x0b, 0x00, /* Inner len = 0x000b */
-  0x00, 0x00,
-  0x0e, /* SUBCMD = 0x0e */
-  0x02,
-  0xfe, 0xff, 0xff, 0xff, /* timeout = -2 = 0xfffffffe = infinite time */
-  0x02,
-  0x01, /* Wait for finger */
-  0x02,
  0x14, 0x9a /* CRC */
 };

@@ -155,3 +140,5 @@ static const unsigned char upek2020_ack_frame[] = {
  0x30,
  0xac, 0x5b /* CRC */
 };
+
+#endif
@@ -10,20 +10,19 @@
 * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
 * Copyright (C) 2004,2006 Thomas Vander Stichele <thomas at apestaart dot org>

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

 #define FP_COMPONENT "upekts"
@@ -36,6 +35,7 @@
 #define TIMEOUT 5000

 #define MSG_READ_BUF_SIZE 0x40
+#define MAX_DATA_IN_READ_BUF (MSG_READ_BUF_SIZE - 9)

 struct _FpiDeviceUpekts
 {
@@ -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,
@@ -237,18 +236,12 @@ __handle_incoming_msg (FpDevice             *device,
 {
  GError *error = NULL;
  guint8 *buf = udata->buffer;
-  guint16 len;
-  guint16 computed_crc;
-  guint16 msg_crc;
+  guint16 len = ((buf[5] & 0xf) << 8) | buf[6];
+  guint16 computed_crc = udf_crc (buf + 4, len + 3);
+  guint16 msg_crc = (buf[len + 8] << 8) | buf[len + 7];
+  unsigned char *retdata = NULL;
  unsigned char code_a, code_b;

-  g_assert (udata->buflen >= 6);
-  len = ((buf[5] & 0xf) << 8) | buf[6];
-
-  g_assert (udata->buflen >= len + 9);
-  computed_crc = udf_crc (buf + 4, len + 3);
-  msg_crc = (buf[len + 8] << 8) | buf[len + 7];
-
  if (computed_crc != msg_crc)
    {
      fp_err ("CRC failed, got %04x expected %04x", msg_crc, computed_crc);
@@ -274,7 +267,12 @@ __handle_incoming_msg (FpDevice             *device,
          return;
        }

-      udata->callback (device, READ_MSG_CMD, code_a, 0, buf + 7, len,
+      if (len > 0)
+        {
+          retdata = g_malloc (len);
+          memcpy (retdata, buf + 7, len);
+        }
+      udata->callback (device, READ_MSG_CMD, code_a, 0, retdata, len,
                       udata->user_data, NULL);
      goto done;
    }
@@ -311,8 +309,14 @@ __handle_incoming_msg (FpDevice             *device,
      innerlen = innerlen - 3;
      _subcmd = innerbuf[5];
      fp_dbg ("device responds to subcmd %x with %d bytes", _subcmd, innerlen);
+      if (innerlen > 0)
+        {
+          retdata = g_malloc (innerlen);
+          memcpy (retdata, innerbuf + 6, innerlen);
+        }
      udata->callback (device, READ_MSG_RESPONSE, code_b, _subcmd,
-                       innerbuf + 6, innerlen, udata->user_data, NULL);
+                       retdata, innerlen, udata->user_data, NULL);
+      g_free (retdata);
      goto done;
    }
  else
@@ -354,8 +358,7 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device,
             gpointer user_data, GError *error)
 {
  struct read_msg_data *udata = user_data;
-  guint16 payload_len;
-  gsize packet_len;
+  guint16 len;

  if (error)
    {
@@ -367,7 +370,7 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device,
      fp_err ("async msg read too short (%d)",
              (gint) transfer->actual_length);
      error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
-                                        "Packet from device was too short (%" G_GSSIZE_FORMAT ")",
+                                        "Packet from device was too short (%lu)",
                                        transfer->actual_length);
      goto err;
    }
@@ -380,15 +383,14 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device,
      goto err;
    }

-  payload_len = ((udata->buffer[5] & 0xf) << 8) | udata->buffer[6];
-  packet_len = payload_len + 9;
+  len = ((udata->buffer[5] & 0xf) << 8) | udata->buffer[6];
  if (transfer->actual_length != MSG_READ_BUF_SIZE &&
-      packet_len > transfer->actual_length)
+      (len + 9) > transfer->actual_length)
    {
      /* Check that the length claimed inside the message is in line with
       * the amount of data that was transferred over USB. */
      fp_err ("msg didn't include enough data, expected=%d recv=%d",
-              (gint) packet_len, (gint) transfer->actual_length);
+              len + 9, (gint) transfer->actual_length);
      error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
                                        "Packet from device didn't include data");
      goto err;
@@ -397,14 +399,14 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device,
  /* We use a 64 byte buffer for reading messages. However, sometimes
   * messages are longer, in which case we have to do another USB bulk read
   * to read the remainder. This is handled below. */
-  if (packet_len > MSG_READ_BUF_SIZE)
+  if (len > MAX_DATA_IN_READ_BUF)
    {
-      int needed = packet_len - MSG_READ_BUF_SIZE;
+      int needed = len - MAX_DATA_IN_READ_BUF;
      FpiUsbTransfer *etransfer = fpi_usb_transfer_new (device);

      fp_dbg ("didn't fit in buffer, need to extend by %d bytes", needed);
-      udata->buffer = g_realloc ((gpointer) udata->buffer, packet_len);
-      udata->buflen = packet_len;
+      udata->buffer = g_realloc ((gpointer) udata->buffer, len);
+      udata->buflen = len;

      fpi_usb_transfer_fill_bulk_full (etransfer, EP_IN,
                                       udata->buffer + MSG_READ_BUF_SIZE,
@@ -529,6 +531,15 @@ initsm_read_msg_response_cb (FpiSsm            *ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
                                                     "Unexpected response subcommand"));
    }
+  else if (seq != upekdev->seq)
+    {
+      fp_err ("expected response to cmd seq=%02x, got response to %02x "
+              "in state %d", upekdev->seq, seq,
+              fpi_ssm_get_cur_state (ssm));
+      fpi_ssm_mark_failed (ssm,
+                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
+                                                     "Unexpected sequence number in response"));
+    }
  else
    {
      fpi_ssm_next_state (ssm);
@@ -689,7 +700,7 @@ initsm_run_state (FpiSsm *ssm, FpDevice *dev)
      break;

    case SEND_RESP03:;
-      transfer = alloc_send_cmdresponse_transfer (dev, ++upekdev->seq, init_resp03, sizeof (init_resp03));
+      transfer = alloc_send_cmd28_transfer (dev, ++upekdev->seq, init_resp03, sizeof (init_resp03));
      transfer->ssm = ssm;
      transfer->short_is_error = TRUE;
      fpi_usb_transfer_submit (transfer, TIMEOUT, NULL, fpi_ssm_usb_transfer_cb, NULL);
@@ -846,15 +857,22 @@ dev_init (FpDevice *dev)
 }

 static void
-dev_exit (FpDevice *dev)
+deinitsm_done (FpiSsm *ssm, FpDevice *dev, GError *error)
 {
-  GError *error = NULL;
-
-  g_usb_device_release_interface (fpi_device_get_usb_device (dev), 0, 0, &error);
+  g_usb_device_release_interface (fpi_device_get_usb_device (dev), 0, 0, NULL);

  fpi_device_close_complete (dev, error);
 }

+static void
+dev_exit (FpDevice *dev)
+{
+  FpiSsm *ssm;
+
+  ssm = fpi_ssm_new (dev, deinitsm_state_handler, DEINITSM_NUM_STATES);
+  fpi_ssm_start (ssm, deinitsm_done);
+}
+
 static const unsigned char enroll_init[] = {
  0x02, 0xc0, 0xd4, 0x01, 0x00, 0x04, 0x00, 0x08
 };
@@ -884,10 +902,8 @@ enroll_start_sm_cb_msg28 (FpDevice *dev,
  FpiSsm *ssm = user_data;

  if (error)
-    {
-      fpi_ssm_mark_failed (ssm, error);
-    }
-  else if (type != READ_MSG_RESPONSE)
+    fpi_ssm_mark_failed (ssm, error);
+  if (type != READ_MSG_RESPONSE)
    {
      fp_err ("expected response, got %d seq=%x", type, seq);
      fpi_ssm_mark_failed (ssm, fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -965,9 +981,7 @@ enroll_stop_deinit_cb (FpiSsm *ssm, FpDevice *dev, GError *error)
  if (error)
    fp_warn ("Error deinitializing: %s", error->message);

-  fpi_device_enroll_complete (dev,
-                              g_steal_pointer (&data->print),
-                              g_steal_pointer (&data->error));
+  fpi_device_enroll_complete (dev, data->print, data->error);
 }

 static void
@@ -976,7 +990,7 @@ do_enroll_stop (FpDevice *dev, FpPrint *print, GError *error)
  EnrollStopData *data = g_new0 (EnrollStopData, 1);
  FpiSsm *ssm = deinitsm_new (dev, data);

-  data->print = print;
+  data->print = g_object_ref (print);
  data->error = error;

  fpi_ssm_start (ssm, enroll_stop_deinit_cb);
@@ -994,7 +1008,7 @@ e_handle_resp00 (FpDevice *dev, unsigned char *data,

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

  if (data_len < sizeof (scan_comp))
    {
-      fp_err ("fingerprint data too short (%" G_GSIZE_FORMAT "u bytes)", data_len);
+      fp_err ("fingerprint data too short (%lu bytes)", data_len);
      error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, "fingerprint data too short");
    }
  else if (memcmp (data, scan_comp, sizeof (scan_comp)) != 0)
@@ -1103,6 +1117,7 @@ e_handle_resp02 (FpDevice *dev, unsigned char *data,
  else
    {
      GVariant *fp_data;
+      print = fp_print_new (dev);

      fpi_device_get_enroll_data (dev, &print);

@@ -1111,8 +1126,7 @@ e_handle_resp02 (FpDevice *dev, unsigned char *data,
                                           data_len - sizeof (scan_comp),
                                           1);

-      fpi_print_set_type (print, FPI_PRINT_RAW);
-      g_object_set (print, "fpi-data", fp_data, NULL);
+      g_object_set (print, "fp-data", fp_data, NULL);
      g_object_ref (print);
    }

@@ -1211,7 +1225,8 @@ enroll (FpDevice *dev)

 typedef struct
 {
-  GError *error;
+  FpiMatchResult res;
+  GError        *error;
 } VerifyStopData;

 static void
@@ -1229,12 +1244,7 @@ verify_stop_deinit_cb (FpiSsm *ssm, FpDevice *dev, GError *error)
  if (error)
    fp_warn ("Error deinitializing: %s", error->message);

-  if (data->error)
-    fpi_device_verify_complete (dev, g_steal_pointer (&data->error));
-  else
-    fpi_device_verify_complete (dev, g_steal_pointer (&error));
-
-  g_clear_error (&error);
+  fpi_device_verify_complete (dev, data->res, NULL, data->error);
 }

 static void
@@ -1243,11 +1253,8 @@ do_verify_stop (FpDevice *dev, FpiMatchResult res, GError *error)
  VerifyStopData *data = g_new0 (VerifyStopData, 1);
  FpiSsm *ssm = deinitsm_new (dev, data);

-  /* Report the error immediately if possible, otherwise delay it. */
-  if (!error || error->domain == FP_DEVICE_RETRY)
-    fpi_device_verify_report (dev, res, NULL, error);
-  else
-    data->error = error;
+  data->res = res;
+  data->error = error;

  fpi_ssm_start (ssm, verify_stop_deinit_cb);
  fpi_ssm_set_data (ssm, data, (GDestroyNotify) verify_stop_data_free);
@@ -1286,7 +1293,7 @@ verify_start_sm_run_state (FpiSsm *ssm, FpDevice *dev)

    case VERIFY_INIT:
      fpi_device_get_verify_data (dev, &print);
-      g_object_get (print, "fpi-data", &fp_data, NULL);
+      g_object_get (dev, "fp-data", &fp_data, NULL);

      data = g_variant_get_fixed_array (fp_data, &data_len, 1);

@@ -1296,7 +1303,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);

@@ -1319,7 +1326,7 @@ v_handle_resp00 (FpDevice *dev, unsigned char *data,

  if (data_len != 14)
    {
-      fp_warn ("received 3001 poll response of %" G_GSIZE_FORMAT "u bytes?", data_len);
+      fp_warn ("received 3001 poll response of %lu bytes?", data_len);
      error = fpi_device_error_new (FP_DEVICE_ERROR_PROTO);
      goto out;
    }
@@ -1342,6 +1349,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);
@@ -1351,14 +1359,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;
@@ -1447,7 +1447,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;
    }

@@ -1564,6 +1564,4 @@ fpi_device_upekts_class_init (FpiDeviceUpektsClass *klass)
  dev_class->verify = verify;
  dev_class->enroll = enroll;
  /* dev_class->cancel = cancel; */
-
-  fpi_device_class_auto_initialize_features (dev_class);
 }
@@ -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"

@@ -81,7 +81,7 @@ static const struct uru4k_dev_profile
 {
  const char *name;
  gboolean    auth_cr;
-  gboolean    image_not_flipped;
+  gboolean    encryption;
 } uru4k_dev_info[] = {
  [MS_KBD] = {
    .name = "Microsoft Keyboard with Fingerprint Reader",
@@ -106,7 +106,7 @@ static const struct uru4k_dev_profile
  [DP_URU4000B] = {
    .name = "Digital Persona U.are.U 4000B",
    .auth_cr = FALSE,
-    .image_not_flipped = TRUE, /* See comment in the code where it is used. */
+    .encryption = TRUE,
  },
 };

@@ -122,7 +122,7 @@ struct _FpiDeviceUru4000

  const struct uru4k_dev_profile *profile;
  uint8_t                         interface;
-  FpiImageDeviceState             activate_state;
+  FpImageDeviceState              activate_state;
  unsigned char                   last_reg_rd[16];
  unsigned char                   last_hwstat;

@@ -131,7 +131,6 @@ struct _FpiDeviceUru4000
  void                           *img_data;
  int                             img_data_actual_length;
  uint16_t                        img_lines_done, img_block;
-  GRand                          *rand;
  uint32_t                        img_enc_seed;

  irq_cb_fn                       irq_cb;
@@ -148,7 +147,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 +245,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 +260,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);
@@ -352,7 +316,6 @@ irq_handler (FpiUsbTransfer *transfer,
      if (urudev->irqs_stopped_cb)
        urudev->irqs_stopped_cb (imgdev);
      urudev->irqs_stopped_cb = NULL;
-      g_clear_error (&error);
      return;
    }
  else if (error)
@@ -396,9 +359,9 @@ start_irq_handler (FpImageDevice *dev)
  transfer = fpi_usb_transfer_new (FP_DEVICE (dev));
  transfer->ssm = NULL;
  transfer->short_is_error = TRUE;
-  fpi_usb_transfer_fill_interrupt (transfer,
-                                   EP_INTR,
-                                   IRQ_LENGTH);
+  fpi_usb_transfer_fill_bulk (transfer,
+                              EP_INTR,
+                              IRQ_LENGTH);
  fpi_usb_transfer_submit (transfer, 0, self->irq_cancellable, irq_handler, NULL);
 }

@@ -412,10 +375,6 @@ stop_irq_handler (FpImageDevice *dev, irqs_stopped_cb_fn cb)
      g_cancellable_cancel (self->irq_cancellable);
      self->irqs_stopped_cb = cb;
    }
-  else
-    {
-      cb (dev);
-    }
 }

 /***** STATE CHANGING *****/
@@ -434,7 +393,7 @@ finger_presence_irq_cb (FpImageDevice *dev,
    fpi_image_device_report_finger_status (dev, TRUE);
  else if (type == IRQDATA_FINGER_OFF)
    fpi_image_device_report_finger_status (dev, FALSE);
-  else if (type != IRQDATA_SCANPWR_ON)
+  else
    fp_warn ("ignoring unexpected interrupt %04x", type);
 }

@@ -449,10 +408,22 @@ change_state_write_reg_cb (FpiUsbTransfer *transfer,
 }

 static void
-dev_change_state (FpImageDevice *dev, FpiImageDeviceState state)
+dev_change_state (FpImageDevice *dev, FpImageDeviceState state)
 {
  FpiDeviceUru4000 *self = FPI_DEVICE_URU4000 (dev);

+  switch (state)
+    {
+    case FP_IMAGE_DEVICE_STATE_INACTIVE:
+    case FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON:
+    case FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF:
+    case FP_IMAGE_DEVICE_STATE_CAPTURE:
+      break;
+
+    default:
+      g_assert_not_reached ();
+    }
+
  self->activate_state = state;
  if (self->img_transfer != NULL)
    return;
@@ -587,7 +558,7 @@ image_transfer_cb (FpiUsbTransfer *transfer, FpDevice *dev,
    }
  else
    {
-      self->img_data = g_memdup2 (transfer->buffer, sizeof (struct uru4k_image));
+      self->img_data = g_memdup (transfer->buffer, sizeof (struct uru4k_image));
      self->img_data_actual_length = transfer->actual_length;
      fpi_ssm_next_state (ssm);
    }
@@ -692,11 +663,7 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
    case IMAGING_CAPTURE:
      self->img_lines_done = 0;
      self->img_block = 0;
-      fpi_usb_transfer_submit (fpi_usb_transfer_ref (self->img_transfer),
-                               0,
-                               NULL,
-                               image_transfer_cb,
-                               NULL);
+      fpi_usb_transfer_submit (self->img_transfer, 0, NULL, image_transfer_cb, NULL);

      break;

@@ -713,17 +680,17 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
          fpi_ssm_jump_to_state (ssm, IMAGING_CAPTURE);
          return;
        }
-
-      /* Detect whether image is encrypted (by checking how noisy it is) */
-      dev2 = calc_dev2 (img);
-      fp_dbg ("dev2: %d", dev2);
-      if (dev2 < ENC_THRESHOLD)
+      if (!self->profile->encryption)
        {
-          fpi_ssm_jump_to_state (ssm, IMAGING_REPORT_IMAGE);
-          return;
+          dev2 = calc_dev2 (img);
+          fp_dbg ("dev2: %d", dev2);
+          if (dev2 < ENC_THRESHOLD)
+            {
+              fpi_ssm_jump_to_state (ssm, IMAGING_REPORT_IMAGE);
+              return;
+            }
+          fp_info ("image seems to be encrypted");
        }
-      fp_info ("image seems to be encrypted");
-
      buf[0] = img->key_number;
      buf[1] = self->img_enc_seed;
      buf[2] = self->img_enc_seed >> 8;
@@ -738,9 +705,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);
@@ -756,11 +723,10 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
                  num_lines);
          if (flags & BLOCKF_CHANGE_KEY)
            {
-              fp_dbg ("changing encryption keys.");
+              fp_dbg ("changing encryption keys.\n");
              img->block_info[self->img_block].flags &= ~BLOCKF_CHANGE_KEY;
              img->key_number++;
-              self->img_enc_seed = g_rand_int_range (self->rand, 0, RAND_MAX);
-              fp_dbg ("New image encryption seed: %d", self->img_enc_seed);
+              self->img_enc_seed = rand ();
              fpi_ssm_jump_to_state (ssm, IMAGING_SEND_INDEX);
              return;
            }
@@ -803,17 +769,11 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
        }

      fpimg->flags = FPI_IMAGE_COLORS_INVERTED;
-      /* NOTE: For some reason all but U4000B (or rather U4500?) flipped the
-       * image, we retain this behaviour here, but it is not clear whether it
-       * is correct.
-       * It may be that there are different models with the same USB ID that
-       * behave differently.
-       */
-      if (self->profile->image_not_flipped)
+      if (!self->profile->encryption)
        fpimg->flags |= FPI_IMAGE_V_FLIPPED | FPI_IMAGE_H_FLIPPED;
      fpi_image_device_image_captured (dev, fpimg);

-      if (self->activate_state == FPI_IMAGE_DEVICE_STATE_CAPTURE)
+      if (self->activate_state == FP_IMAGE_DEVICE_STATE_CAPTURE)
        fpi_ssm_jump_to_state (ssm, IMAGING_CAPTURE);
      else
        fpi_ssm_mark_completed (ssm);
@@ -833,7 +793,8 @@ imaging_complete (FpiSsm *ssm, FpDevice *dev, GError *error)
  if (error)
    fpi_image_device_session_error (FP_IMAGE_DEVICE (dev), error);

-  g_clear_pointer (&self->img_transfer, fpi_usb_transfer_unref);
+  /* Freed by callback or cancellation */
+  self->img_transfer = NULL;

  g_free (self->img_data);
  self->img_data = NULL;
@@ -903,7 +864,7 @@ rebootpwr_run_state (FpiSsm *ssm, FpDevice *_dev)
        }
      else
        {
-          fpi_ssm_jump_to_state_delayed (ssm, 10, REBOOTPWR_GET_HWSTAT);
+          fpi_ssm_jump_to_state_delayed (ssm, 10, REBOOTPWR_GET_HWSTAT, NULL);
        }
      break;
    }
@@ -985,11 +946,11 @@ powerup_run_state (FpiSsm *ssm, FpDevice *_dev)
        }
      else if (!self->profile->auth_cr)
        {
-          fpi_ssm_jump_to_state_delayed (ssm, POWERUP_SET_HWSTAT, 10);
+          fpi_ssm_jump_to_state_delayed (ssm, POWERUP_SET_HWSTAT, 10, NULL);
        }
      else
        {
-          fpi_ssm_next_state_delayed (ssm, 10);
+          fpi_ssm_next_state_delayed (ssm, 10, NULL);
        }
      break;

@@ -1215,10 +1176,7 @@ deactivate_write_reg_cb (FpiUsbTransfer *transfer, FpDevice *dev,
 static void
 dev_deactivate (FpImageDevice *dev)
 {
-  /* This is started/handled by execute_state_change in order to delay the
-   * action until after the image transfer has completed.
-   * We just need to override the function so that the complete handler is
-   * not called automatically. */
+  dev_change_state (dev, FP_IMAGE_DEVICE_STATE_INACTIVE);
 }

 static void
@@ -1229,7 +1187,7 @@ execute_state_change (FpImageDevice *dev)

  switch (self->activate_state)
    {
-    case FPI_IMAGE_DEVICE_STATE_DEACTIVATING:
+    case FP_IMAGE_DEVICE_STATE_INACTIVE:
      fp_dbg ("deactivating");
      self->irq_cb = NULL;
      self->irq_cb_data = NULL;
@@ -1237,7 +1195,7 @@ execute_state_change (FpImageDevice *dev)
                 deactivate_write_reg_cb, NULL);
      break;

-    case FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON:
+    case FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON:
      fp_dbg ("wait finger on");
      if (!IRQ_HANDLER_IS_RUNNING (self))
        {
@@ -1251,14 +1209,13 @@ execute_state_change (FpImageDevice *dev)
                 change_state_write_reg_cb, NULL);
      break;

-    case FPI_IMAGE_DEVICE_STATE_CAPTURE:
+    case FP_IMAGE_DEVICE_STATE_CAPTURE:
      fp_dbg ("starting capture");
      self->irq_cb = NULL;

      ssm = fpi_ssm_new (FP_DEVICE (dev), imaging_run_state,
                         IMAGING_NUM_STATES);
-      self->img_enc_seed = g_rand_int_range (self->rand, 0, RAND_MAX);
-      fp_dbg ("Image encryption seed: %d", self->img_enc_seed);
+      self->img_enc_seed = rand ();
      self->img_transfer = fpi_usb_transfer_new (FP_DEVICE (dev));
      self->img_transfer->ssm = ssm;
      self->img_transfer->short_is_error = FALSE;
@@ -1272,7 +1229,7 @@ execute_state_change (FpImageDevice *dev)
                 change_state_write_reg_cb, NULL);
      break;

-    case FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF:
+    case FP_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF:
      fp_dbg ("await finger off");
      if (!IRQ_HANDLER_IS_RUNNING (self))
        {
@@ -1285,12 +1242,6 @@ execute_state_change (FpImageDevice *dev)
      write_reg (dev, REG_MODE, MODE_AWAIT_FINGER_OFF,
                 change_state_write_reg_cb, NULL);
      break;
-
-    /* Ignored states */
-    case FPI_IMAGE_DEVICE_STATE_IDLE:
-    case FPI_IMAGE_DEVICE_STATE_ACTIVATING:
-    case FPI_IMAGE_DEVICE_STATE_INACTIVE:
-      break;
    }
 }

@@ -1305,6 +1256,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);
@@ -1376,29 +1329,56 @@ dev_init (FpImageDevice *dev)
      return;
    }

-  self = FPI_DEVICE_URU4000 (dev);
+  /* Disable loading p11-kit's user configuration */
+  g_setenv ("P11_KIT_NO_USER_CONFIG", "1", TRUE);

-  g_clear_pointer (&self->rand, g_rand_free);
-  self->rand = g_rand_new ();
-  if (fpi_device_emulation_mode_enabled (FP_DEVICE (dev)))
-    g_rand_set_seed (self->rand, 0xFACADE);
+  /* 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);

  driver_data = fpi_device_get_driver_data (FP_DEVICE (dev));
  self->profile = &uru4k_dev_info[driver_data];
  self->interface = g_usb_interface_get_number (iface);

  /* 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);
 }
@@ -1409,11 +1389,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);
  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (dev)),
                                  self->interface, 0, &error);
-  g_clear_pointer (&self->rand, g_rand_free);
  fpi_image_device_close_complete (dev, error);
 }

@@ -42,7 +42,6 @@ async_write_callback (FpiUsbTransfer *transfer, FpDevice *device,
 }

 /* Send data to EP1, the only out endpoint */
-FP_GNUC_ACCESS (read_only, 3, 4)
 static void
 async_write (FpiSsm   *ssm,
             FpDevice *dev,
@@ -118,10 +117,9 @@ async_abort_callback (FpiUsbTransfer *transfer, FpDevice *device,
  int ep = transfer->endpoint;

  /* 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))
+  if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT))
    {
-      g_clear_error (&error);
+      g_free (error);
      fpi_ssm_next_state (transfer->ssm);
      return;
    }
@@ -158,8 +156,6 @@ async_abort (FpDevice *dev, FpiSsm *ssm, int ep)
  else
    fpi_usb_transfer_fill_bulk (transfer, ep, VFS_USB_BUFFER_SIZE);

-  transfer->ssm = ssm;
-
  fpi_usb_transfer_submit (transfer, VFS_USB_ABORT_TIMEOUT, NULL,
                           async_abort_callback, NULL);
 }
@@ -244,7 +240,6 @@ prepare_image (FpDeviceVfs0050 *vdev)

  /* Building GSList */
  GSList *lines = NULL;
-
  for (int i = height - 1; i >= 0; --i)
    lines = g_slist_prepend (lines, vdev->lines_buffer + i);

@@ -469,8 +464,8 @@ receive_callback (FpiUsbTransfer *transfer, FpDevice *device,
  if (error)
    g_error_free (error);

-  /* Capture is done when there is no more data to transfer or device timed out */
-  if (transfer->actual_length <= 0)
+  /* Check if fingerprint data is over */
+  if (transfer->actual_length == 0)
    {
      fpi_ssm_next_state (transfer->ssm);
    }
@@ -478,7 +473,7 @@ receive_callback (FpiUsbTransfer *transfer, FpDevice *device,
    {
      self->bytes += transfer->actual_length;

-      /* Try reading more data */
+      /* We need more data */
      fpi_ssm_jump_to_state (transfer->ssm,
                             fpi_ssm_get_cur_state (transfer->ssm));
    }
@@ -581,7 +576,7 @@ activate_ssm (FpiSsm *ssm, FpDevice *dev)
            /* Initialize fingerprint buffer */
            g_free (self->lines_buffer);
            self->memory = VFS_USB_BUFFER_SIZE;
-            self->lines_buffer = g_malloc0 (self->memory);
+            self->lines_buffer = g_malloc (self->memory);
            self->bytes = 0;

            /* Finger is on the scanner */
@@ -589,21 +584,19 @@ activate_ssm (FpiSsm *ssm, FpDevice *dev)
          }

        /* Increase buffer size while it's insufficient */
-        while (self->memory < self->bytes + VFS_USB_BUFFER_SIZE)
+        while (self->bytes + VFS_USB_BUFFER_SIZE > self->memory)
          {
-            int pre_memory = self->memory;
-            self->memory += VFS_USB_BUFFER_SIZE;
+            self->memory <<= 1;
            self->lines_buffer =
              (struct vfs_line *) g_realloc (self->lines_buffer,
                                             self->memory);
-            memset ((guint8 *) self->lines_buffer + pre_memory, 0,
-                    VFS_USB_BUFFER_SIZE);
          }

        /* Receive chunk of data */
        transfer = fpi_usb_transfer_new (dev);
        fpi_usb_transfer_fill_bulk_full (transfer, 0x82,
-                                         (guint8 *) self->lines_buffer + self->bytes,
+                                         (guint8 *)
+                                         (self->lines_buffer + self->bytes),
                                         VFS_USB_BUFFER_SIZE, NULL);
        transfer->ssm = ssm;
        fpi_usb_transfer_submit (transfer, VFS_USB_TIMEOUT, NULL,
@@ -616,7 +609,7 @@ activate_ssm (FpiSsm *ssm, FpDevice *dev)
      clear_data (self);

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

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

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

    default:
@@ -674,7 +668,6 @@ dev_activate (FpImageDevice *idev)
  self->ssm_active = 1;

  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (idev), activate_ssm, SSM_STATES);
-
  fpi_ssm_start (ssm, dev_activate_callback);
 }

@@ -718,7 +711,6 @@ dev_open (FpImageDevice *idev)

  /* Clearing previous device state */
  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (idev), activate_ssm, SSM_STATES);
-
  fpi_ssm_start (ssm, dev_open_callback);
 }

@@ -785,7 +785,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)

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

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

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

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

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

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

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

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

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

    case M_READ_PRINT_POLL:
@@ -147,6 +147,18 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
    }
 }

+/* Complete loop sequential state machine */
+static void
+m_loop_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)
+{
+  if (error)
+    {
+      g_warning ("State machine completed with an error: %s", error->message);
+      g_error_free (error);
+    }
+  /* Free sequential state machine */
+}
+
 /* Exec init sequential state machine */
 static void
 m_init_state (FpiSsm *ssm, FpDevice *_dev)
@@ -164,7 +176,19 @@ m_init_state (FpiSsm *ssm, FpDevice *_dev)
 static void
 m_init_complete (FpiSsm *ssm, FpDevice *dev, GError *error)
 {
+  FpiSsm *ssm_loop;
+
  fpi_image_device_activate_complete (FP_IMAGE_DEVICE (dev), error);
+  if (!error)
+    {
+      /* Notify activate complete */
+
+      /* Start loop ssm */
+      ssm_loop = fpi_ssm_new (dev, m_loop_state, M_LOOP_NUM_STATES);
+      fpi_ssm_start (ssm_loop, m_loop_complete);
+    }
+
+  /* Free sequential state machine */
 }

 /* Activate device */
@@ -189,19 +213,6 @@ dev_deactivate (FpImageDevice *dev)
  fpi_image_device_deactivate_complete (dev, NULL);
 }

-static void
-dev_change_state (FpImageDevice *dev, FpiImageDeviceState state)
-{
-  FpiSsm *ssm_loop;
-
-  if (state != FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_ON)
-    return;
-
-  /* Start a capture operation. */
-  ssm_loop = fpi_ssm_new (FP_DEVICE (dev), m_loop_state, M_LOOP_NUM_STATES);
-  fpi_ssm_start (ssm_loop, NULL);
-}
-
 static void
 dev_open (FpImageDevice *dev)
 {
@@ -262,7 +273,6 @@ fpi_device_vfs301_class_init (FpDeviceVfs301Class *klass)
  img_class->img_close = dev_close;
  img_class->activate = dev_activate;
  img_class->deactivate = dev_deactivate;
-  img_class->change_state = dev_change_state;

  img_class->bz3_threshold = 24;

@@ -93,7 +93,6 @@ usb_recv (FpDeviceVfs301 *dev, guint8 endpoint, int max_bytes, FpiUsbTransfer **
    *out = g_steal_pointer (&transfer);
 }

-FP_GNUC_ACCESS (read_only, 2, 3)
 static void
 usb_send (FpDeviceVfs301 *dev, const guint8 *data, gssize length, GError **error)
 {
@@ -178,7 +177,6 @@ translate_str (const char **srcL, gssize *len)
      src_len += tmp;
    }

-  g_assert (src_len >= 2);
  *len = src_len / 2;
  res = g_malloc0 (*len);
  dst = res;
@@ -213,9 +211,11 @@ vfs301_proto_generate (int type, int subtype, gssize *len)
        *len = 1;
        return data;
      }
+      break;

    case 0x0B:
      return vfs301_proto_generate_0B (subtype, len);
+      break;

    case 0x02D0:
      {
@@ -231,18 +231,22 @@ vfs301_proto_generate (int type, int subtype, gssize *len)
        g_assert ((int) subtype <= G_N_ELEMENTS (dataLs));
        return translate_str (dataLs[subtype - 1], len);
      }
+      break;

    case 0x0220:
      switch (subtype)
        {
        case 1:
          return translate_str (vfs301_0220_01, len);
+          break;

        case 2:
          return translate_str (vfs301_0220_02, len);
+          break;

        case 3:
          return translate_str (vfs301_0220_03, len);
+          break;

        case 0xFA00:
        case 0x2C01:
@@ -265,6 +269,7 @@ vfs301_proto_generate (int type, int subtype, gssize *len)
            field[3] = field[1];

            return data;
+            break;
          }

        default:
@@ -432,7 +437,7 @@ img_process_data (int first_block, FpDeviceVfs301 *dev, const guint8 *buf, int l
    usb_send (dev, data, len, NULL); \
  }

-#define RAW_DATA(x) g_memdup2 (x, sizeof (x)), sizeof (x)
+#define RAW_DATA(x) x, sizeof (x)

 #define IS_VFS301_FP_SEQ_START(b) ((b[0] == 0x01) && (b[1] == 0xfe))

@@ -465,7 +470,7 @@ int
 vfs301_proto_peek_event (FpDeviceVfs301 *dev)
 {
  g_autoptr(GError) error = NULL;
-  g_autoptr(FpiUsbTransfer) transfer = NULL;
+  FpiUsbTransfer *transfer;

  const char no_event[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
  const char got_event[] = {0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00};
@@ -502,30 +507,30 @@ vfs301_proto_process_event_cb (FpiUsbTransfer *transfer,
                               FpDevice *device,
                               gpointer user_data, GError *error)
 {
-  FpDeviceVfs301 *self = FPI_DEVICE_VFS301 (device);
+  FpDeviceVfs301 *dev = user_data;

  if (error)
    {
      g_warning ("Error receiving data: %s", error->message);
      g_error_free (error);
-      self->recv_progress = VFS301_FAILURE;
+      dev->recv_progress = VFS301_FAILURE;
      return;
    }
  else if (transfer->actual_length < transfer->length)
    {
      /* TODO: process the data anyway? */
-      self->recv_progress = VFS301_ENDED;
+      dev->recv_progress = VFS301_ENDED;
      return;
    }
  else
    {
      FpiUsbTransfer *new;
-      if (!vfs301_proto_process_data (self,
+      if (!vfs301_proto_process_data (dev,
                                      transfer->length == VFS301_FP_RECV_LEN_1,
                                      transfer->buffer,
                                      transfer->actual_length))
        {
-          self->recv_progress = VFS301_ENDED;
+          dev->recv_progress = VFS301_ENDED;
          return;
        }

@@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-/* *INDENT-OFF* */
-
 /* There are many similar blocks in the data below, also the data are
 * self-similar (looks like some config blocks? pokes like in vfs101?) */

@@ -1623,56 +1621,56 @@ static const unsigned char vfs301_24[] = { /* 119 B */
 #define vfs301_02D0_ALIGNED_BLOB \
  PACKET ("0200", "8005", \
          "FF830720"  "5F820720"  "FF830720" \
-          "5F820720"  "FF830720"  "5F820720"  "FF830720" \
-          "5F820720"  "FF830720"  "5F820720"  "FF8B0720" \
-          "608A0720"  "FF930720"  "61920720"  "FF9B0720" \
-          "629A0720"  "FFA30720"  "63A20720"  "FFAB0720" \
-          "64AA0720"  "FFB30720"  "65B20720"  "FFBB0720" \
-          "66BA0720"  "FFC30720"  "67C20720"  "FFCB0720" \
-          "68CA0720"  "FFD30720"  "69D20720"  "FFDB0720" \
-          "6ADA0720"  "FFE30720"  "6BE20720"  "FFEB0720" \
-          "6CEA0720"  "FFF30720"  "6DF20720"  "FFFB0720" \
-          "6EFA0720"  "FF850720"  "6F840720"  "FF8D0720" \
-          "708C0720"  "FF950720"  "71940720"  "FF9D0720" \
-          "729C0720"  "FFA50720"  "73A40720"  "FFAD0720" \
-          "74AC0720"  "FFB50720"  "75B40720"  "FFBD0720" \
-          "76BC0720"  "FFC50720"  "77C40720"  "FFCD0720" \
-          "78CC0720"  "FFD50720"  "79D40720"  "FFDD0720" \
-          "7ADC0720"  "FFE50720"  "7BE40720"  "FFED0720" \
-          "7CEC0720"  "FFF50720"  "7DF40720"  "FFFD0720" \
-          "7EFC0720"  "FF870720"  "7F860720"  "FF8F0720" \
-          "808E0720"  "FF970720"  "81960720"  "FF9F0720" \
-          "829E0720"  "FFA70720"  "83A60720"  "FFAF0720" \
-          "84AE0720"  "FFB70720"  "85B60720"  "FFBF0720" \
-          "86BE0720"  "FFC70720"  "87C60720"  "FFCF0720" \
-          "88CE0720"  "FFD70720"  "89D60720"  "FFDF0720" \
-          "8ADE0720"  "FFE70720"  "8BE60720"  "FFEF0720" \
-          "8CEE0720"  "FFF70720"  "8DF60720"  "FFFF0720" \
-          "8EFE0720" \
-          "FFFF0720"  "8EFE0720"  "FFF70720"  "8DF60720" \
-          "FFEF0720"  "8CEE0720"  "FFE70720"  "8BE60720" \
-          "FFDF0720"  "8ADE0720"  "FFD70720"  "89D60720" \
-          "FFCF0720"  "88CE0720"  "FFC70720"  "87C60720" \
-          "FFBF0720"  "86BE0720"  "FFB70720"  "85B60720" \
-          "FFAF0720"  "84AE0720"  "FFA70720"  "83A60720" \
-          "FF9F0720"  "829E0720"  "FF970720"  "81960720" \
-          "FF8F0720"  "808E0720"  "FF870720"  "7F860720" \
-          "FFFD0720"  "7EFC0720"  "FFF50720"  "7DF40720" \
-          "FFED0720"  "7CEC0720"  "FFE50720"  "7BE40720" \
-          "FFDD0720"  "7ADC0720"  "FFD50720"  "79D40720" \
-          "FFCD0720"  "78CC0720"  "FFC50720"  "77C40720" \
-          "FFBD0720"  "76BC0720"  "FFB50720"  "75B40720" \
-          "FFAD0720"  "74AC0720"  "FFA50720"  "73A40720" \
-          "FF9D0720"  "729C0720"  "FF950720"  "71940720" \
-          "FF8D0720"  "708C0720"  "FF850720"  "6F840720" \
-          "FFFB0720"  "6EFA0720"  "FFF30720"  "6DF20720" \
-          "FFEB0720"  "6CEA0720"  "FFE30720"  "6BE20720" \
-          "FFDB0720"  "6ADA0720"  "FFD30720"  "69D20720" \
-          "FFCB0720"  "68CA0720"  "FFC30720"  "67C20720" \
-          "FFBB0720"  "66BA0720"  "FFB30720"  "65B20720" \
-          "FFAB0720"  "64AA0720"  "FFA30720"  "63A20720" \
-          "FF9B0720"  "629A0720"  "FF930720"  "61920720" \
-          "FF8B0720"  "608A0720"  "FF830720"  "5F820720" \
+                                  "5F820720"  "FF830720"  "5F820720"  "FF830720" \
+                                                                      "5F820720"  "FF830720"  "5F820720"  "FF8B0720" \
+                                                                                                          "608A0720"  "FF930720"  "61920720"  "FF9B0720" \
+                                                                                                                                              "629A0720"  "FFA30720"  "63A20720"  "FFAB0720" \
+                                                                                                                                                                                  "64AA0720"  "FFB30720"  "65B20720"  "FFBB0720" \
+                                                                                                                                                                                                                      "66BA0720"  "FFC30720"  "67C20720"  "FFCB0720" \
+                                                                                                                                                                                                                                                          "68CA0720"  "FFD30720"  "69D20720"  "FFDB0720" \
+                                                                                                                                                                                                                                                                                              "6ADA0720"  "FFE30720"  "6BE20720"  "FFEB0720" \
+                                                                                                                                                                                                                                                                                                                                  "6CEA0720"  "FFF30720"  "6DF20720"  "FFFB0720" \
+                                                                                                                                                                                                                                                                                                                                                                      "6EFA0720"  "FF850720"  "6F840720"  "FF8D0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                          "708C0720"  "FF950720"  "71940720"  "FF9D0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                              "729C0720"  "FFA50720"  "73A40720"  "FFAD0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "74AC0720"  "FFB50720"  "75B40720"  "FFBD0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "76BC0720"  "FFC50720"  "77C40720"  "FFCD0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "78CC0720"  "FFD50720"  "79D40720"  "FFDD0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "7ADC0720"  "FFE50720"  "7BE40720"  "FFED0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "7CEC0720"  "FFF50720"  "7DF40720"  "FFFD0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "7EFC0720"  "FF870720"  "7F860720"  "FF8F0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "808E0720"  "FF970720"  "81960720"  "FF9F0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "829E0720"  "FFA70720"  "83A60720"  "FFAF0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "84AE0720"  "FFB70720"  "85B60720"  "FFBF0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "86BE0720"  "FFC70720"  "87C60720"  "FFCF0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "88CE0720"  "FFD70720"  "89D60720"  "FFDF0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "8ADE0720"  "FFE70720"  "8BE60720"  "FFEF0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "8CEE0720"  "FFF70720"  "8DF60720"  "FFFF0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "8EFE0720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFFF0720"  "8EFE0720"  "FFF70720"  "8DF60720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFEF0720"  "8CEE0720"  "FFE70720"  "8BE60720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FFDF0720"  "8ADE0720"  "FFD70720"  "89D60720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FFCF0720"  "88CE0720"  "FFC70720"  "87C60720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFBF0720"  "86BE0720"  "FFB70720"  "85B60720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFAF0720"  "84AE0720"  "FFA70720"  "83A60720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FF9F0720"  "829E0720"  "FF970720"  "81960720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FF8F0720"  "808E0720"  "FF870720"  "7F860720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFFD0720"  "7EFC0720"  "FFF50720"  "7DF40720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFED0720"  "7CEC0720"  "FFE50720"  "7BE40720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FFDD0720"  "7ADC0720"  "FFD50720"  "79D40720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FFCD0720"  "78CC0720"  "FFC50720"  "77C40720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFBD0720"  "76BC0720"  "FFB50720"  "75B40720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFAD0720"  "74AC0720"  "FFA50720"  "73A40720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FF9D0720"  "729C0720"  "FF950720"  "71940720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FF8D0720"  "708C0720"  "FF850720"  "6F840720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFFB0720"  "6EFA0720"  "FFF30720"  "6DF20720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFEB0720"  "6CEA0720"  "FFE30720"  "6BE20720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FFDB0720"  "6ADA0720"  "FFD30720"  "69D20720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FFCB0720"  "68CA0720"  "FFC30720"  "67C20720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFBB0720"  "66BA0720"  "FFB30720"  "65B20720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFAB0720"  "64AA0720"  "FFA30720"  "63A20720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FF9B0720"  "629A0720"  "FF930720"  "61920720" \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FF8B0720"  "608A0720"  "FF830720"  "5F820720" \
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () \
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () \
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () \
@@ -1873,49 +1871,49 @@ const char *vfs301_0220_01[] = {
          "A46C0420"
          "A46C0400"
          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420" "83688420" "83688420"
-          "83688420" "83688420"
+                                           "83688420" "83688420" "83688420" "83688420"
+                                                                            "83688420" "83688420" "83688420" "83688420"
+                                                                                                             "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                              "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                               "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                 "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                  "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                   "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                    "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                     "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                      "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                       "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    "83688420" "83688420" "83688420" "83688420"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     "83688420" "83688420"
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 ()
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 ()
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 ()
@@ -2270,55 +2268,55 @@ const char *vfs301_02D0_04[] = {
   * any troubles. */
  PACKET ("0200", "8005",
          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
-          "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                           "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                            "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                             "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                              "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                               "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                 "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                  "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                   "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                    "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                     "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                      "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                       "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFF30720" "80F20720" "FFF30720" "80F20720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           "FFF30720" "80F20720" "FFF30720" "80F20720"
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 ()
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 ()
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 ()
@@ -2439,55 +2437,55 @@ const char *vfs301_02D0_05[] = {
   * any troubles. */
  PACKET ("0200", "8005",
          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
-          "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                           "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                            "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                             "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                              "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                               "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                 "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                  "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                   "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                    "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                     "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                      "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                       "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          "FFF34720" "80F24720" "FFF34720" "80F24720"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           "FFF34720" "80F24720" "FFF34720" "80F24720"
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 ()
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 ()
          Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 () Z8 ()
@@ -196,7 +196,6 @@ usb_exchange_async (FpiSsm                  *ssm,
  FpiSsm *subsm = fpi_ssm_new_full (FP_DEVICE (data->device),
                                    usbexchange_loop,
                                    data->stepcount,
-                                    data->stepcount,
                                    exchange_name);

  fpi_ssm_set_data (subsm, data, NULL);
@@ -382,8 +381,9 @@ submit_image (FpiSsm          *ssm,
 {
  FpImage *img;

-  if (self->lines_recorded < VFS5011_IMAGE_WIDTH)
+  if (self->lines_recorded == 0)
    {
+      /* == FP_ENROLL_RETRY_TOO_SHORT */
      fpi_image_device_retry_scan (dev, FP_DEVICE_RETRY_TOO_SHORT);
      return;
    }
@@ -706,7 +706,7 @@ activate_loop (FpiSsm *ssm, FpDevice *_dev)
      break;

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

    case DEV_ACTIVATE_PREPARE_NEXT_CAPTURE:
@@ -816,11 +816,13 @@ dev_close (FpImageDevice *dev)
  GError *error = NULL;
  FpDeviceVfs5011 *self = FPI_DEVICE_VFS5011 (dev);

+  ;
+
  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (dev)),
                                  0, 0, &error);

  g_free (self->capture_buffer);
-  g_slist_free_full (g_steal_pointer (&self->rows), g_free);
+  g_slist_free_full (self->rows, g_free);

  fpi_image_device_close_complete (dev, error);
 }
@@ -1,6 +1,5 @@
-#pragma once
-
-/* *INDENT-OFF* */
+#ifndef __VFS5011_PROTO_H
+#define __VFS5011_PROTO_H

 #define VFS5011_LINE_SIZE 240
 #define VFS5011_IMAGE_WIDTH 160
@@ -6183,3 +6182,5 @@ static unsigned char vfs5011_prepare_04[] = { /* 2903 B */
  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
 };
+
+#endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Benjamin Berg	788fd9ca7a	elan: Do not leak converted frames The elan driver converts frames into a different format. These frames are only needed to assemable the image and should be free'ed afterwards. Fixes: #213	2019-12-16 11:41:22 +01:00
Benjamin Berg	8c5eede914	examples: Fix double device closing in manage-prints The manage-prints command would close the device twice when the user hits an invalid number or 'n' and no prints need to be deleted. Simply remove the erroneous call to fix the issue.	2019-12-16 11:41:22 +01:00
Benjamin Berg	07c8481bf6	tests: Ensure objects are free'ed at the end of tests The objects may not be garbage collected otherwise.	2019-12-16 11:41:22 +01:00
Benjamin Berg	d435fc7c2c	synaptics: Use local variable rather than re-fetching usb device	2019-12-16 11:41:22 +01:00
Benjamin Berg	dc3b5e52ac	meson: Add missing dependency on fp-enum.h for private library The private library needs to indirectly include fp-enum.h. This dependency was not listed anyway, resulting in a race condition during the build process.	2019-12-16 11:39:18 +01:00
				`@@ -1 +0,0 @@`
				`gcov-ignore-parse-errors = suspicious_hits.warn`