egis_etu905: move commands into read-only memory

There is no need for them to be writable and with the previous commit this change will also not result in any compiler warnings. Simply change all of the static definitions to be static const. Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>
egis_etu905: use const buffer for egis_etu905_exec_cmd command
2026-09-10 13:00:08 +00:00 · 2026-06-28 12:31:23 +02:00 · 2026-06-28 12:25:34 +02:00 · 2026-06-28 12:25:28 +02:00 · 2026-06-28 12:12:11 +02:00 · 2026-06-26 13:44:02 +02:00
95 changed files with 10581 additions and 5168 deletions
@@ -22,7 +22,7 @@ variables:
  FDO_DISTRIBUTION_TAG: $LIBFPRINT_IMAGE_TAG
  FDO_DISTRIBUTION_VERSION: rawhide
  FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
-  FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
+  FEDORA_IMAGE: "registry.freedesktop.org/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
  LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"

 workflow:
@@ -287,11 +287,15 @@ pages:
  needs:
    - job: test
      artifacts: true
+    - job: build
+      artifacts: true
  script:
    - mkdir public
-    - mv _build/meson-logs/coveragereport public/coverage
+    - 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
@@ -1,4 +1,7 @@
-#!/bin/sh
+#!/bin/sh -x

 # This wrapper just disables the malloc checker
-exec /usr/bin/scan-build --status-bugs -disable-checker unix.Malloc --exclude "_build/meson-private" "$@"
+exec /usr/bin/scan-build --status-bugs -disable-checker unix.Malloc \
+    --exclude "$PWD/_build/meson-private" \
+    --exclude "$PWD/meson-private" \
+    "$@"
@@ -77,6 +77,12 @@ 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*
@@ -85,7 +91,6 @@ usb:v1C7Ap0586*
 usb:v1C7Ap0587*
 usb:v1C7Ap0588*
 usb:v1C7Ap05A1*
-usb:v1C7Ap05A5*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0

@@ -163,12 +168,14 @@ 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

@@ -185,9 +192,12 @@ 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

@@ -201,12 +211,14 @@ 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*
@@ -236,8 +248,15 @@ 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

@@ -250,6 +269,12 @@ usb:v298Dp1010*
 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

@@ -284,6 +309,7 @@ usb:v06CBp0174*
 usb:v06CBp019D*
 usb:v06CBp019F*
 usb:v06CBp01A0*
+usb:v06CBp01A4*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0

@@ -490,7 +516,6 @@ usb:v2808pA553*
 usb:v298Dp2020*
 usb:v298Dp2033*
 usb:v2DF0p0003*
-usb:v3274p8012*
 usb:v3538p0930*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
@@ -75,6 +75,7 @@ fp_device_clear_storage_sync
 fp_device_suspend_sync
 fp_device_resume_sync
 FpDevice
+FpTemperature
 </SECTION>

 <SECTION>
@@ -100,12 +101,6 @@ FP_TYPE_IMAGE_DEVICE
 FpImageDevice
 </SECTION>

-<SECTION>
-<FILE>fp-sdcp-device</FILE>
-FP_TYPE_SDCP_DEVICE
-FpSdcpDevice
-</SECTION>
-
 <SECTION>
 <FILE>fp-print</FILE>
 FP_TYPE_PRINT
@@ -140,6 +135,134 @@ 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
@@ -159,6 +282,7 @@ 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
@@ -221,41 +345,17 @@ fpi_image_device_retry_scan
 fpi_image_device_set_bz3_threshold
 </SECTION>

-<SECTION>
-<FILE>fpi-sdcp-device</FILE>
-<TITLE>Internal FpSdcpDevice</TITLE>
-FpiSdcpClaim
-FpSdcpDeviceClass
-fpi_sdcp_claim_get_type
-fpi_sdcp_claim_new
-fpi_sdcp_claim_copy
-fpi_sdcp_claim_free
-fpi_sdcp_device_open_complete
-fpi_sdcp_device_get_connect_data
-fpi_sdcp_device_connect_complete
-fpi_sdcp_device_get_reconnect_data
-fpi_sdcp_device_reconnect_complete
-fpi_sdcp_device_list_complete
-fpi_sdcp_device_enroll_commit
-fpi_sdcp_device_enroll_commit_complete
-fpi_sdcp_device_get_identify_data
-fpi_sdcp_device_set_identify_data
-fpi_sdcp_device_identify_retry
-fpi_sdcp_device_identify_complete
-fpi_sdcp_device_get_print_id
-fpi_sdcp_device_set_print_id
-</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
-fp_dbg_hex_dump_bytes
-fp_dbg_hex_dump_gbytes
 </SECTION>

 <SECTION>
@@ -28,7 +28,6 @@
    <xi:include href="xml/fp-context.xml"/>
    <xi:include href="xml/fp-device.xml"/>
    <xi:include href="xml/fp-image-device.xml"/>
-    <xi:include href="xml/fp-sdcp-device.xml"/>
    <xi:include href="xml/fp-print.xml"/>
    <xi:include href="xml/fp-image.xml"/>
  </part>
@@ -39,7 +38,6 @@
      <title>Device methods for drivers</title>
      <xi:include href="xml/fpi-device.xml"/>
      <xi:include href="xml/fpi-image-device.xml"/>
-      <xi:include href="xml/fpi-sdcp-device.xml"/>
    </chapter>

    <chapter id="driver-helpers">
@@ -50,6 +48,12 @@
      <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"/>
@@ -121,7 +121,7 @@ start_clear_storage (FpDevice *dev, ClearStorageData *clear_storage_data)
 {
  char buffer[20];

-  g_print ("Clear device storage? [Y/n]? ");
+  g_print ("Clear device storage? [y/N]? ");
  if (fgets (buffer, sizeof (buffer), stdin) &&
      (buffer[0] == 'Y' || buffer[0] == 'y'))
    {
@@ -0,0 +1,230 @@
+/*
+ * 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,10 +1,15 @@
 /*
 * Driver for Egis Technology (LighTuning) Match-On-Chip sensors
- * Copyright (C) 2023-2025 Joshua Grisham <josh@joshuagrisham.com>
+ * 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
@@ -22,18 +27,16 @@

 #pragma once

+#include "fpi-device.h"
 #include "fpi-ssm.h"

-#include "fpi-sdcp-device.h"
-
-G_DECLARE_FINAL_TYPE (FpiDeviceEgisMoc, fpi_device_egismoc, FPI, DEVICE_EGISMOC, FpSdcpDevice)
+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_DRIVER_MAX_ENROLL_STAGES_15 (1 << 3)

 #define EGISMOC_EP_CMD_OUT (0x02 | FPI_USB_ENDPOINT_OUT)
 #define EGISMOC_EP_CMD_IN (0x81 | FPI_USB_ENDPOINT_IN)
@@ -49,11 +52,7 @@ G_DECLARE_FINAL_TYPE (FpiDeviceEgisMoc, fpi_device_egismoc, FPI, DEVICE_EGISMOC,

 #define EGISMOC_MAX_ENROLL_STAGES_DEFAULT 10
 #define EGISMOC_MAX_ENROLL_NUM 10
-#define EGISMOC_FINGER_ON_SENSOR_TIMEOUT_USEC (10 * G_USEC_PER_SEC)
-
-#define EGISMOC_CONNECT_RESPONSE_PREFIX_SIZE 15
-#define EGISMOC_IDENTIFY_RESPONSE_PREFIX_SIZE 14
-#define EGISMOC_ENROLL_STARTING_RESPONSE_PREFIX_SIZE 14
+#define EGISMOC_FINGERPRINT_DATA_SIZE 32
 #define EGISMOC_LIST_RESPONSE_PREFIX_SIZE 14
 #define EGISMOC_LIST_RESPONSE_SUFFIX_SIZE 2

@@ -73,9 +72,6 @@ static gsize cmd_fw_version_len = sizeof (cmd_fw_version) / sizeof (cmd_fw_versi
 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 rsp_sensor_has_finger_suffix[] = {0x90, 0x00, 0x90, 0x00};
-static gsize rsp_sensor_has_finger_suffix_len = sizeof (rsp_sensor_has_finger_suffix) / sizeof (rsp_sensor_has_finger_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]);

@@ -97,19 +93,18 @@ static gsize cmd_sensor_enroll_len = sizeof (cmd_sensor_enroll) / sizeof (cmd_se

 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 rsp_enroll_starting_suffix[] = {0x90, 0x00};
-static gsize rsp_enroll_starting_suffix_len = sizeof (rsp_enroll_starting_suffix) / sizeof (rsp_enroll_starting_suffix[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_capture_post_wait_finger[] = {0x00, 0x00, 0x00, 0x07, 0x50, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x80};
-static gsize cmd_capture_post_wait_finger_len = sizeof (cmd_capture_post_wait_finger) / sizeof (cmd_capture_post_wait_finger[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};
@@ -117,8 +112,6 @@ static gsize rsp_read_dirty_prefix_len = sizeof (rsp_read_dirty_prefix) / sizeof

 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]);
-static guchar rsp_commit_success_suffix[] = {0x90, 0x00};
-static gsize rsp_commit_success_suffix_len = sizeof (rsp_commit_success_suffix) / sizeof (rsp_commit_success_suffix[0]);


 /* commands which exist on the device but are currently not used */
@@ -137,13 +130,8 @@ static gsize rsp_commit_success_suffix_len = sizeof (rsp_commit_success_suffix)
 /* prefixes/suffixes and other things for dynamically created command payloads */

 #define EGISMOC_CHECK_BYTES_LENGTH 2
-
-static guchar cmd_sdcp_connect_prefix[] = {0x00, 0x00, 0x00, 0x6b, 0x50, 0x57, 0x01, 0x00, 0x00, 0x00, 0x62, 0x20};
-static gsize cmd_sdcp_connect_prefix_len = sizeof (cmd_sdcp_connect_prefix) / sizeof (cmd_sdcp_connect_prefix[0]);
-static guchar cmd_sdcp_connect_suffix[] = {0x00, 0x00};
-static gsize cmd_sdcp_connect_suffix_len = sizeof (cmd_sdcp_connect_suffix) / sizeof (cmd_sdcp_connect_suffix[0]);
-static guchar rsp_sdcp_connect_success_suffix[] = {0x90, 0x00};
-static gsize rsp_sdcp_connect_success_suffix_len = sizeof (rsp_sdcp_connect_success_suffix) / sizeof (rsp_sdcp_connect_success_suffix[0]);
+#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]);
@@ -181,18 +169,6 @@ typedef enum {
  DEV_INIT_STATES,
 } DeviceInitStates;

-typedef enum {
-  CONNECT,
-  CONNECT_RESPONSE,
-  CONNECT_STATES,
-} ConnectStates;
-
-typedef enum {
-  WAIT_FINGER_NOT_ON_SENSOR,
-  WAIT_FINGER_ON_SENSOR,
-  WAIT_FINGER_STATES,
-} WaitFingerStates;
-
 typedef enum {
  IDENTIFY_GET_ENROLLED_IDS,
  IDENTIFY_CHECK_ENROLLED_NUM,
@@ -201,6 +177,8 @@ typedef enum {
  IDENTIFY_WAIT_FINGER,
  IDENTIFY_SENSOR_CHECK,
  IDENTIFY_CHECK,
+  IDENTIFY_COMPLETE_SENSOR_RESET,
+  IDENTIFY_COMPLETE,
  IDENTIFY_STATES,
 } IdentifyStates;

@@ -216,10 +194,11 @@ typedef enum {
  ENROLL_CAPTURE_SENSOR_RESET,
  ENROLL_CAPTURE_SENSOR_START_CAPTURE,
  ENROLL_CAPTURE_WAIT_FINGER,
-  ENROLL_CAPTURE_POST_WAIT_FINGER,
  ENROLL_CAPTURE_READ_RESPONSE,
  ENROLL_COMMIT_START,
  ENROLL_COMMIT,
+  ENROLL_COMMIT_SENSOR_RESET,
+  ENROLL_COMPLETE,
  ENROLL_STATES,
 } EnrollStates;

@@ -547,10 +547,17 @@ 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 (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
+          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));
@@ -795,7 +802,7 @@ elan_calibrate (FpiDeviceElan *self)

  g_return_if_fail (!self->active);
  self->active = TRUE;
-  self->calib_atts_left = ELAN_CALIBRATION_ATTEMPTS;
+  self->calib_atts_left = ELAN_CALIBRATION_ATTEMPTS (self->dev_type);

  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (self), calibrate_run_state,
                             CALIBRATE_NUM_STATES);
@@ -31,6 +31,7 @@
 #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
@@ -44,7 +45,9 @@

 /* times to retry reading calibration status during one session
 * generally prevents calibration from looping indefinitely */
-#define ELAN_CALIBRATION_ATTEMPTS 10
+#define ELAN_DEFAULT_CALIBRATION_ATTEMPTS 10
+#define ELAN_CALIBRATION_ATTEMPTS(dev_type) \
+  ((dev_type) == ELAN_0C58 ? 30 : ELAN_DEFAULT_CALIBRATION_ATTEMPTS)

 /* min and max frames in a capture */
 #define ELAN_MIN_FRAMES 7
@@ -220,7 +223,7 @@ static const FpIdEntry elan_id_table[] = {
  {.vid = ELAN_VEND_ID,  .pid = 0x0c4f, .driver_data = ELAN_ALL_DEV},
  {.vid = ELAN_VEND_ID,  .pid = 0x0c63, .driver_data = ELAN_ALL_DEV},
  {.vid = ELAN_VEND_ID,  .pid = 0x0c6e, .driver_data = ELAN_ALL_DEV},
-  {.vid = ELAN_VEND_ID,  .pid = 0x0c58, .driver_data = ELAN_ALL_DEV},
+  {.vid = ELAN_VEND_ID,  .pid = 0x0c58, .driver_data = ELAN_0C58},
  {.vid = 0,  .pid = 0,  .driver_data = 0},
 };

@@ -33,12 +33,14 @@ static const FpIdEntry id_table[] = {
  { .vid = 0x04f3,  .pid = 0x0c8d,  },
  { .vid = 0x04f3,  .pid = 0x0c98,  },
  { .vid = 0x04f3,  .pid = 0x0c99,  },
+  { .vid = 0x04f3,  .pid = 0x0c9c,  },
  { .vid = 0x04f3,  .pid = 0x0c9d,  },
  { .vid = 0x04f3,  .pid = 0x0c9f,  },
  { .vid = 0x04f3,  .pid = 0x0ca3,  },
  { .vid = 0x04f3,  .pid = 0x0ca7,  },
  { .vid = 0x04f3,  .pid = 0x0ca8,  },
  { .vid = 0x04f3,  .pid = 0x0cb0,  },
+  { .vid = 0x04f3,  .pid = 0x0cb2,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };

@@ -94,7 +94,7 @@ static void
 elanspi_do_hwreset (FpiDeviceElanSpi *self, GError **err)
 {
  /* Skip in emulation mode, since we don't mock hid devices */
-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
+  if (fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
    return;

  /*
@@ -485,7 +485,8 @@ elanspi_capture_old_handler (FpiSsm *ssm, FpDevice *dev)
      if (!(self->sensor_status & 4))
        {
          /* has the timeout expired? -- disabled in testing since valgrind is very slow */
-          if (g_get_monotonic_time () > self->capture_timeout && g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") != 0)
+          if (g_get_monotonic_time () > self->capture_timeout &&
+              !fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
            {
              /* end with a timeout */
              fpi_ssm_mark_failed (ssm, g_error_new (G_IO_ERROR, G_IO_ERROR_TIMED_OUT, "timed out waiting for new line"));
@@ -22,6 +22,9 @@

 #define FP_COMPONENT "focaltech_moc"

+#define FOCALTECH_QUIRK_SINGLE_SLOT 1
+#define FOCALTECH_MOC_STATIC_USER_ID "focaltech_moc_static_id"
+
 #include "drivers_api.h"

 G_DEFINE_TYPE (FpiDeviceFocaltechMoc, fpi_device_focaltech_moc, FP_TYPE_DEVICE)
@@ -34,9 +37,12 @@ static const FpIdEntry id_table[] = {
  { .vid = 0x2808,  .pid = 0xa99a,  },
  { .vid = 0x2808,  .pid = 0xa57a,  },
  { .vid = 0x2808,  .pid = 0xa78a,  },
+  { .vid = 0x2808,  .pid = 0xa97a,  },
  { .vid = 0x2808,  .pid = 0x1579,  },
  { .vid = 0x2808,  .pid = 0x077A,  },
  { .vid = 0x2808,  .pid = 0x079A,  },
+  { .vid = 0x2808,  .pid = 0x5158,  },
+  { .vid = 0x2808,  .pid = 0x6553,  .driver_data = FOCALTECH_QUIRK_SINGLE_SLOT, },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };

@@ -193,6 +199,22 @@ focaltech_moc_check_cmd (uint8_t *response_buf, uint16_t len)
  return ret;
 }

+static gboolean
+focaltech_moc_require_response_len (FpiDeviceFocaltechMoc *self,
+                                    gsize                  length_in,
+                                    gsize                  minimum_length,
+                                    const char            *context)
+{
+  if (length_in >= minimum_length)
+    return TRUE;
+
+  fpi_ssm_mark_failed (self->task_ssm,
+                       fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
+                                                 "%s: short response (%zu < %zu)",
+                                                 context, length_in, minimum_length));
+  return FALSE;
+}
+
 static void
 fp_cmd_receive_cb (FpiUsbTransfer *transfer,
                   FpDevice       *device,
@@ -1042,10 +1064,15 @@ focaltech_moc_get_enrolled_info_cb (FpiDeviceFocaltechMoc *self,
      return;
    }

+  if (!focaltech_moc_require_response_len (self, length_in,
+                                           sizeof (FpCmd) + sizeof (uint8_t),
+                                           "get enrolled info"))
+    return;
+
  fp_cmd = (FpCmd *) buffer_in;
  items = (struct EnrolledInfoItem *) (fp_cmd + 1);

-  if (fp_cmd->code != 0x04)
+  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
    {
      fpi_ssm_mark_failed (self->task_ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1053,8 +1080,25 @@ focaltech_moc_get_enrolled_info_cb (FpiDeviceFocaltechMoc *self,
    }
  else
    {
-      memcpy (&data->enrolled_info->items[0], items,
-              FOCALTECH_MOC_MAX_FINGERS * sizeof (struct EnrolledInfoItem));
+      if (fp_cmd->code == 0x04)
+        {
+          if (!focaltech_moc_require_response_len (self, length_in,
+                                                   sizeof (FpCmd) +
+                                                   FOCALTECH_MOC_MAX_FINGERS * sizeof (struct EnrolledInfoItem) +
+                                                   sizeof (uint8_t),
+                                                   "get enrolled info"))
+            return;
+          memcpy (&data->enrolled_info->items[0], items,
+                  FOCALTECH_MOC_MAX_FINGERS * sizeof (struct EnrolledInfoItem));
+
+        }
+      else if (fp_cmd->code == 0x09)
+        {
+          memset (data->enrolled_info->actived, 0, FOCALTECH_MOC_MAX_FINGERS);
+          memset (&data->enrolled_info->items[0], 0,
+                  FOCALTECH_MOC_MAX_FINGERS * sizeof (struct EnrolledInfoItem));
+        }
+
      fpi_ssm_next_state (self->task_ssm);
    }
 }
@@ -1106,10 +1150,15 @@ focaltech_moc_get_enrolled_list_cb (FpiDeviceFocaltechMoc *self,
      return;
    }

+  if (!focaltech_moc_require_response_len (self, length_in,
+                                           sizeof (FpCmd) + sizeof (uint8_t),
+                                           "get enrolled list"))
+    return;
+
  fp_cmd = (FpCmd *) buffer_in;
  uid_list = (struct UidList *) (fp_cmd + 1);

-  if (fp_cmd->code != 0x04)
+  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
    {
      fpi_ssm_mark_failed (self->task_ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1118,46 +1167,57 @@ focaltech_moc_get_enrolled_list_cb (FpiDeviceFocaltechMoc *self,
  else
    {
      FpActionData *data = fpi_ssm_get_data (self->task_ssm);
-      int i;

-      for (i = 0; i < FOCALTECH_MOC_MAX_FINGERS; i++)
+      if (fp_cmd->code == 0x04)
        {
-          if (uid_list->actived[i] != 0)
+          if (!focaltech_moc_require_response_len (self, length_in,
+                                                   sizeof (FpCmd) +
+                                                   sizeof (struct UidList) +
+                                                   sizeof (uint8_t),
+                                                   "get enrolled list"))
+            return;
+          for (size_t i = 0; i < FOCALTECH_MOC_MAX_FINGERS; i++)
            {
-              struct UserId *user_id = &uid_list->uid[i];
-              FpPrint *print = fp_print_new (FP_DEVICE (self));
-              struct EnrolledInfoItem *item = NULL;
-              int index;
-
-              fp_info ("focaltechmoc add slot: %d", i);
-
-              fprint_set_uid (print, user_id->uid, sizeof (user_id->uid));
-
-              if (focaltech_moc_get_enrolled_info_item (self, user_id->uid, &item, &index) == 0)
+              if (uid_list->actived[i] != 0)
                {
-                  g_autofree gchar *userid_safe = NULL;
-                  const gchar *username;
-                  userid_safe = g_strndup ((const char *) &item->user_id, FOCALTECH_MOC_USER_ID_LENGTH);
-                  fp_dbg ("%s", userid_safe);
-                  fpi_print_fill_from_user_id (print, userid_safe);
-                  memcpy (data->enrolled_info->user_id[index].uid, user_id->uid, 32);
-                  data->enrolled_info->user_des[index].finger = fp_print_get_finger (print);
-                  username = fp_print_get_username (print);
+                  struct UserId *user_id = &uid_list->uid[i];
+                  FpPrint *print = fp_print_new (FP_DEVICE (self));
+                  struct EnrolledInfoItem *item = NULL;
+                  int index;

-                  if (username != NULL)
-                    strncpy (data->enrolled_info->user_des[index].username, username, 64);
+                  fp_info ("focaltechmoc add slot: %zu", i);
+
+                  fprint_set_uid (print, user_id->uid, sizeof (user_id->uid));
+
+                  if (focaltech_moc_get_enrolled_info_item (self, user_id->uid, &item, &index) == 0)
+                    {
+                      g_autofree gchar *userid_safe = NULL;
+                      const gchar *username;
+
+                      userid_safe = g_strndup ((const char *) &item->user_id, FOCALTECH_MOC_USER_ID_LENGTH);
+                      fp_dbg ("%s", userid_safe);
+                      fpi_print_fill_from_user_id (print, userid_safe);
+                      memcpy (data->enrolled_info->user_id[index].uid, user_id->uid, 32);
+                      data->enrolled_info->user_des[index].finger = fp_print_get_finger (print);
+                      username = fp_print_get_username (print);
+
+                      if (username != NULL)
+                        g_strlcpy (data->enrolled_info->user_des[index].username,
+                                   username,
+                                   sizeof (data->enrolled_info->user_des[index].username));
+                    }
+
+                  g_ptr_array_add (data->list_result, g_object_ref_sink (print));
                }
-
-              g_ptr_array_add (data->list_result, g_object_ref_sink (print));
            }
-        }

-      for (i = 0; i < FOCALTECH_MOC_MAX_FINGERS; i++)
-        {
-          struct EnrolledInfoItem *item = &data->enrolled_info->items[i];
+          for (size_t i = 0; i < FOCALTECH_MOC_MAX_FINGERS; i++)
+            {
+              struct EnrolledInfoItem *item = &data->enrolled_info->items[i];

-          if (data->enrolled_info->actived[i] == 0)
-            memset (item, 0, sizeof (struct EnrolledInfoItem));
+              if (data->enrolled_info->actived[i] == 0)
+                memset (item, 0, sizeof (struct EnrolledInfoItem));
+            }
        }

      fpi_ssm_next_state (self->task_ssm);
@@ -1279,9 +1339,21 @@ focaltech_moc_start_enroll_cb (FpiDeviceFocaltechMoc *self,
        }
      else
        {
+          guint64 quirk = fpi_device_get_driver_data (FP_DEVICE (self));
+
          fpi_device_get_enroll_data (FP_DEVICE (self), &print);
          fprint_set_uid (print, user_id->uid, sizeof (user_id->uid));
-          userid_safe = fpi_print_generate_user_id (print);
+
+          if (quirk == FOCALTECH_QUIRK_SINGLE_SLOT)
+            {
+              fp_info ("Applying SINGLE_SLOT quirk: Forcing static User ID");
+              userid_safe = g_strdup (FOCALTECH_MOC_STATIC_USER_ID);
+            }
+          else
+            {
+              userid_safe = fpi_print_generate_user_id (print);
+            }
+
          userid_len = strlen (userid_safe);
          userid_len = MIN (FOCALTECH_MOC_USER_ID_LENGTH, userid_len);
          fp_info ("focaltechmoc user id: %s", userid_safe);
@@ -1350,9 +1422,14 @@ focaltech_moc_set_enrolled_info_cb (FpiDeviceFocaltechMoc *self,
      return;
    }

+  if (!focaltech_moc_require_response_len (self, length_in,
+                                           sizeof (FpCmd) + sizeof (uint8_t),
+                                           "set enrolled info"))
+    return;
+
  fp_cmd = (FpCmd *) buffer_in;

-  if (fp_cmd->code != 0x04)
+  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
    {
      fpi_ssm_mark_failed (self->task_ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1377,9 +1454,14 @@ focaltech_moc_commit_cb (FpiDeviceFocaltechMoc *self,
      return;
    }

+  if (!focaltech_moc_require_response_len (self, length_in,
+                                           sizeof (FpCmd) + sizeof (uint8_t),
+                                           "commit"))
+    return;
+
  fp_cmd = (FpCmd *) buffer_in;

-  if (fp_cmd->code != 0x04)
+  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
    {
      fpi_ssm_mark_failed (self->task_ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1572,9 +1654,14 @@ focaltech_moc_delete_cb (FpiDeviceFocaltechMoc *self,
      return;
    }

+  if (!focaltech_moc_require_response_len (self, length_in,
+                                           sizeof (FpCmd) + sizeof (uint8_t),
+                                           "delete"))
+    return;
+
  fp_cmd = (FpCmd *) buffer_in;

-  if (fp_cmd->code != 0x04)
+  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
    {
      fpi_ssm_mark_failed (self->task_ssm,
                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
@@ -1769,8 +1856,9 @@ static void
 focaltech_moc_delete_print (FpDevice *device)
 {
  FpiDeviceFocaltechMoc *self = FPI_DEVICE_FOCALTECH_MOC (device);
-  FpActionData *data = g_new0 (FpActionData, 1);
+  FpActionData *data = NULL;

+  data = g_new0 (FpActionData, 1);
  data->enrolled_info = g_new0 (struct EnrolledInfo, 1);
  data->list_result = g_ptr_array_new_with_free_func (g_object_unref);

@@ -1781,6 +1869,87 @@ focaltech_moc_delete_print (FpDevice *device)
  fpi_ssm_start (self->task_ssm, task_ssm_done);
 }

+enum moc_clear_storage_states {
+  MOC_CLEAR_STORAGE_SEND,
+  MOC_CLEAR_STORAGE_NUM_STATES,
+};
+
+static void
+focaltech_moc_clear_storage_cb (FpiDeviceFocaltechMoc *self,
+                                uint8_t               *buffer_in,
+                                gsize                  length_in,
+                                GError                *error)
+{
+  FpCmd *fp_cmd = NULL;
+
+  if (error)
+    {
+      fp_warn ("Mass erase command completed with warning: %s", error->message);
+      fpi_ssm_mark_failed (self->task_ssm, error);
+      return;
+    }
+
+  if (length_in == 0)
+    {
+      fpi_device_clear_storage_complete (FP_DEVICE (self), NULL);
+      fpi_ssm_next_state (self->task_ssm);
+      return;
+    }
+
+  if (!focaltech_moc_require_response_len (self, length_in,
+                                           sizeof (FpCmd) + sizeof (uint8_t),
+                                           "clear storage"))
+    return;
+
+  fp_cmd = (FpCmd *) buffer_in;
+
+  if (fp_cmd->code != 0x04 && fp_cmd->code != 0x09)
+    {
+      fpi_ssm_mark_failed (self->task_ssm,
+                           fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
+                                                     "Clear storage failed: unexpected response code 0x%02x",
+                                                     fp_cmd->code));
+      return;
+    }
+
+  fpi_device_clear_storage_complete (FP_DEVICE (self), NULL);
+  fpi_ssm_next_state (self->task_ssm);
+}
+
+static void
+focaltech_clear_storage_run_state (FpiSsm *ssm, FpDevice *device)
+{
+  guint64 quirk = fpi_device_get_driver_data (device);
+  guint8 *cmd_buf = NULL;
+  uint16_t cmd_len = 0;
+  uint16_t resp_len = 0;
+
+  switch (fpi_ssm_get_cur_state (ssm))
+    {
+    case MOC_CLEAR_STORAGE_SEND:
+      resp_len = quirk == FOCALTECH_QUIRK_SINGLE_SLOT ? 0 : sizeof (uint8_t);
+      cmd_buf = focaltech_moc_compose_cmd (0xac, NULL, cmd_len);
+
+      focaltech_moc_get_cmd (device, cmd_buf,
+                             sizeof (FpCmd) + cmd_len + sizeof (uint8_t),
+                             sizeof (FpCmd) + resp_len + sizeof (uint8_t),
+                             FALSE,
+                             focaltech_moc_clear_storage_cb);
+      break;
+    }
+}
+
+static void
+focaltech_moc_clear_storage (FpDevice *device)
+{
+  FpiDeviceFocaltechMoc *self = FPI_DEVICE_FOCALTECH_MOC (device);
+
+  self->task_ssm = fpi_ssm_new (device,
+                                focaltech_clear_storage_run_state,
+                                MOC_CLEAR_STORAGE_NUM_STATES);
+  fpi_ssm_start (self->task_ssm, task_ssm_done);
+}
+
 enum moc_list_states {
  MOC_LIST_GET_ENROLLED_INFO,
  MOC_LIST_GET_ENROLLED_LIST,
@@ -1856,6 +2025,17 @@ fpi_device_focaltech_moc_init (FpiDeviceFocaltechMoc *self)
  G_DEBUG_HERE ();
 }

+static void
+focaltech_moc_probe (FpDevice *device)
+{
+  guint64 quirk = fpi_device_get_driver_data (device);
+
+  if (quirk == FOCALTECH_QUIRK_SINGLE_SLOT)
+    fpi_device_update_features (device, FP_DEVICE_FEATURE_STORAGE_DELETE, 0);
+
+  fpi_device_probe_complete (device, NULL, NULL, NULL);
+}
+
 static void
 fpi_device_focaltech_moc_class_init (FpiDeviceFocaltechMocClass *klass)
 {
@@ -1870,12 +2050,14 @@ fpi_device_focaltech_moc_class_init (FpiDeviceFocaltechMocClass *klass)
  dev_class->nr_enroll_stages = FOCALTECH_MOC_MAX_FINGERS;
  dev_class->temp_hot_seconds = -1;

+  dev_class->probe = focaltech_moc_probe;
  dev_class->open = focaltech_moc_open;
  dev_class->close = focaltech_moc_close;
  dev_class->verify = focaltech_moc_identify;
  dev_class->enroll = focaltech_moc_enroll;
  dev_class->identify = focaltech_moc_identify;
  dev_class->delete = focaltech_moc_delete_print;
+  dev_class->clear_storage = focaltech_moc_clear_storage;
  dev_class->list = focaltech_moc_list;

  fpi_device_class_auto_initialize_features (dev_class);
@@ -72,6 +72,7 @@ static const FpIdEntry id_table[] = {
  { .vid = 0x10A5,  .pid = 0x9524,  },
  { .vid = 0x10A5,  .pid = 0x9544,  },
  { .vid = 0x10A5,  .pid = 0xC844,  },
+  { .vid = 0x10A5,  .pid = 0x9B24,  },
  /* terminating entry */
  { .vid = 0,  .pid = 0,  .driver_data = 0 },
 };
@@ -271,13 +272,14 @@ static void
 fpc_cmd_ssm_done (FpiSsm *ssm, FpDevice *dev, GError *error)
 {
  FpiDeviceFpcMoc *self = FPI_DEVICE_FPCMOC (dev);
-  CommandData *data = fpi_ssm_get_data (ssm);
+  CommandData *data;

  self->cmd_ssm = NULL;
  /* Notify about the SSM failure from here instead. */
  if (error)
    {
      fp_err ("%s error: %s ", G_STRFUNC, error->message);
+      data = fpi_ssm_get_data (ssm);
      if (data->callback)
        data->callback (self, NULL, error);
    }
@@ -771,7 +771,7 @@ fp_enroll_update_cb (FpiDeviceGoodixMoc  *self,
                                  NULL,
                                  fpi_device_retry_new (FP_DEVICE_RETRY_REMOVE_FINGER));
    }
-  else if (resp->enroll_update.rollback)
+  else if (resp->enroll_update.rollback || resp->result == 0x73)
    {
      fpi_device_enroll_progress (FP_DEVICE (self),
                                  self->enroll_stage,
@@ -970,7 +970,7 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
        user_id_len = MIN (100, user_id_len);
        finger = 1;

-        if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
+        if (fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
          memset (self->template_id, 0, TEMPLATE_ID_SIZE);
        uid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
                                         user_id,
@@ -1390,7 +1390,7 @@ gx_fp_probe (FpDevice *device)
  if (!g_usb_device_claim_interface (usb_dev, 0, 0, &error))
    goto err_close;

-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
+  if (fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
    {

      serial = g_strdup ("emulated-device");
@@ -1417,6 +1417,7 @@ gx_fp_probe (FpDevice *device)
    case 0x60A2:
    case 0x60A4:
    case 0x6014:
+    case 0x6090:
    case 0x6092:
    case 0x6094:
    case 0x609A:
@@ -1437,6 +1438,8 @@ gx_fp_probe (FpDevice *device)
    case 0x6582:
    case 0x6A94:
    case 0x659A:
+    case 0x6890:
+    case 0x6984:
      self->max_enroll_stage = 12;
      break;

@@ -1666,6 +1669,7 @@ fpi_device_goodixmoc_init (FpiDeviceGoodixMoc *self)
 static const FpIdEntry id_table[] = {
  { .vid = 0x27c6,  .pid = 0x5840,  },
  { .vid = 0x27c6,  .pid = 0x6014,  },
+  { .vid = 0x27c6,  .pid = 0x6090,  },
  { .vid = 0x27c6,  .pid = 0x6092,  },
  { .vid = 0x27c6,  .pid = 0x6094,  },
  { .vid = 0x27c6,  .pid = 0x609A,  },
@@ -1695,8 +1699,10 @@ static const FpIdEntry id_table[] = {
  { .vid = 0x27c6,  .pid = 0x659C,  },
  { .vid = 0x27c6,  .pid = 0x6A94,  },
  { .vid = 0x27c6,  .pid = 0x6512,  },
+  { .vid = 0x27c6,  .pid = 0x6890,  },
  { .vid = 0x27c6,  .pid = 0x689A,  },
  { .vid = 0x27c6,  .pid = 0x66A9,  },
+  { .vid = 0x27c6,  .pid = 0x6984,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };

@@ -0,0 +1,261 @@
+#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;
@@ -30,6 +30,7 @@ static const FpIdEntry id_table[] = {
  { .vid = 0x0bda,  .pid = 0x5813,  },
  { .vid = 0x0bda,  .pid = 0x5816,  },
  { .vid = 0x2541,  .pid = 0xfa03,  },
+  { .vid = 0x3274,  .pid = 0x9003,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };

@@ -61,6 +61,7 @@ static const FpIdEntry id_table[] = {
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x019D,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x019F,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x01A0,  },
+  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x01A4,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };

@@ -1210,7 +1211,7 @@ prob_msg_cb (FpiDeviceSynaptics *self,
      return;
    }

-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
+  if (fpi_device_emulation_mode_enabled (FP_DEVICE (self)))
    serial = g_strdup ("emulated-device");
  else
    serial = g_usb_device_get_string_descriptor (usb_dev,
@@ -1380,7 +1380,7 @@ dev_init (FpImageDevice *dev)

  g_clear_pointer (&self->rand, g_rand_free);
  self->rand = g_rand_new ();
-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
+  if (fpi_device_emulation_mode_enabled (FP_DEVICE (dev)))
    g_rand_set_seed (self->rand, 0xFACADE);

  driver_data = fpi_device_get_driver_data (FP_DEVICE (dev));
@@ -119,7 +119,7 @@ async_abort_callback (FpiUsbTransfer *transfer, FpDevice *device,

  /* In normal case endpoint is empty */
  if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT) ||
-      (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0 && transfer->actual_length == 0))
+      (fpi_device_emulation_mode_enabled (device) && transfer->actual_length == 0))
    {
      g_clear_error (&error);
      fpi_ssm_next_state (transfer->ssm);
@@ -77,6 +77,7 @@ dev_identify (FpDevice *dev)
                                                 &idx))
        {
          match = g_ptr_array_index (prints, idx);
+          fp_print_set_finger (new_scan, fp_print_get_finger (match));
        }

      if (!self->match_reported)
@@ -165,11 +165,7 @@ process_cmds (FpDeviceVirtualDevice * self,
    {
      g_autofree gchar *cmd = NULL;

-      /* TODO: g_ptr_array_steal_index requires GLib 2.58, we depend on 2.56 */
-      cmd = g_ptr_array_index (self->pending_commands, 0);
-      g_ptr_array_index (self->pending_commands, 0) = NULL;
-      g_ptr_array_remove_index (self->pending_commands, 0);
-
+      cmd = g_ptr_array_steal_index (self->pending_commands, 0);
      g_debug ("Processing command %s", cmd);

      /* These are always processed. */
@@ -549,6 +545,9 @@ dev_verify (FpDevice *dev)
      else
        {
          success = fp_print_equal (print, new_scan);
+
+          if (success)
+            fp_print_set_finger (new_scan, fp_print_get_finger (print));
        }

      if (!self->match_reported)
@@ -1,342 +0,0 @@
-/*
- * Virtual driver for SDCP device debugging
- *
- * Copyright (C) 2025 Joshua Grisham <josh@joshuagrisham.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
- */
-
-/*
- * This is a virtual driver to debug the SDCP-based drivers.
- * This virtual driver does not use a socket listener but instead
- * embeds the simulated logic of the fake "device" directly within
- * the logic of each function. This driver also allows prints to be
- * registered programmatically, making it possible to test libfprint
- * and fprintd.
- *
- * This virtual driver will override FpSdcpDevice's dynamically
- * generated cryptography values and instead replace them with
- * pre-generated values taken from from Microsoft's sample client
- * implementation. See:
- *   https://github.com/Microsoft/SecureDeviceConnectionProtocol
- */
-
-#define FP_COMPONENT "virtual_sdcp"
-#include "fpi-log.h"
-
-#include "../fpi-sdcp.h"
-#include "virtual-sdcp.h"
-
-struct _FpDeviceVirtualSdcp
-{
-  FpSdcpDevice parent;
-
-  GPtrArray   *print_ids;
-};
-
-G_DECLARE_FINAL_TYPE (FpDeviceVirtualSdcp, fpi_device_virtual_sdcp, FPI, DEVICE_VIRTUAL_SDCP, FpSdcpDevice)
-G_DEFINE_TYPE (FpDeviceVirtualSdcp, fpi_device_virtual_sdcp, FP_TYPE_SDCP_DEVICE)
-
-/******************************************************************************/
-
-static const guint8 from_hex_map[] = {
-  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,   // 01234567
-  0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   // 89:;<=>?
-  0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,         // @abcdef
-};
-
-static GBytes *
-g_bytes_from_hex (const gchar *hex)
-{
-  g_autoptr(GBytes) res = NULL;
-  guint8 b0, b1;
-  gsize bytes_len = strlen (hex) / 2;
-  guint8 *bytes = g_malloc0 (bytes_len);
-
-  for (int i = 0; i < strlen (hex) - 1; i += 2)
-    {
-      b0 = ((guint8) hex[i + 0] & 0x1F) ^ 0x10;
-      b1 = ((guint8) hex[i + 1] & 0x1F) ^ 0x10;
-      bytes[i / 2] = (guint8) (from_hex_map[b0] << 4) | from_hex_map[b1];
-    }
-
-  res = g_bytes_new_take (bytes, bytes_len);
-
-  return g_steal_pointer (&res);
-}
-
-static FpiSdcpClaim *
-get_fake_sdcp_claim (void)
-{
-  FpiSdcpClaim *claim = g_new0 (FpiSdcpClaim, 1);
-
-  claim->model_certificate = g_bytes_from_hex (model_certificate_hex);
-  claim->device_public_key = g_bytes_from_hex (device_public_key_hex);
-  claim->firmware_public_key = g_bytes_from_hex (firmware_public_key_hex);
-  claim->firmware_hash = g_bytes_from_hex (firmware_hash_hex);
-  claim->model_signature = g_bytes_from_hex (model_signature_hex);
-  claim->device_signature = g_bytes_from_hex (device_signature_hex);
-  return g_steal_pointer (&claim);
-}
-
-/******************************************************************************/
-
-static void
-dev_identify (FpSdcpDevice *sdcp_device)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  FpDeviceVirtualSdcp *self = FPI_DEVICE_VIRTUAL_SDCP (sdcp_device);
-  g_autoptr(GBytes) enrollment_id = NULL;
-  g_autoptr(GBytes) identify_mac = NULL;
-  GBytes *identify_nonce = NULL;
-
-  if (self->print_ids->len > 0)
-    {
-      /*
-       * Pretend that the virtual device identified the first print.
-       * Since we used a pre-generated enrollment_id for it, we can also use the
-       * matching pre-generated test identify data for its identification.
-       */
-      identify_nonce = g_bytes_from_hex (identify_nonce_hex);
-      enrollment_id = g_bytes_from_hex (enrollment_id_hex);
-      fpi_sdcp_device_set_identify_data (sdcp_device, identify_nonce);
-      identify_mac = g_bytes_from_hex (identify_mac_hex);
-
-      fpi_sdcp_device_identify_complete (sdcp_device, enrollment_id, identify_mac, NULL);
-    }
-  else
-    {
-      fpi_sdcp_device_identify_complete (sdcp_device, NULL, NULL,
-                                         fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND));
-    }
-}
-
-static void
-dev_enroll_commit (FpSdcpDevice *sdcp_device, GBytes *id)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  FpDeviceVirtualSdcp *self = FPI_DEVICE_VIRTUAL_SDCP (sdcp_device);
-  g_autoptr(GBytes) expected_first_print_id = NULL;
-  GBytes *print_id;
-
-  print_id = g_bytes_new (g_bytes_get_data (id, NULL), g_bytes_get_size (id));
-
-  /*
-   * If this is the first print, it is probably good if we make sure the
-   * internal API assigned it the expected pre-known ID
-   */
-  if (self->print_ids->len == 0)
-    {
-      expected_first_print_id = g_bytes_from_hex (enrollment_id_hex);
-      if (!g_bytes_equal (print_id, expected_first_print_id))
-        {
-          fpi_sdcp_device_enroll_commit_complete (sdcp_device,
-                                                  fpi_device_error_new_msg (FP_DEVICE_ERROR_UNTRUSTED,
-                                                                            "First enrolled print ID does not match expected value"));
-          return;
-        }
-    }
-
-  g_ptr_array_add (self->print_ids, g_steal_pointer (&print_id));
-
-  fpi_sdcp_device_enroll_commit_complete (sdcp_device, NULL);
-}
-
-static void
-dev_enroll (FpSdcpDevice *sdcp_device)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  FpDeviceVirtualSdcp *self = FPI_DEVICE_VIRTUAL_SDCP (sdcp_device);
-  FpDevice *device = FP_DEVICE (sdcp_device);
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GBytes) nonce = NULL;
-  FpPrint *print;
-
-  fpi_device_get_enroll_data (device, &print);
-
-  if (self->print_ids->len == 0)
-    {
-      /* Use the hard-coded nonce for the first enrollment */
-      nonce = g_bytes_from_hex (enrollment_nonce_hex);
-    }
-  else
-    {
-      /* Generate a new nonce for all other enrollments */
-      nonce = fpi_sdcp_generate_random (&error);
-      if (error)
-        fpi_device_enroll_progress (device, 0, print, error);
-    }
-
-  fpi_device_enroll_progress (device, 1, print, NULL);
-  fpi_sdcp_device_enroll_commit (sdcp_device, nonce, error);
-}
-
-static void
-dev_list (FpSdcpDevice *sdcp_device)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  FpDeviceVirtualSdcp *self = FPI_DEVICE_VIRTUAL_SDCP (sdcp_device);
-  GPtrArray *print_ids = g_ptr_array_new_with_free_func ((GDestroyNotify) g_bytes_unref);
-
-  for (gint i = 0; i < self->print_ids->len; i++)
-    {
-      GBytes *print_id = g_ptr_array_index (self->print_ids, i);
-      fp_dbg ("print %d:", i);
-      fp_dbg_hex_dump_gbytes (print_id);
-      g_ptr_array_add (print_ids, g_bytes_new (g_bytes_get_data (print_id, NULL),
-                                               g_bytes_get_size (print_id)));
-    }
-
-  fpi_sdcp_device_list_complete (sdcp_device, g_steal_pointer (&print_ids), NULL);
-}
-
-static void
-dev_reconnect (FpSdcpDevice *sdcp_device)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GBytes) random = NULL;
-  g_autoptr(GBytes) reconnect_mac = g_bytes_from_hex (reconnect_mac_hex);
-
-  /*
-   * Normally, a driver would fetch the reconnect data and then send it to the
-   * device's Reconnect command. In this fake device, we will just fetch and
-   * verify the random was generated but do nothing with it
-   */
-
-  fpi_sdcp_device_get_reconnect_data (sdcp_device, &random);
-
-  g_assert (random);
-  g_assert (g_bytes_get_size (random) == SDCP_RANDOM_SIZE);
-
-  /*
-   * In emulation mode (FP_DEVICE_EMULATION=1), a different hard-coded random is
-   * set in fpi-sdcp-device, which was the same random used to generate the
-   * reconnect_mac value provided here
-   */
-
-  fpi_sdcp_device_reconnect_complete (sdcp_device, reconnect_mac, error);
-}
-
-static void
-dev_connect (FpSdcpDevice *sdcp_device)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GBytes) host_random = NULL;
-  g_autoptr(GBytes) host_public_key = NULL;
-  g_autoptr(GBytes) device_random = g_bytes_from_hex (device_random_hex);
-  g_autoptr(GBytes) connect_mac = g_bytes_from_hex (connect_mac_hex);
-  g_autoptr(FpiSdcpClaim) claim = get_fake_sdcp_claim ();
-
-  fpi_sdcp_device_get_connect_data (sdcp_device, &host_random, &host_public_key);
-
-  g_assert (host_random);
-  g_assert (g_bytes_get_size (host_random) == SDCP_RANDOM_SIZE);
-
-  g_assert (host_public_key);
-  g_assert (g_bytes_get_size (host_public_key) == SDCP_PUBLIC_KEY_SIZE);
-
-  fpi_sdcp_device_connect_complete (sdcp_device, device_random, claim, connect_mac, error);
-}
-
-static void
-dev_close (FpDevice *device)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  fpi_device_close_complete (device, NULL);
-}
-
-static void
-dev_open (FpSdcpDevice *sdcp_device)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  FpSdcpDeviceClass *klass = FP_SDCP_DEVICE_GET_CLASS (sdcp_device);
-
-  if (g_strcmp0 (g_getenv ("FP_VIRTUAL_SDCP_NO_RECONNECT"), "1") == 0)
-    {
-      fp_dbg ("Virtual SDCP device: FP_VIRTUAL_SDCP_NO_RECONNECT=1; disabling SDCP reconnect");
-      klass->reconnect = NULL;
-    }
-  else
-    {
-      fp_dbg ("Virtual SDCP device: FP_VIRTUAL_SDCP_NO_RECONNECT!=1; enabling SDCP reconnect");
-      klass->reconnect = dev_reconnect;
-    }
-
-  fpi_sdcp_device_open_complete (sdcp_device, NULL);
-}
-
-static void
-fpi_device_virtual_sdcp_finalize (GObject *object)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  FpDeviceVirtualSdcp *self = FPI_DEVICE_VIRTUAL_SDCP (object);
-
-  g_clear_pointer (&self->print_ids, g_ptr_array_unref);
-
-  G_OBJECT_CLASS (fpi_device_virtual_sdcp_parent_class)->finalize (object);
-}
-
-static void
-fpi_device_virtual_sdcp_init (FpDeviceVirtualSdcp *self)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-
-  /* Force FP_DEVICE_EMULATION=1 when using FpDeviceVirtualSdcp */
-  g_setenv ("FP_DEVICE_EMULATION", "1", TRUE);
-
-  self->print_ids = g_ptr_array_new_with_free_func ((GDestroyNotify) g_bytes_unref);
-}
-
-static const FpIdEntry driver_ids[] = {
-  { .virtual_envvar = "FP_VIRTUAL_SDCP" },
-  { .virtual_envvar = NULL }
-};
-
-static void
-fpi_device_virtual_sdcp_class_init (FpDeviceVirtualSdcpClass *klass)
-{
-  fp_dbg ("Virtual SDCP device: %s()", G_STRFUNC);
-  FpDeviceClass *dev_class = FP_DEVICE_CLASS (klass);
-  FpSdcpDeviceClass *sdcp_dev_class = FP_SDCP_DEVICE_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = fpi_device_virtual_sdcp_finalize;
-
-  dev_class->id = FP_COMPONENT;
-  dev_class->full_name = "Virtual SDCP device for debugging";
-  dev_class->type = FP_DEVICE_TYPE_VIRTUAL;
-  dev_class->id_table = driver_ids;
-  dev_class->nr_enroll_stages = 1;
-  dev_class->scan_type = FP_SCAN_TYPE_PRESS;
-
-  sdcp_dev_class->ignore_device_certificate = FALSE;
-  sdcp_dev_class->ignore_device_signatures = FALSE;
-
-  sdcp_dev_class->open = dev_open;
-  sdcp_dev_class->connect = dev_connect;
-  sdcp_dev_class->reconnect = dev_reconnect;
-
-  sdcp_dev_class->list = dev_list;
-  sdcp_dev_class->enroll = dev_enroll;
-  sdcp_dev_class->enroll_commit = dev_enroll_commit;
-  sdcp_dev_class->identify = dev_identify;
-
-  dev_class->close = dev_close;
-
-  fpi_device_class_auto_initialize_features (dev_class);
-  dev_class->features |= FP_DEVICE_FEATURE_STORAGE;
-}
@@ -1,92 +0,0 @@
-/*
- * Virtual driver test payloads for SDCP device debugging
- *
- * Copyright (C) 2025 Joshua Grisham <josh@joshuagrisham.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-compat.h"
-
-/* host keys */
-
-static const gchar host_private_key_hex[] = "8400ed14579cdf11586477e836e8cb52708441c1c2a447c218c5bbc2d118fbc7";
-static const gchar host_public_key_hex[]  = "0452f056ffb9c6728654771a3629b770767b19a2106a4916fb81ba06ef6797c4"
-                                            "a3df672ade0e9116d1abe278a8223abde4958d62d4ff6882159f0617c6f8ce10"
-                                            "bf";
-static const gchar host_random_hex[]      = "d877403abe82f4d97e1448c5052d83a532a45e56ef049cbbf981137520e713bf";
-
-/* device keys */
-
-static const gchar device_random_hex[]       = "6e2f6c1abef2a1973fb1315a17e209fdb0c78520f1fd6a85d294d7aeb40a04a7";
-static const gchar model_certificate_hex[]   = "30820323308202caa00302010202133300000004c45d661d6eed040d00000000"
-                                               "0004300a06082a8648ce3d0403023056310b3009060355040613025553311e30"
-                                               "1c060355040a13154d6963726f736f667420436f72706f726174696f6e312730"
-                                               "250603550403131e57696e646f77732048656c6c6f2032303936414443432043"
-                                               "412032303231301e170d3232303130343231303033355a170d32333034303432"
-                                               "31303033355a301c311a3018060355040313115365637572652042494f205365"
-                                               "6e736f723059301306072a8648ce3d020106082a8648ce3d0301070342000414"
-                                               "cfc287f872a2b7d3339e0b31390e3ca688e61165eaa6687c959270e07666b1fa"
-                                               "19e3efaf1750d134a886d494424fe471970c4b06838408a18d1f5d57735dd7a3"
-                                               "8201af308201ab30750603551d11046e306ca46a30683132303006082b060104"
-                                               "82376402132436423045413344382d383339372d343444332d383043392d3930"
-                                               "324130414346344343303132303006082b060104823764011324413944423730"
-                                               "32362d433646462d344341462d423134382d393133454641333730423933301d"
-                                               "0603551d0e04160414db6d66d642b7236d5e6bb2ec2186decda98067b6301f06"
-                                               "03551d23041830168014bf3748e34a632de953a3ba890298c069472a99b9305f"
-                                               "0603551d1f045830563054a052a050864e687474703a2f2f7777772e6d696372"
-                                               "6f736f66742e636f6d2f706b696f70732f63726c2f57696e646f777325323048"
-                                               "656c6c6f25323032303936414443432532304341253230323032312e63726c30"
-                                               "6c06082b060105050701010460305e305c06082b060105050730028650687474"
-                                               "703a2f2f7777772e6d6963726f736f66742e636f6d2f706b696f70732f636572"
-                                               "74732f57696e646f777325323048656c6c6f2532303230393641444343253230"
-                                               "4341253230323032312e637274300c0603551d130101ff040230003015060355"
-                                               "1d25040e300c060a2b0601040182374c2b01300a06082a8648ce3d0403020347"
-                                               "003044022077553ef520f732e03cd740c8cf807e6366e12918bc581f75bfe0f1"
-                                               "95b7b1fd4f0220324e25b93b9da7538b797a624272b21b7cc0e96ea487924250"
-                                               "4677600450f283";
-static const gchar device_public_key_hex[]   = "04e2787890a684f95b96b9a2316ca8d3d33d4d79ff4c89dc6f9e888e973990d1"
-                                               "d3154133dcc8bd33b99af9dbf0673390d404d092498a3f214cd93f9b9f28fb5f"
-                                               "66";
-static const gchar firmware_public_key_hex[] = "04f06a84ab51a3a6e8ff46868f91dd720e4cdad21f2e090d11e8f9bfc2ea19ee"
-                                               "1b5eac850b4532968a9399f76cd779e7723e8c2ca73b597c0df5f73b94a36f2b"
-                                               "6c";
-static const gchar firmware_hash_hex[]       = "c3bf47ea1f4a4a605470313cacb3a44f4a461f68c6faeab07e737610cb5ac835";
-static const gchar model_signature_hex[]     = "febe6ba3107813e185f05189e69ae79d9f7a40802582d94324459844c8b97ec6"
-                                               "c5daed5462276cb8a193c33e350424b0305d63d79a93a9188dcfc0cb5595f6c1";
-static const gchar device_signature_hex[]    = "10cc57dd8dafb463510a7327a5fca49b698e999b36448e2023eaf0dff0b0d4a3"
-                                               "4f1caf4e872b77364a0a00d7476554d0324c4cc931937e232a0315837d696c06";
-static const gchar connect_mac_hex[]         = "422bc475a78f972bae842a28e5ad721207457fcbd9a1a3aaf71587c07b84d247";
-
-/* expected application_secret based on above */
-
-static const gchar application_secret_hex[] = "13330ba3135ecf5dc71cede01a886540771efab35c8ba053902b2c1ee7de6efe";
-
-/* test verify_reconnect values */
-
-static const gchar reconnect_random_hex[] = "8a7451c1d3a8dca1c1330ca50d73454b351a49f46c8e9dcee15c964d295c31c9";
-static const gchar reconnect_mac_hex[]    = "bf3f3bb3bd6ecb2784c160f526f7bc3b3ca8faf5557194c48e0024a0493903c7";
-
-/* test enrollment_id values */
-
-static const gchar enrollment_nonce_hex[] = "c2101c44c9a667bba397e81f48b143398603e2c9335a68b409e1dbe71e005ca2";
-static const gchar enrollment_id_hex[]    = "67109dc70a216331f1580ddac601915929c1ff6c9bcba6544ba572c660c3d91e";
-
-/* test verify_identify values */
-
-static const gchar identify_nonce_hex[] = "3a1b506f5bec089059acefb9b44dfbdea7a599ee9aa267e5252664d60b798053";
-static const gchar identify_mac_hex[]   = "53a723eef40713094a90c5ef9996cbd6ba268e30676cd7107705a6c3e3e1eff9";
@@ -22,6 +22,7 @@
 #pragma once

 #include "fpi-compat.h"
+#include "fpi-enums.h"
 #include "fpi-assembling.h"
 #include "fpi-device.h"
 #include "fpi-image-device.h"
@@ -143,7 +143,6 @@ typedef enum {
 * @FP_DEVICE_ERROR_DATA_DUPLICATE: Enrolling template duplicates storaged templates
 * @FP_DEVICE_ERROR_REMOVED: The device has been removed.
 * @FP_DEVICE_ERROR_TOO_HOT: The device might be getting too hot
- * @FP_DEVICE_ERROR_UNTRUSTED: Device cannot be trusted
 *
 * Error codes for device operations. More specific errors from other domains
 * such as #G_IO_ERROR or #G_USB_DEVICE_ERROR may also be reported.
@@ -162,7 +161,6 @@ typedef enum {
  /* Leave some room to add more DATA related errors */
  FP_DEVICE_ERROR_REMOVED = 0x100,
  FP_DEVICE_ERROR_TOO_HOT,
-  FP_DEVICE_ERROR_UNTRUSTED,
 } FpDeviceError;

 GQuark fp_device_retry_quark (void);
@@ -605,18 +605,16 @@ fp_print_equal (FpPrint *self, FpPrint *other)
  if (g_strcmp0 (self->device_id, other->device_id))
    return FALSE;

-  if (self->type == FPI_PRINT_RAW || self->type == FPI_PRINT_SDCP)
+  switch (self->type)
    {
+    case FPI_PRINT_RAW:
      return g_variant_equal (self->data, other->data);
-    }
-  else if (self->type == FPI_PRINT_NBIS)
-    {
-      guint i;

+    case FPI_PRINT_NBIS:
      if (self->prints->len != other->prints->len)
        return FALSE;

-      for (i = 0; i < self->prints->len; i++)
+      for (guint i = 0; i < self->prints->len; i++)
        {
          struct xyt_struct *a = g_ptr_array_index (self->prints, i);
          struct xyt_struct *b = g_ptr_array_index (other->prints, i);
@@ -626,11 +624,12 @@ fp_print_equal (FpPrint *self, FpPrint *other)
        }

      return TRUE;
-    }
-  else
-    {
+
+    case FPI_PRINT_UNDEFINED:
      g_assert_not_reached ();
    }
+
+  g_return_val_if_reached (FALSE);
 }

 #define FPI_PRINT_VARIANT_TYPE G_VARIANT_TYPE ("(issbymsmsia{sv}v)")
@@ -765,7 +764,7 @@ fp_print_deserialize (const guchar *data,
  g_autoptr(GVariant) value = NULL;
  g_autoptr(GVariant) print_data = NULL;
  g_autoptr(GDate) date = NULL;
-  guchar *aligned_data = NULL;
+  g_autoptr(GBytes) bytes = NULL;
  guint8 finger_int8;
  FpFinger finger;
  g_autofree gchar *username = NULL;
@@ -787,14 +786,10 @@ fp_print_deserialize (const guchar *data,
   * of this function (meaning we don't need to keep the data around.
   */

-  /* To support GLIB < 2.60 we need to make sure that the memory is aligned correctly.
-   * We also need to copy the backing store for the raw data that we may keep for
-   * longer. */
-  aligned_data = g_malloc (length - 3);
-  memcpy (aligned_data, data + 3, length - 3);
-  raw_value = g_variant_new_from_data (FPI_PRINT_VARIANT_TYPE,
-                                       aligned_data, length - 3,
-                                       FALSE, g_free, aligned_data);
+  /* We need to copy the backing store for the raw data that we may keep for
+   * longer. Using a GBytes also ensures the data is correctly aligned. */
+  bytes = g_bytes_new (data + 3, length - 3);
+  raw_value = g_variant_new_from_bytes (FPI_PRINT_VARIANT_TYPE, bytes, FALSE);

  if (!raw_value)
    goto invalid_format;
@@ -821,72 +816,81 @@ fp_print_deserialize (const guchar *data,
  finger = finger_int8;

  /* Assume data is valid at this point if the values are somewhat sane. */
-  if (type == FPI_PRINT_NBIS)
+  switch (type)
    {
-      g_autoptr(GVariant) prints = g_variant_get_child_value (print_data, 0);
-      guint i;
+    case FPI_PRINT_NBIS:
+      {
+        g_autoptr(GVariant) prints = g_variant_get_child_value (print_data, 0);
+        guint i;

-      result = g_object_new (FP_TYPE_PRINT,
-                             "driver", driver,
-                             "device-id", device_id,
-                             "device-stored", device_stored,
-                             NULL);
-      g_object_ref_sink (result);
-      fpi_print_set_type (result, FPI_PRINT_NBIS);
-      for (i = 0; i < g_variant_n_children (prints); i++)
-        {
-          g_autofree struct xyt_struct *xyt = NULL;
-          const gint32 *xcol, *ycol, *thetacol;
-          gsize xlen, ylen, thetalen;
-          g_autoptr(GVariant) xyt_data = NULL;
-          GVariant *child;
+        result = g_object_new (FP_TYPE_PRINT,
+                               "driver", driver,
+                               "device-id", device_id,
+                               "device-stored", device_stored,
+                               NULL);
+        g_object_ref_sink (result);
+        fpi_print_set_type (result, FPI_PRINT_NBIS);
+        for (i = 0; i < g_variant_n_children (prints); i++)
+          {
+            g_autofree struct xyt_struct *xyt = NULL;
+            const gint32 *xcol, *ycol, *thetacol;
+            gsize xlen, ylen, thetalen;
+            g_autoptr(GVariant) xyt_data = NULL;
+            GVariant *child;

-          xyt_data = g_variant_get_child_value (prints, i);
+            xyt_data = g_variant_get_child_value (prints, i);

-          child = g_variant_get_child_value (xyt_data, 0);
-          xcol = g_variant_get_fixed_array (child, &xlen, sizeof (gint32));
-          g_variant_unref (child);
+            child = g_variant_get_child_value (xyt_data, 0);
+            xcol = g_variant_get_fixed_array (child, &xlen, sizeof (gint32));
+            g_variant_unref (child);

-          child = g_variant_get_child_value (xyt_data, 1);
-          ycol = g_variant_get_fixed_array (child, &ylen, sizeof (gint32));
-          g_variant_unref (child);
+            child = g_variant_get_child_value (xyt_data, 1);
+            ycol = g_variant_get_fixed_array (child, &ylen, sizeof (gint32));
+            g_variant_unref (child);

-          child = g_variant_get_child_value (xyt_data, 2);
-          thetacol = g_variant_get_fixed_array (child, &thetalen, sizeof (gint32));
-          g_variant_unref (child);
+            child = g_variant_get_child_value (xyt_data, 2);
+            thetacol = g_variant_get_fixed_array (child, &thetalen, sizeof (gint32));
+            g_variant_unref (child);

-          if (xlen != ylen || xlen != thetalen)
-            goto invalid_format;
+            if (xlen != ylen || xlen != thetalen)
+              goto invalid_format;

-          if (xlen > G_N_ELEMENTS (xyt->xcol))
-            goto invalid_format;
+            if (xlen > G_N_ELEMENTS (xyt->xcol))
+              goto invalid_format;

-          xyt = g_new0 (struct xyt_struct, 1);
-          xyt->nrows = xlen;
-          memcpy (xyt->xcol, xcol, sizeof (xcol[0]) * xlen);
-          memcpy (xyt->ycol, ycol, sizeof (xcol[0]) * xlen);
-          memcpy (xyt->thetacol, thetacol, sizeof (xcol[0]) * xlen);
+            xyt = g_new0 (struct xyt_struct, 1);
+            xyt->nrows = xlen;
+            memcpy (xyt->xcol, xcol, sizeof (xcol[0]) * xlen);
+            memcpy (xyt->ycol, ycol, sizeof (xcol[0]) * xlen);
+            memcpy (xyt->thetacol, thetacol, sizeof (xcol[0]) * xlen);

-          g_ptr_array_add (result->prints, g_steal_pointer (&xyt));
-        }
-    }
-  else if (type == FPI_PRINT_RAW || type == FPI_PRINT_SDCP)
-    {
-      g_autoptr(GVariant) fp_data = g_variant_get_child_value (print_data, 0);
+            g_ptr_array_add (result->prints, g_steal_pointer (&xyt));
+          }
+      }
+      break;

-      result = g_object_new (FP_TYPE_PRINT,
-                             "fpi-type", type,
-                             "driver", driver,
-                             "device-id", device_id,
-                             "device-stored", device_stored,
-                             "fpi-data", fp_data,
-                             NULL);
-      g_object_ref_sink (result);
-    }
-  else
-    {
-      g_warning ("Invalid print type: 0x%X", type);
-      goto invalid_format;
+    case FPI_PRINT_RAW:
+      {
+        g_autoptr(GVariant) fp_data = g_variant_get_child_value (print_data, 0);
+
+        result = g_object_new (FP_TYPE_PRINT,
+                               "fpi-type", type,
+                               "driver", driver,
+                               "device-id", device_id,
+                               "device-stored", device_stored,
+                               "fpi-data", fp_data,
+                               NULL);
+        g_object_ref_sink (result);
+      }
+      break;
+
+    case FPI_PRINT_UNDEFINED:
+      {
+        g_autofree char *type_str = g_enum_to_string (fpi_print_type_get_type (), type);
+        g_warning ("Invalid print type: 0x%X (%s)", type, type_str);
+
+        goto invalid_format;
+      }
    }

  date = g_date_new_julian (julian_date);
@@ -1,46 +0,0 @@
-/*
- * FpSdcpDevice - A base class for SDCP enabled devices
- * Copyright (C) 2020 Benjamin Berg <bberg@redhat.com>
- * Copyright (C) 2025 Joshua Grisham <josh@joshuagrisham.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-sdcp-device.h"
-
-typedef struct
-{
-  GBytes *host_private_key;
-  GBytes *host_public_key;
-  GBytes *host_random;
-  GBytes *reconnect_random;
-  GBytes *identify_nonce;
-  GBytes *data;
-} FpSdcpDevicePrivate;
-
-void fpi_sdcp_device_get_application_secret (FpSdcpDevice *self,
-                                             GBytes      **application_secret);
-void fpi_sdcp_device_set_application_secret (FpSdcpDevice *self,
-                                             GBytes       *application_secret);
-
-void fpi_sdcp_device_open (FpSdcpDevice *self);
-void fpi_sdcp_device_connect (FpSdcpDevice *self);
-void fpi_sdcp_device_reconnect (FpSdcpDevice *self);
-
-void fpi_sdcp_device_list (FpSdcpDevice *self);
-void fpi_sdcp_device_enroll (FpSdcpDevice *self);
-void fpi_sdcp_device_identify (FpSdcpDevice *self);
@@ -1,177 +0,0 @@
-/*
- * FpSdcpDevice - A base class for SDCP enabled devices
- * Copyright (C) 2020 Benjamin Berg <bberg@redhat.com>
- * Copyright (C) 2025 Joshua Grisham <josh@joshuagrisham.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 "sdcp_device"
-#include "fpi-log.h"
-
-#include "fp-sdcp-device-private.h"
-
-/**
- * SECTION: fp-sdcp-device
- * @title: FpSdcpDevice
- * @short_description: SDCP device subclass
- *
- * This is a base class for devices implementing the SDCP security protocol.
- */
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (FpSdcpDevice, fp_sdcp_device, FP_TYPE_DEVICE)
-
-enum {
-  PROP_0,
-  PROP_SDCP_DATA,
-  N_PROPS
-};
-
-static GParamSpec *properties[N_PROPS];
-
-/*******************************************************/
-
-/* Callbacks/vfuncs */
-static void
-fp_sdcp_device_open (FpDevice *device)
-{
-  FpSdcpDevice *self = FP_SDCP_DEVICE (device);
-
-  fpi_sdcp_device_open (self);
-}
-
-static void
-fp_sdcp_device_list (FpDevice *device)
-{
-  FpSdcpDevice *self = FP_SDCP_DEVICE (device);
-
-  fpi_sdcp_device_list (self);
-}
-
-static void
-fp_sdcp_device_enroll (FpDevice *device)
-{
-  FpSdcpDevice *self = FP_SDCP_DEVICE (device);
-
-  fpi_sdcp_device_enroll (self);
-}
-
-static void
-fp_sdcp_device_identify (FpDevice *device)
-{
-  FpSdcpDevice *self = FP_SDCP_DEVICE (device);
-
-  fpi_sdcp_device_identify (self);
-}
-
-/*********************************************************/
-
-static void
-fp_sdcp_device_finalize (GObject *object)
-{
-  FpSdcpDevice *self = (FpSdcpDevice *) object;
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-
-  g_clear_pointer (&priv->host_private_key, g_bytes_unref);
-  g_clear_pointer (&priv->host_public_key, g_bytes_unref);
-  g_clear_pointer (&priv->host_random, g_bytes_unref);
-  g_clear_pointer (&priv->reconnect_random, g_bytes_unref);
-  g_clear_pointer (&priv->identify_nonce, g_bytes_unref);
-  g_clear_pointer (&priv->data, g_bytes_unref);
-
-  G_OBJECT_CLASS (fp_sdcp_device_parent_class)->finalize (object);
-}
-
-static void
-fp_sdcp_device_get_property (GObject    *object,
-                             guint       prop_id,
-                             GValue     *value,
-                             GParamSpec *pspec)
-{
-  FpSdcpDevice *self = (FpSdcpDevice *) object;
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-
-  switch (prop_id)
-    {
-    case PROP_SDCP_DATA:
-      g_value_set_boxed (value, priv->data);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-fp_sdcp_device_set_property (GObject      *object,
-                             guint         prop_id,
-                             const GValue *value,
-                             GParamSpec   *pspec)
-{
-  FpSdcpDevice *self = FP_SDCP_DEVICE (object);
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-
-  switch (prop_id)
-    {
-    case PROP_SDCP_DATA:
-      g_clear_pointer (&priv->data, g_bytes_unref);
-      priv->data = g_value_dup_boxed (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-fp_sdcp_device_constructed (GObject *obj)
-{
-  G_OBJECT_CLASS (fp_sdcp_device_parent_class)->constructed (obj);
-}
-
-static void
-fp_sdcp_device_class_init (FpSdcpDeviceClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  FpDeviceClass *fp_device_class = FP_DEVICE_CLASS (klass);
-
-  object_class->finalize = fp_sdcp_device_finalize;
-  object_class->get_property = fp_sdcp_device_get_property;
-  object_class->set_property = fp_sdcp_device_set_property;
-  object_class->constructed = fp_sdcp_device_constructed;
-
-  fp_device_class->open = fp_sdcp_device_open;
-  fp_device_class->list = fp_sdcp_device_list;
-  fp_device_class->enroll = fp_sdcp_device_enroll;
-  fp_device_class->verify = fp_sdcp_device_identify;
-  fp_device_class->identify = fp_sdcp_device_identify;
-
-  properties[PROP_SDCP_DATA] =
-    g_param_spec_boxed ("sdcp-data",
-                        "SDCP Data",
-                        "SDCP-related device data that should be persisted and used with the "
-                        "device during the current system boot",
-                        G_TYPE_BYTES,
-                        G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
-
-  g_object_class_install_properties (object_class, N_PROPS, properties);
-
-  fpi_device_class_auto_initialize_features (fp_device_class);
-}
-
-static void
-fp_sdcp_device_init (FpSdcpDevice *self)
-{
-}
@@ -65,6 +65,31 @@ fpi_byte_reader_new (const guint8 * data, guint size)
  return ret;
 }

+/**
+ * fpi_byte_reader_new_bytes: (skip)
+ * @bytes: (in) (transfer none): a #GBytes instance from which the
+ *     #FpiByteReader should read
+ *
+ * Create a new #FpiByteReader instance, which will read from @bytes.
+ *
+ * Free-function: fpi_byte_reader_free
+ *
+ * Returns: (transfer full): a new #FpiByteReader instance
+ */
+FpiByteReader *
+fpi_byte_reader_new_bytes (GBytes * bytes)
+{
+  const guint8 *data;
+  gsize size = 0;
+
+  g_return_val_if_fail (bytes != NULL, NULL);
+
+  data = g_bytes_get_data (bytes, &size);
+  g_return_val_if_fail (size <= G_MAXUINT, NULL);
+
+  return fpi_byte_reader_new (data, (guint) size);
+}
+
 /**
 * fpi_byte_reader_free:
 * @reader: (in) (transfer full): a #FpiByteReader instance
@@ -100,6 +125,30 @@ fpi_byte_reader_init (FpiByteReader * reader, const guint8 * data, guint size)
  reader->byte = 0;
 }

+/**
+ * fpi_byte_reader_init_bytes:
+ * @reader: a #FpiByteReader instance
+ * @bytes: (in) (transfer none): a #GBytes instance from which
+ *     the #FpiByteReader should read
+ *
+ * Initializes a #FpiByteReader instance to read from @bytes. This function
+ * can be called on already initialized instances.
+ */
+FpiByteReader *
+fpi_byte_reader_init_bytes (FpiByteReader * reader, GBytes * bytes)
+{
+  g_return_val_if_fail (reader != NULL, NULL);
+  g_return_val_if_fail (bytes != NULL, NULL);
+
+  gsize size = 0;
+  const guint8 *data = g_bytes_get_data (bytes, &size);
+
+  g_return_val_if_fail (size <= G_MAXUINT, NULL);
+  fpi_byte_reader_init (reader, data, (guint) size);
+
+  return reader;
+}
+
 /**
 * fpi_byte_reader_peek_sub_reader: (skip)
 * @reader: an existing and initialized #FpiByteReader instance
@@ -799,6 +848,41 @@ fpi_byte_reader_peek_data (const FpiByteReader * reader, guint size,
  return fpi_byte_reader_peek_data_inline (reader, size, val);
 }

+/**
+ * fpi_byte_reader_get_data_fixed:
+ * @reader: a #FpiByteReader instance
+ * @size: Size in bytes
+ * @val: (out) (array length=size): address of a buffer to copy data into
+ *
+ * Copies @size bytes from the current data position into @val if at
+ * least @size bytes are left, and updates the current position.
+ *
+ * Returns: %TRUE if successful, %FALSE otherwise.
+ */
+gboolean
+(fpi_byte_reader_get_data_static) (FpiByteReader * reader, guint size,
+    const guint8 * val)
+{
+  return (fpi_byte_reader_get_data_inline_static) (reader, size, val);
+}
+
+/**
+ * fpi_byte_reader_peek_data_fixed:
+ * @reader: a #FpiByteReader instance
+ * @size: Size in bytes
+ * @val: (out) (array length=size): address of a buffer to copy data into
+ *
+ * Like fpi_byte_reader_get_data_fixed() but does not advance the position.
+ *
+ * Returns: %TRUE if successful, %FALSE otherwise.
+ */
+gboolean
+(fpi_byte_reader_peek_data_static) (const FpiByteReader * reader, guint size,
+    guint8 * val)
+{
+  return (fpi_byte_reader_peek_data_inline_static) (reader, size, val);
+}
+
 /**
 * fpi_byte_reader_dup_data:
 * @reader: a #FpiByteReader instance
@@ -50,6 +50,7 @@ typedef struct {

 FpiByteReader * fpi_byte_reader_new             (const guint8 *data, guint size) G_GNUC_MALLOC;

+FpiByteReader * fpi_byte_reader_new_bytes       (GBytes *bytes) G_GNUC_MALLOC;

 void            fpi_byte_reader_free            (FpiByteReader *reader);

@@ -57,6 +58,9 @@ void            fpi_byte_reader_free            (FpiByteReader *reader);
 void            fpi_byte_reader_init            (FpiByteReader *reader, const guint8 *data, guint size);


+FpiByteReader * fpi_byte_reader_init_bytes      (FpiByteReader *reader, GBytes *bytes);
+
+
 gboolean        fpi_byte_reader_peek_sub_reader (FpiByteReader * reader,
                                                 FpiByteReader * sub_reader,
                                                 guint           size);
@@ -218,8 +222,21 @@ gboolean        fpi_byte_reader_dup_data        (FpiByteReader * reader, guint s
 gboolean        fpi_byte_reader_get_data        (FpiByteReader * reader, guint size, const guint8 ** val);


+gboolean        fpi_byte_reader_get_data_static (FpiByteReader * reader, guint size, const guint8  * val);
+
+
 gboolean        fpi_byte_reader_peek_data       (const FpiByteReader * reader, guint size, const guint8 ** val);

+
+gboolean        fpi_byte_reader_peek_data_static (const FpiByteReader * reader, guint size, guint8   * val);
+
+
+GBytes *        fpi_byte_reader_get_bytes       (FpiByteReader *reader, guint size);
+
+
+GBytes *        fpi_byte_reader_peek_bytes      (const FpiByteReader *reader, guint size);
+
+
 #define fpi_byte_reader_dup_string(reader,str) \
    fpi_byte_reader_dup_string_utf8(reader,str)

@@ -642,6 +659,60 @@ fpi_byte_reader_peek_data_inline (const FpiByteReader * reader, guint size, cons
  return TRUE;
 }

+static inline GBytes *
+fpi_byte_reader_peek_bytes_inline (const FpiByteReader *reader, guint size)
+{
+  const guint8 *data;
+
+  g_return_val_if_fail (reader != NULL, NULL);
+
+  if (G_UNLIKELY (size > reader->size || fpi_byte_reader_get_remaining_unchecked (reader) < size))
+    return NULL;
+
+  data = fpi_byte_reader_peek_data_unchecked (reader);
+  return g_bytes_new_static (data, size);
+}
+
+static inline GBytes *
+fpi_byte_reader_get_bytes_inline (FpiByteReader *reader, guint size)
+{
+  const guint8 *data;
+
+  g_return_val_if_fail (reader != NULL, NULL);
+
+  if (G_UNLIKELY (size > reader->size || fpi_byte_reader_get_remaining_unchecked (reader) < size))
+    return NULL;
+
+  data = fpi_byte_reader_get_data_unchecked (reader, size);
+  return g_bytes_new_static (data, size);
+}
+
+static inline gboolean
+(fpi_byte_reader_get_data_inline_static) (FpiByteReader * reader, guint size, const guint8 * val)
+{
+  g_return_val_if_fail (reader != NULL, FALSE);
+  g_return_val_if_fail (val != NULL, FALSE);
+
+  if (G_UNLIKELY (size > reader->size || fpi_byte_reader_get_remaining_unchecked (reader) < size))
+    return FALSE;
+
+  memcpy ((void *) val, fpi_byte_reader_get_data_unchecked (reader, size), size);
+  return TRUE;
+}
+
+static inline gboolean
+(fpi_byte_reader_peek_data_inline_static) (const FpiByteReader * reader, guint size, guint8 * val)
+{
+  g_return_val_if_fail (reader != NULL, FALSE);
+  g_return_val_if_fail (val != NULL, FALSE);
+
+  if (G_UNLIKELY (size > reader->size || fpi_byte_reader_get_remaining_unchecked (reader) < size))
+    return FALSE;
+
+  memcpy (val, fpi_byte_reader_peek_data_unchecked (reader), size);
+  return TRUE;
+}
+
 static inline guint
 fpi_byte_reader_get_pos_inline (const FpiByteReader * reader)
 {
@@ -672,6 +743,35 @@ fpi_byte_reader_skip_inline (FpiByteReader * reader, guint nbytes)
    G_LIKELY(fpi_byte_reader_peek_data_inline(reader,size,val))
 #define fpi_byte_reader_skip(reader,nbytes) \
    G_LIKELY(fpi_byte_reader_skip_inline(reader,nbytes))
+#define fpi_byte_reader_get_bytes(reader,size) \
+    fpi_byte_reader_get_bytes_inline(reader,size)
+#define fpi_byte_reader_peek_bytes(reader,size) \
+    fpi_byte_reader_peek_bytes_inline(reader,size)
+
+/**
+ * fpi_byte_reader_get_data_static:
+ * @reader: a #FpiByteReader
+ * @val: fixed-size array (e.g. `uint8_t buf[32]`)
+ *
+ * Reads @size bytes from @reader directly into @val, where @size is
+ * deduced via `sizeof()` - only safe with true C arrays.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise.
+ */
+#define fpi_byte_reader_get_data_static(reader,val) \
+    (fpi_byte_reader_get_data_static) (reader,sizeof(val),val)
+
+/**
+ * fpi_byte_reader_peek_data_static:
+ * @reader: a #FpiByteReader
+ * @val: fixed-size array (e.g. `uint8_t buf[32]`)
+ *
+ * Like fpi_byte_reader_get_data_static() but does not advance the position.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise.
+ */
+#define fpi_byte_reader_peek_data_static(reader,val) \
+    (fpi_byte_reader_peek_data_static) (reader,sizeof(val),val)

 #endif /* FPI_BYTE_READER_DISABLE_INLINES */

@@ -219,6 +219,36 @@ fpi_byte_writer_reset_and_get_data (FpiByteWriter * writer)
  return data;
 }

+/**
+ * fpi_byte_writer_reset_and_get_bytes:
+ * @writer: #FpiByteWriter instance
+ *
+ * Resets @writer and returns the current data as a #GBytes.
+ *
+ * Returns: (transfer full): the current data as a #GBytes.
+ */
+GBytes *
+fpi_byte_writer_reset_and_get_bytes (FpiByteWriter * writer)
+{
+  GBytes *bytes;
+
+  g_return_val_if_fail (writer != NULL, NULL);
+
+  if (!writer->owned)
+    {
+      bytes = g_bytes_new (g_steal_pointer (&writer->parent.data),
+                           writer->parent.size);
+    }
+  else
+    {
+      bytes = g_bytes_new_take ((gpointer) g_steal_pointer (&writer->parent.data),
+                                writer->parent.size);
+    }
+
+  fpi_byte_writer_reset (writer);
+  return g_steal_pointer (&bytes);
+}
+
 /**
 * fpi_byte_writer_free:
 * @writer: (in) (transfer full): #FpiByteWriter instance
@@ -602,6 +632,15 @@ CREATE_WRITE_STRING_FUNC (32, guint32);
 *
 * Returns: %TRUE if the value could be written
 */
+/**
+ * fpi_byte_writer_put_bytes:
+ * @writer: #FpiByteWriter instance
+ * @bytes: (transfer none): Data to write
+ *
+ * Writes the contents of @bytes to @writer.
+ *
+ * Returns: %TRUE if the value could be written
+ */
 /**
 * fpi_byte_writer_fill:
 * @writer: #FpiByteWriter instance
@@ -77,6 +77,9 @@ void            fpi_byte_writer_reset                   (FpiByteWriter *writer);

 guint8 *        fpi_byte_writer_reset_and_get_data      (FpiByteWriter *writer);

+
+GBytes *        fpi_byte_writer_reset_and_get_bytes     (FpiByteWriter *writer);
+
 /**
 * fpi_byte_writer_get_pos:
 * @writer: #FpiByteWriter instance
@@ -204,6 +207,9 @@ gboolean        fpi_byte_writer_put_float64_le    (FpiByteWriter *writer, gdoubl
 gboolean        fpi_byte_writer_put_data          (FpiByteWriter *writer, const guint8 *data, guint size);


+gboolean        fpi_byte_writer_put_bytes         (FpiByteWriter *writer, const GBytes *bytes);
+
+
 gboolean        fpi_byte_writer_fill              (FpiByteWriter *writer, guint8 value, guint size);


@@ -338,6 +344,18 @@ fpi_byte_writer_put_data_inline (FpiByteWriter * writer, const guint8 * data,
  return TRUE;
 }

+static inline gboolean
+fpi_byte_writer_put_bytes_inline (FpiByteWriter * writer, const GBytes * bytes)
+{
+  g_return_val_if_fail (writer != NULL, FALSE);
+  g_return_val_if_fail (bytes != NULL, FALSE);
+  const guint8 *data;
+  gsize size;
+
+  data = g_bytes_get_data ((GBytes *) bytes, &size);
+  return fpi_byte_writer_put_data_inline (writer, data, size);
+}
+
 static inline void
 fpi_byte_writer_fill_unchecked (FpiByteWriter * writer, guint8 value, guint size)
 {
@@ -413,6 +431,10 @@ fpi_byte_writer_fill_inline (FpiByteWriter * writer, guint8 value, guint size)

 #define fpi_byte_writer_put_data(writer, data, size) \
    G_LIKELY (fpi_byte_writer_put_data_inline (writer, data, size))
+#define fpi_byte_writer_put_data_static(writer, data) \
+    G_LIKELY (fpi_byte_writer_put_data_inline (writer, data, sizeof (data)))
+#define fpi_byte_writer_put_bytes(writer, bytes) \
+    G_LIKELY (fpi_byte_writer_put_bytes_inline (writer, bytes))
 #define fpi_byte_writer_fill(writer, val, size) \
    G_LIKELY (fpi_byte_writer_fill_inline (writer, val, size))

@@ -22,10 +22,12 @@
 #include <math.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <gmodule.h>

 #include "fpi-log.h"

 #include "fp-device-private.h"
+#include "tests/fpi-test-emulation.h"

 /**
 * SECTION: fpi-device
@@ -50,8 +52,64 @@ fp_device_get_instance_private (FpDevice *self)
                            g_type_class_get_instance_private_offset (dev_class));
 }

+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GModule, g_module_close)
+
+/**
+ * fpi_device_emulation_mode_enabled:
+ * @device: The #FpDevice to check
+ *
+ * Checks if the device is running in emulation mode, which is enabled by
+ * setting the FP_DEVICE_EMULATION environment variable to a '1' value but
+ * only when the test emulation library is loaded.
+ * This is used by some drivers to enable special behavior for testing
+ * and development purposes.
+ */
+gboolean
+  (fpi_device_emulation_mode_enabled) (FpDevice *device)
+{
+  static gboolean (*real_fn)(FpDevice *) = NULL;
+  static gsize emulation_mode = 0;
+
+  if (g_once_init_enter (&emulation_mode))
+    {
+      if (g_strcmp0 (g_getenv (FPI_EMULATION_ENV_VAR), "1") == 0)
+        {
+          const char *dirs[] = {
+            FPI_EMULATION_HELPER_BUILDDIR,
+            FPI_EMULATION_HELPER_INSTALLDIR,
+          };
+
+          for (size_t i = 0; i < G_N_ELEMENTS (dirs); ++i)
+            {
+              g_autofree char *path = NULL;
+              g_autoptr(GModule) mod = NULL;
+              gpointer sym;
+
+              path = g_build_filename (dirs[i], FPI_EMULATION_HELPER_MODULE, NULL);
+              if (!(mod = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL)))
+                continue;
+
+              if (!g_module_symbol (mod, "fpi_device_emulation_mode_enabled", &sym))
+                continue;
+
+              real_fn = (gboolean (*)(FpDevice *)) sym;
+              g_steal_pointer (&mod);
+              break;
+            }
+        }
+
+      g_once_init_leave (&emulation_mode, real_fn ? TRUE : G_MAXSIZE);
+    }
+
+  if (real_fn)
+    return real_fn (device);
+
+  return FALSE;
+}
+
 /**
 * fpi_device_class_auto_initialize_features:
+ * @device_class: An #FpDeviceClass to initialize
 *
 * Initializes the #FpDeviceClass @features flags checking what device vfuncs
 * are implemented.
@@ -190,9 +248,6 @@ fpi_device_error_new (FpDeviceError error)

    case FP_DEVICE_ERROR_TOO_HOT:
      msg = "Device disabled to prevent overheating.";
-
-    case FP_DEVICE_ERROR_UNTRUSTED:
-      msg = "Could not verify integrity of the device, it cannot be trusted!";
      break;

    default:
@@ -1799,7 +1854,7 @@ fpi_device_suspend_completed (FpDevice *device)
 * current action will be cancelled before the error is forwarded to the
 * application.
 *
- * It is recommended to set @error to #FP_ERROR_NOT_IMPLEMENTED.
+ * It is recommended to set @error to #FP_DEVICE_ERROR_NOT_SUPPORTED.
 */
 void
 fpi_device_suspend_complete (FpDevice *device,
@@ -38,6 +38,13 @@ typedef enum {

 /**
 * FpIdEntry:
+ * @pid: The USB product ID (for USB devices)
+ * @vid: The USB vendor ID (for USB devices)
+ * @virtual_envvar: Environment variable name (for virtual devices)
+ * @driver_data: Optional driver-specific data, defaults to 0
+ * @udev_types: Subtypes for udev-based devices
+ * @spi_acpi_id: ACPI ID (for SPI devices)
+ * @hid_id: HID device identifier (for HID devices)
 *
 * An entry in the table of supported hardware. For USB devices, the product ID
 * and vendor ID should be provided. The optional @driver_data field defaults
@@ -325,4 +332,11 @@ gboolean fpi_device_report_finger_status_changes (FpDevice           *device,
                                                  FpFingerStatusFlags added_status,
                                                  FpFingerStatusFlags removed_status);

+/* Debugging utilities */
+
+#define fpi_device_emulation_mode_enabled(dev) \
+  G_UNLIKELY ((fpi_device_emulation_mode_enabled) ((dev)))
+
+gboolean (fpi_device_emulation_mode_enabled) (FpDevice *device);
+
 G_END_DECLS
@@ -27,6 +27,7 @@
 * @FPI_IMAGE_V_FLIPPED: the image is vertically flipped
 * @FPI_IMAGE_H_FLIPPED: the image is horizontally flipped
 * @FPI_IMAGE_COLORS_INVERTED: the colours are inverted
+ * @FPI_IMAGE_PARTIAL: the image is a partial scan
 *
 * Flags used in an #FpImage structure to describe the contained image.
 * This is useful for image drivers as they can simply set these flags and
@@ -2,6 +2,7 @@
 * FpiLog - Internal logging functions
 * Copyright (C) 2020 Benjamin Berg <bberg@redhat.com>
 * Copyright (C) 2025 Joshua Grisham <josh@joshuagrisham.com>
+ * Copyright (C) 2026 Marco Trevisan (Treviño) <mail@3v1n0.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -20,38 +21,68 @@

 #include "fpi-log.h"

-#undef fp_dbg_hex_dump_bytes
-#undef fp_dbg_hex_dump_gbytes
+/**
+ * fpi_log_is_debug_transfer_enabled:
+ *
+ * Checks if the %FP_DEBUG_TRANSFER environment variable is set.
+ *
+ * Returns: %TRUE if %FP_DEBUG_TRANSFER is set, %FALSE otherwise
+ */
+gboolean
+fpi_log_is_debug_transfer_enabled (void)
+{
+  static gsize debug_transfer_enabled = 0;

+  if (g_once_init_enter (&debug_transfer_enabled))
+    {
+      gsize enabled = g_getenv ("FP_DEBUG_TRANSFER") != NULL ? TRUE : G_MAXSIZE;
+      g_once_init_leave (&debug_transfer_enabled, enabled);
+    }
+
+  return debug_transfer_enabled == TRUE;
+}
+
+/**
+ * fpi_dbg_hex_dump_data:
+ * @buf: Bytes buffer to dump
+ * @len: Length of @buf to dump
+ *
+ * Prints hex dump of @buf to fp_dbg()
+ */
 void
-fp_dbg_hex_dump_bytes (const gchar  *log_domain,
-                       const guint8 *buf,
-                       gsize         len)
+  (fpi_dbg_hex_dump_data) (const gchar  *log_domain,
+                           const guint8 *buf,
+                           gsize len)
 {
  g_autoptr(GString) line = NULL;

+  if (g_log_writer_default_would_drop (G_LOG_LEVEL_DEBUG, log_domain))
+    return;
+
+  if (G_UNLIKELY (len == 0 || !buf))
+    return;
+
  line = g_string_new ("");

  for (gint i = 0; i < len; i++)
-    {
-      g_string_append_printf (line, "%02x ", buf[i]);
-      if ((i + 1) % 16 == 0)
-        {
-          g_log (log_domain, G_LOG_LEVEL_DEBUG, "%s", line->str);
-          g_string_set_size (line, 0);
-        }
-    }
+    g_string_append_printf (line, "%02x", buf[i]);

  if (line->len)
    g_log (log_domain, G_LOG_LEVEL_DEBUG, "%s", line->str);
 }

+/**
+ * fpi_dbg_hex_dump_bytes:
+ * @bytes: #GBytes to dump
+ *
+ * Prints hex dump of @bytes to fp_dbg()
+ */
 void
-fp_dbg_hex_dump_gbytes (const gchar *log_domain,
-                        GBytes      *gbytes)
+  (fpi_dbg_hex_dump_bytes) (const gchar *log_domain,
+                            GBytes      *bytes)
 {
-  gsize len = 0;
-  const guint8 *buf = g_bytes_get_data (gbytes, &len);
+  gsize length = 0;
+  const guint8 *data = g_bytes_get_data (bytes, &length);

-  fp_dbg_hex_dump_bytes (log_domain, buf, len);
+  (fpi_dbg_hex_dump_data) (log_domain, data, length);
 }
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007-2008 Daniel Drake <dsd@gentoo.org>
 * Copyright (C) 2018 Bastien Nocera <hadess@hadess.net>
+ * Copyright (C) 2026 Marco Trevisan (Treviño) <mail@3v1n0.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -97,31 +98,31 @@
 */
 #define BUG() BUG_ON (1)

-/*
- * Custom-defined logging functions are wrapped in macros for convenience so
- * that the caller does not have to pass G_LOG_DOMAIN every time.
- */
-
-void fp_dbg_hex_dump_bytes (const gchar  *log_domain,
-                            const guint8 *buf,
-                            gsize         len);
+void (fpi_dbg_hex_dump_data) (const gchar  *log_domain,
+                              const guint8 *buf,
+                              gsize len);

 /**
- * fp_dbg_hex_dump_bytes:
+ * fp_dbg_hex_dump_data:
 * @buf: Bytes buffer to dump
 * @len: Length of @buf to dump
 *
 * Prints hex dump of @buf to fp_dbg()
 */
-#define fp_dbg_hex_dump_bytes(buf, len) fp_dbg_hex_dump_bytes (G_LOG_DOMAIN, buf, len)
+#define fp_dbg_hex_dump_data(buf, len) \
+  (fpi_dbg_hex_dump_data) (G_LOG_DOMAIN, (buf), (len))

-void fp_dbg_hex_dump_gbytes (const gchar *log_domain,
-                             GBytes      *gbytes);
+void (fpi_dbg_hex_dump_bytes) (const gchar *log_domain,
+                               GBytes      *bytes);

 /**
- * fp_dbg_hex_dump_gbytes:
- * @gbytes: #GBytes to dump
+ * fp_dbg_hex_dump_bytes:
+ * @bytes: #GBytes to dump
 *
- * Prints hex dump of @gbytes to fp_dbg()
+ * Prints hex dump of @bytes to fp_dbg()
 */
-#define fp_dbg_hex_dump_gbytes(gbytes) fp_dbg_hex_dump_gbytes (G_LOG_DOMAIN, gbytes)
+#define fp_dbg_hex_dump_bytes(bytes) \
+  (fpi_dbg_hex_dump_bytes) \
+  (G_LOG_DOMAIN, (bytes))
+
+gboolean fpi_log_is_debug_transfer_enabled (void);
@@ -196,7 +196,7 @@ fpi_print_add_from_image (FpPrint *print,

 /**
 * fpi_print_bz3_match:
- * @template: A #FpPrint containing one or more prints
+ * @print_template: A #FpPrint containing one or more prints
 * @print: A newly scanned #FpPrint to test
 * @bz3_threshold: The BZ3 match threshold
 * @error: Return location for error
@@ -210,14 +210,17 @@ fpi_print_add_from_image (FpPrint *print,
 * Returns: Whether the prints match, @error will be set if #FPI_MATCH_ERROR is returned
 */
 FpiMatchResult
-fpi_print_bz3_match (FpPrint *template, FpPrint *print, gint bz3_threshold, GError **error)
+fpi_print_bz3_match (FpPrint *print_template,
+                     FpPrint *print,
+                     gint     bz3_threshold,
+                     GError **error)
 {
  struct xyt_struct *pstruct;
  gint probe_len;
  gint i;

  /* XXX: Use a different error type? */
-  if (template->type != FPI_PRINT_NBIS || print->type != FPI_PRINT_NBIS)
+  if (print_template->type != FPI_PRINT_NBIS || print->type != FPI_PRINT_NBIS)
    {
      *error = fpi_device_error_new_msg (FP_DEVICE_ERROR_NOT_SUPPORTED,
                                         "It is only possible to match NBIS type print data");
@@ -234,11 +237,11 @@ fpi_print_bz3_match (FpPrint *template, FpPrint *print, gint bz3_threshold, GErr
  pstruct = g_ptr_array_index (print->prints, 0);
  probe_len = bozorth_probe_init (pstruct);

-  for (i = 0; i < template->prints->len; i++)
+  for (i = 0; i < print_template->prints->len; i++)
    {
      struct xyt_struct *gstruct;
      gint score;
-      gstruct = g_ptr_array_index (template->prints, i);
+      gstruct = g_ptr_array_index (print_template->prints, i);
      score = bozorth_to_gallery (probe_len, pstruct, gstruct);
      fp_dbg ("score %d/%d", score, bz3_threshold);

@@ -292,7 +295,7 @@ fpi_print_generate_user_id (FpPrint *print)
  if (!username)
    username = "nobody";

-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
+  if (fpi_device_emulation_mode_enabled (NULL))
    rand_id = 0;
  else
    rand_id = g_random_int ();
@@ -11,13 +11,11 @@ G_BEGIN_DECLS
 * @FPI_PRINT_UNDEFINED: Undefined type, this happens prior to enrollment
 * @FPI_PRINT_RAW: A raw print where the data is directly compared
 * @FPI_PRINT_NBIS: NBIS minutiae comparison
- * @FPI_PRINT_SDCP: Print from an SDCP conforming device
 */
 typedef enum {
  FPI_PRINT_UNDEFINED = 0,
  FPI_PRINT_RAW,
  FPI_PRINT_NBIS,
-  FPI_PRINT_SDCP,
 } FpiPrintType;

 /**
@@ -44,7 +42,7 @@ gboolean fpi_print_add_from_image (FpPrint *print,
                                   FpImage *image,
                                   GError **error);

-FpiMatchResult fpi_print_bz3_match (FpPrint *temp,
+FpiMatchResult fpi_print_bz3_match (FpPrint *print_template,
                                    FpPrint *print,
                                    gint     bz3_threshold,
                                    GError **error);
@@ -1,980 +0,0 @@
-/*
- * FpSdcpDevice - A base class for SDCP enabled devices
- * Copyright (C) 2020 Benjamin Berg <bberg@redhat.com>
- * Copyright (C) 2025 Joshua Grisham <josh@joshuagrisham.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 "sdcp_device"
-#include "fpi-log.h"
-
-#include "fpi-compat.h"
-#include "fpi-print.h"
-
-#include "fp-sdcp-device-private.h"
-#include "fpi-sdcp.h"
-#include "fpi-sdcp-device.h"
-
-/**
- * SECTION: fpi-sdcp-device
- * @title: Internal FpSdcpDevice
- * @short_description: Internal SDCP device routines
- *
- * Internal SDCP handling routines. See #FpSdcpDevice for public routines.
- */
-
-
-G_DEFINE_BOXED_TYPE (FpiSdcpClaim, fpi_sdcp_claim, fpi_sdcp_claim_copy, fpi_sdcp_claim_free)
-
-/**
- * fpi_sdcp_claim_new:
- *
- * Create an empty #FpiSdcpClaim to provide to the base class.
- *
- * Returns: (transfer full): A newly created #FpiSdcpClaim
- */
-FpiSdcpClaim *
-fpi_sdcp_claim_new (void)
-{
-  FpiSdcpClaim *res = NULL;
-
-  res = g_new0 (FpiSdcpClaim, 1);
-
-  return res;
-}
-
-/**
- * fpi_sdcp_claim_free:
- * @claim: a #FpiSdcpClaim
- *
- * Release the memory used by an #FpiSdcpClaim.
- */
-void
-fpi_sdcp_claim_free (FpiSdcpClaim *claim)
-{
-  g_return_if_fail (claim);
-
-  g_clear_pointer (&claim->model_certificate, g_bytes_unref);
-  g_clear_pointer (&claim->device_public_key, g_bytes_unref);
-  g_clear_pointer (&claim->firmware_public_key, g_bytes_unref);
-  g_clear_pointer (&claim->firmware_hash, g_bytes_unref);
-  g_clear_pointer (&claim->model_signature, g_bytes_unref);
-  g_clear_pointer (&claim->device_signature, g_bytes_unref);
-
-  g_free (claim);
-}
-
-/**
- * fpi_sdcp_claim_copy:
- * @other: The #FpiSdcpClaim to copy
- *
- * Create a (shallow) copy of a #FpiSdcpClaim.
- *
- * Returns: (transfer full): A newly created #FpiSdcpClaim
- */
-FpiSdcpClaim *
-fpi_sdcp_claim_copy (FpiSdcpClaim *other)
-{
-  FpiSdcpClaim *res = NULL;
-
-  res = fpi_sdcp_claim_new ();
-
-  if (other->model_certificate)
-    res->model_certificate = g_bytes_ref (other->model_certificate);
-  if (other->device_public_key)
-    res->device_public_key = g_bytes_ref (other->device_public_key);
-  if (other->firmware_public_key)
-    res->firmware_public_key = g_bytes_ref (other->firmware_public_key);
-  if (other->firmware_hash)
-    res->firmware_hash = g_bytes_ref (other->firmware_hash);
-  if (other->model_signature)
-    res->model_signature = g_bytes_ref (other->model_signature);
-  if (other->device_signature)
-    res->device_signature = g_bytes_ref (other->device_signature);
-
-  return res;
-}
-
-/* Manually redefine what G_DEFINE_* macro does */
-static inline gpointer
-fp_sdcp_device_get_instance_private (FpSdcpDevice *self)
-{
-  FpSdcpDeviceClass *sdcp_class = g_type_class_peek_static (FP_TYPE_SDCP_DEVICE);
-
-  return G_STRUCT_MEMBER_P (self,
-                            g_type_class_get_instance_private_offset (sdcp_class));
-}
-
-/* Example values from Microsoft's SDCP documentation to use when testing (FP_DEVICE_EMULATION=1) */
-static const guchar test_host_private_key[] = {
-  0x84, 0x00, 0xed, 0x14, 0x57, 0x9c, 0xdf, 0x11, 0x58, 0x64, 0x77, 0xe8, 0x36, 0xe8, 0xcb, 0x52,
-  0x70, 0x84, 0x41, 0xc1, 0xc2, 0xa4, 0x47, 0xc2, 0x18, 0xc5, 0xbb, 0xc2, 0xd1, 0x18, 0xfb, 0xc7
-};
-static const guchar test_host_public_key[] = {
-  0x04, 0x52, 0xf0, 0x56, 0xff, 0xb9, 0xc6, 0x72, 0x86, 0x54, 0x77, 0x1a, 0x36, 0x29, 0xb7, 0x70,
-  0x76, 0x7b, 0x19, 0xa2, 0x10, 0x6a, 0x49, 0x16, 0xfb, 0x81, 0xba, 0x06, 0xef, 0x67, 0x97, 0xc4,
-  0xa3, 0xdf, 0x67, 0x2a, 0xde, 0x0e, 0x91, 0x16, 0xd1, 0xab, 0xe2, 0x78, 0xa8, 0x22, 0x3a, 0xbd,
-  0xe4, 0x95, 0x8d, 0x62, 0xd4, 0xff, 0x68, 0x82, 0x15, 0x9f, 0x06, 0x17, 0xc6, 0xf8, 0xce, 0x10,
-  0xbf
-};
-static const gchar test_host_random[] = {
-  0xd8, 0x77, 0x40, 0x3a, 0xbe, 0x82, 0xf4, 0xd9, 0x7e, 0x14, 0x48, 0xc5, 0x05, 0x2d, 0x83, 0xa5,
-  0x32, 0xa4, 0x5e, 0x56, 0xef, 0x04, 0x9c, 0xbb, 0xf9, 0x81, 0x13, 0x75, 0x20, 0xe7, 0x13, 0xbf
-};
-static const gchar test_reconnect_random[] = {
-  0x8a, 0x74, 0x51, 0xc1, 0xd3, 0xa8, 0xdc, 0xa1, 0xc1, 0x33, 0x0c, 0xa5, 0x0d, 0x73, 0x45, 0x4b,
-  0x35, 0x1a, 0x49, 0xf4, 0x6c, 0x8e, 0x9d, 0xce, 0xe1, 0x5c, 0x96, 0x4d, 0x29, 0x5c, 0x31, 0xc9
-};
-static const gchar test_identify_nonce[] = {
-  0x3a, 0x1b, 0x50, 0x6f, 0x5b, 0xec, 0x08, 0x90, 0x59, 0xac, 0xef, 0xb9, 0xb4, 0x4d, 0xfb, 0xde,
-  0xa7, 0xa5, 0x99, 0xee, 0x9a, 0xa2, 0x67, 0xe5, 0x25, 0x26, 0x64, 0xd6, 0x0b, 0x79, 0x80, 0x53
-};
-
-/* FpiSdcpDevice */
-
-/* Internal functions of FpSdcpDevice */
-
-void
-fpi_sdcp_device_get_application_secret (FpSdcpDevice *self,
-                                        GBytes      **application_secret)
-{
-  GBytes *data = NULL;
-
-  g_return_if_fail (*application_secret == NULL);
-
-  g_object_get (G_OBJECT (self), "sdcp-data", &data, NULL);
-
-  if (!data)
-    return;
-
-  *application_secret = g_steal_pointer (&data);
-}
-
-void
-fpi_sdcp_device_set_application_secret (FpSdcpDevice *self,
-                                        GBytes       *application_secret)
-{
-  g_return_if_fail (application_secret);
-
-  g_object_set (G_OBJECT (self), "sdcp-data", application_secret, NULL);
-}
-
-void
-fpi_sdcp_device_open (FpSdcpDevice *self)
-{
-  FpSdcpDeviceClass *cls = FP_SDCP_DEVICE_GET_CLASS (self);
-
-  g_return_if_fail (FP_IS_SDCP_DEVICE (self));
-  g_return_if_fail (fpi_device_get_current_action (FP_DEVICE (self)) == FPI_DEVICE_ACTION_OPEN);
-
-  cls->open (self);
-}
-
-void
-fpi_sdcp_device_connect (FpSdcpDevice *self)
-{
-  FpSdcpDeviceClass *cls = FP_SDCP_DEVICE_GET_CLASS (self);
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-  GError *error = NULL;
-
-  g_clear_pointer (&priv->host_private_key, g_bytes_unref);
-  g_clear_pointer (&priv->host_public_key, g_bytes_unref);
-  g_clear_pointer (&priv->host_random, g_bytes_unref);
-
-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") != 0)
-    {
-      /* SDCP Connect: 3.i. Generate host ephemeral ECDH key pair */
-      fpi_sdcp_generate_host_key (&priv->host_private_key, &priv->host_public_key, &error);
-      if (error)
-        {
-          fpi_sdcp_device_connect_complete (self,
-                                            NULL, NULL, NULL,
-                                            error);
-          return;
-        }
-
-      /* SDCP Connect: 3.ii. Generate host random */
-      priv->host_random = fpi_sdcp_generate_random (&error);
-      if (error)
-        {
-          fpi_sdcp_device_connect_complete (self,
-                                            NULL, NULL, NULL,
-                                            error);
-          return;
-        }
-    }
-  else
-    {
-      /* Use Microsoft's SDCP documentation example values in emulation mode */
-      priv->host_private_key = g_bytes_new (test_host_private_key, sizeof (test_host_private_key));
-      priv->host_public_key = g_bytes_new (test_host_public_key, sizeof (test_host_public_key));
-      priv->host_random = g_bytes_new (test_host_random, sizeof (test_host_random));
-    }
-
-  /* SDCP Connect: 3.iii. Send the Connect message */
-  cls->connect (self);
-
-  return;
-}
-
-void
-fpi_sdcp_device_reconnect (FpSdcpDevice *self)
-{
-  FpSdcpDeviceClass *cls = FP_SDCP_DEVICE_GET_CLASS (self);
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-  GError *error = NULL;
-
-  g_clear_pointer (&priv->reconnect_random, g_bytes_unref);
-
-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") != 0)
-    {
-      /* SDCP Reconnect: 2.i. Generate host random */
-      priv->reconnect_random = fpi_sdcp_generate_random (&error);
-      if (error)
-        {
-          fpi_sdcp_device_reconnect_complete (self, NULL, error);
-          return;
-        }
-    }
-  else
-    {
-      /* Use Microsoft's SDCP documentation example value in emulation mode */
-      priv->reconnect_random = g_bytes_new (test_reconnect_random, sizeof (test_reconnect_random));
-    }
-
-  /* SDCP Reconnect: 2.ii. Send the Reconnect message */
-  if (cls->reconnect)
-    cls->reconnect (self);
-  else
-    fpi_sdcp_device_connect (self);
-}
-
-void
-fpi_sdcp_device_list (FpSdcpDevice *self)
-{
-  FpSdcpDeviceClass *cls = FP_SDCP_DEVICE_GET_CLASS (self);
-
-  g_return_if_fail (FP_IS_SDCP_DEVICE (self));
-  g_return_if_fail (fpi_device_get_current_action (FP_DEVICE (self)) == FPI_DEVICE_ACTION_LIST);
-
-  cls->list (self);
-}
-
-void
-fpi_sdcp_device_enroll (FpSdcpDevice *self)
-{
-  FpSdcpDeviceClass *cls = FP_SDCP_DEVICE_GET_CLASS (self);
-
-  g_autoptr(GBytes) application_secret = NULL;
-  FpPrint *print;
-
-  g_return_if_fail (FP_IS_SDCP_DEVICE (self));
-  g_return_if_fail (fpi_device_get_current_action (FP_DEVICE (self)) == FPI_DEVICE_ACTION_ENROLL);
-  fpi_sdcp_device_get_application_secret (self, &application_secret);
-  g_return_if_fail (application_secret != NULL);
-
-  fpi_device_get_enroll_data (FP_DEVICE (self), &print);
-
-  fpi_print_set_device_stored (print, FALSE);
-  g_object_set (print, "fpi-data", NULL, NULL);
-
-  cls->enroll (self);
-}
-
-void
-fpi_sdcp_device_identify (FpSdcpDevice *self)
-{
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-  FpSdcpDeviceClass *cls = FP_SDCP_DEVICE_GET_CLASS (self);
-
-  g_autoptr(GBytes) application_secret = NULL;
-  FpiDeviceAction action;
-  GError *error = NULL;
-
-  g_return_if_fail (FP_IS_SDCP_DEVICE (self));
-  action = fpi_device_get_current_action (FP_DEVICE (self));
-  g_return_if_fail (action == FPI_DEVICE_ACTION_IDENTIFY || action == FPI_DEVICE_ACTION_VERIFY);
-  fpi_sdcp_device_get_application_secret (self, &application_secret);
-  g_return_if_fail (application_secret != NULL);
-
-  g_clear_pointer (&priv->identify_nonce, g_bytes_unref);
-
-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") != 0)
-    {
-      /* Generate a new nonce. */
-      priv->identify_nonce = fpi_sdcp_generate_random (&error);
-      if (error)
-        {
-          fpi_device_action_error (FP_DEVICE (self), error);
-          return;
-        }
-    }
-  else
-    {
-      /* Use Microsoft's SDCP documentation example value in emulation mode */
-      priv->identify_nonce = g_bytes_new (test_identify_nonce, sizeof (test_identify_nonce));
-    }
-
-  cls->identify (self);
-}
-
-/*********************************************************/
-/* Private API */
-
-/**
- * fpi_sdcp_device_open_complete:
- * @self: a #FpSdcpDevice fingerprint device
- * @error: A #GError or %NULL on success
- *
- * Reports completion of open operation. Responsible for triggering SDCP connect
- * or reconnect as necessary.
- */
-void
-fpi_sdcp_device_open_complete (FpSdcpDevice *self,
-                               GError       *error)
-{
-  FpSdcpDeviceClass *cls = FP_SDCP_DEVICE_GET_CLASS (self);
-
-  g_autoptr(GBytes) application_secret = NULL;
-
-  if (!error)
-    {
-      fpi_sdcp_device_get_application_secret (self, &application_secret);
-
-      /* Try a reconnect if implemented and we already have an application_secret */
-      if (cls->reconnect && application_secret)
-        fpi_sdcp_device_reconnect (self);
-
-      /* Connect if we don't already have an application_secret */
-      else if (!application_secret)
-        fpi_sdcp_device_connect (self);
-
-      /* Complete open if we are already connected */
-      else
-        fpi_device_open_complete (FP_DEVICE (self), NULL);
-    }
-  else
-    {
-      fpi_device_open_complete (FP_DEVICE (self), error);
-    }
-}
-
-/**
- * fp_sdcp_device_get_connect_data:
- * @self: a #FpSdcpDevice fingerprint device
- * @host_random: (out) (transfer full): The host-generated random
- * @host_public_key: (out) (transfer full): The host public key
- *
- * Get data required to connect to (i.e. open) the device securely.
- */
-void
-fpi_sdcp_device_get_connect_data (FpSdcpDevice *self,
-                                  GBytes      **host_random,
-                                  GBytes      **host_public_key)
-{
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-
-  g_return_if_fail (host_random != NULL);
-  g_return_if_fail (host_public_key != NULL);
-  g_return_if_fail (priv->host_random);
-  g_return_if_fail (priv->host_public_key);
-
-  *host_random = g_bytes_new_from_bytes (priv->host_random, 0,
-                                         g_bytes_get_size (priv->host_random));
-  *host_public_key = g_bytes_new_from_bytes (priv->host_public_key, 0,
-                                             g_bytes_get_size (priv->host_public_key));
-}
-
-/**
- * fp_sdcp_device_get_reconnect_data:
- * @self: a #FpSdcpDevice fingerprint device
- * @reconnect_random: (out) (transfer full): The host-generated random
- *
- * Get data required to reconnect to (i.e. open) to the device securely.
- */
-void
-fpi_sdcp_device_get_reconnect_data (FpSdcpDevice *self,
-                                    GBytes      **reconnect_random)
-{
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-
-  g_return_if_fail (reconnect_random != NULL);
-  g_return_if_fail (priv->reconnect_random);
-
-  *reconnect_random = g_bytes_new_from_bytes (priv->reconnect_random, 0,
-                                              g_bytes_get_size (priv->reconnect_random));
-}
-
-/**
- * fp_sdcp_device_get_identify_data:
- * @self: a #FpSdcpDevice fingerprint device
- * @nonce: (out) (transfer full): A new host-generated nonce
- *
- * Get data required to identify a new print.
- */
-void
-fpi_sdcp_device_get_identify_data (FpSdcpDevice *self,
-                                   GBytes      **nonce)
-{
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-
-  g_return_if_fail (nonce != NULL);
-  g_return_if_fail (priv->identify_nonce);
-
-  *nonce = g_bytes_new_from_bytes (priv->identify_nonce, 0,
-                                   g_bytes_get_size (priv->identify_nonce));
-}
-
-/**
- * fp_sdcp_device_set_identify_data:
- * @self: a #FpSdcpDevice fingerprint device
- * @nonce: A driver-specified nonce
- *
- * Sets data required to identify a new print.
- *
- * Most drivers should not use this function, but instead use the automatically
- * generated values retrieved from fpi_sdcp_device_get_identify_data() when
- * executing the device-specific Identify command.
- *
- * In cases where a device's Identify command does not accept a randomly
- * generated nonce, this function can be used to override the randomly generated
- * nonce to the nonce that was actually sent to the device.
- */
-void
-fpi_sdcp_device_set_identify_data (FpSdcpDevice *self,
-                                   GBytes       *nonce)
-{
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-
-  g_return_if_fail (nonce != NULL);
-
-  g_clear_pointer (&priv->identify_nonce, g_bytes_unref);
-
-  priv->identify_nonce = g_steal_pointer (&nonce);
-}
-
-/**
- * fpi_sdcp_device_connect_complete:
- * @self: a #FpSdcpDevice fingerprint device
- * @device_random: The device random
- * @claim: The device #FpiSdcpClaim
- * @mac: The MAC authenticating @claim
- * @error: A #GError or %NULL on success
- *
- * Reports completion of connect operation. Responsible for performing SDCP key
- * agreement, deriving secrets necessary for processing all other SDCP-related
- * payloads, and verifying the device connection is trusted.
- */
-void
-fpi_sdcp_device_connect_complete (FpSdcpDevice *self,
-                                  GBytes       *device_random,
-                                  FpiSdcpClaim *claim,
-                                  GBytes       *mac,
-                                  GError       *error)
-{
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-  FpSdcpDeviceClass *cls = FP_SDCP_DEVICE_GET_CLASS (self);
-
-  g_autoptr(GBytes) application_secret = NULL;
-  FpiDeviceAction action;
-
-  action = fpi_device_get_current_action (FP_DEVICE (self));
-
-  g_return_if_fail (action == FPI_DEVICE_ACTION_OPEN);
-  g_return_if_fail (priv->host_private_key);
-  g_return_if_fail (priv->host_random);
-
-  if (error)
-    {
-      if (device_random || claim || mac)
-        {
-          g_clear_pointer (&device_random, g_bytes_unref);
-          g_clear_pointer (&claim, fpi_sdcp_claim_free);
-          g_clear_pointer (&mac, g_bytes_unref);
-          fp_warn ("Driver provided SDCP Connect information but also reported error.");
-        }
-
-      fpi_device_open_complete (FP_DEVICE (self), error);
-      return;
-    }
-
-  if (!device_random || !claim || !mac ||
-      (!claim->model_certificate || !claim->device_public_key || !claim->firmware_public_key ||
-       !claim->firmware_hash || !claim->model_signature || !claim->device_signature))
-    {
-      fp_dbg ("Driver did not provide all required information to callback; returning error instead.");
-      g_clear_pointer (&device_random, g_bytes_unref);
-      g_clear_pointer (&claim, fpi_sdcp_claim_free);
-      g_clear_pointer (&mac, g_bytes_unref);
-
-      fpi_device_open_complete (FP_DEVICE (self),
-                                fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
-                                                          "Driver called connect complete with "
-                                                          "incomplete arguments"));
-      return;
-    }
-
-  /* Verify connect and store the application_secret */
-  if (!fpi_sdcp_verify_connect (priv->host_private_key,
-                                priv->host_random,
-                                device_random,
-                                claim,
-                                mac,
-                                !cls->ignore_device_certificate,
-                                !cls->ignore_device_signatures,
-                                &application_secret,
-                                &error))
-    {
-      fpi_device_open_complete (FP_DEVICE (self),
-                                fpi_device_error_new_msg (FP_DEVICE_ERROR_UNTRUSTED,
-                                                          "SDCP Connect verification failed: %s",
-                                                          error->message));
-      return;
-    }
-
-  fpi_sdcp_device_set_application_secret (self, application_secret);
-
-  /* Clear no longer needed private data */
-  g_clear_pointer (&priv->host_private_key, g_bytes_unref);
-  g_clear_pointer (&priv->host_public_key, g_bytes_unref);
-  g_clear_pointer (&priv->host_random, g_bytes_unref);
-
-  fpi_device_open_complete (FP_DEVICE (self), NULL);
-}
-
-/**
- * fpi_sdcp_device_reconnect_complete:
- * @self: a #FpSdcpDevice fingerprint device
- * @mac: The MAC authenticating @claim
- * @error: A #GError or %NULL on success
- *
- * Reports completion of a reconnect (i.e. open) operation.
- */
-void
-fpi_sdcp_device_reconnect_complete (FpSdcpDevice *self,
-                                    GBytes       *mac,
-                                    GError       *error)
-{
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-
-  g_autoptr(GBytes) application_secret = NULL;
-  FpiDeviceAction action;
-
-  action = fpi_device_get_current_action (FP_DEVICE (self));
-
-  g_return_if_fail (action == FPI_DEVICE_ACTION_OPEN);
-  g_return_if_fail (priv->reconnect_random);
-
-  if (error)
-    {
-      if (mac)
-        {
-          fp_warn ("Driver provided a reconnect MAC but also reported an error.");
-          g_clear_pointer (&mac, g_bytes_unref);
-        }
-
-      /* Silently try a normal connect instead. */
-      fpi_sdcp_device_connect (self);
-    }
-  else if (mac)
-    {
-      fpi_sdcp_device_get_application_secret (self, &application_secret);
-
-      if (fpi_sdcp_verify_reconnect (application_secret, priv->reconnect_random, mac, &error))
-        {
-          fp_dbg ("SDCP Reconnect succeeded");
-          fpi_device_open_complete (FP_DEVICE (self), NULL);
-        }
-      else
-        {
-          fp_dbg ("SDCP Reconnect failed; doing a full connect.");
-          fpi_sdcp_device_connect (self);
-        }
-    }
-  else
-    {
-      fpi_device_open_complete (FP_DEVICE (self),
-                                fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
-                                                          "Driver called reconnect complete with wrong arguments"));
-    }
-
-  /* Clear no longer needed private data */
-  g_clear_pointer (&priv->reconnect_random, g_bytes_unref);
-}
-
-/**
- * fpi_sdcp_device_list_complete:
- * @self: a #FpSdcpDevice fingerprint device
- * @ids: A #GPtrArray of #GBytes of each SDCP enrollment ID stored on the device
- * @error: A #GError or %NULL on success
- *
- * Convenience function to create the minimally required #FpPrint list for
- * #FpSdcpDevice prints using the provided @ids, then uses that #FpPrint list to
- * report completion of the list operation.
- *
- * If the device provides additional attributes that should be stored on each
- * #FpPrint as part of the list operation, a #GPtrArray of #FpPrint can instead
- * be created with the additional attributes and fpi_device_list_complete() can
- * be used instead of this function.
- *
- * Please note that the @ids array will be freed using g_ptr_array_unref() and
- * the elements are destroyed automatically. As such, you must use
- * g_ptr_array_new_with_free_func() with `(GDestroyNotify) g_bytes_unref` as the
- * free func when creating the #GPtrArray.
- */
-void
-fpi_sdcp_device_list_complete (FpSdcpDevice *self,
-                               GPtrArray    *ids,
-                               GError       *error)
-{
-  g_autoptr(GPtrArray) prints = NULL;
-  gint prints_len = 0;
-  FpiDeviceAction action;
-
-  action = fpi_device_get_current_action (FP_DEVICE (self));
-
-  g_return_if_fail (action == FPI_DEVICE_ACTION_LIST);
-
-  if (error)
-    {
-      fpi_device_list_complete (FP_DEVICE (self), NULL, error);
-      return;
-    }
-
-  prints = g_ptr_array_new_with_free_func (g_object_unref);
-
-  /* Allow an empty array (prints_len=0) but if ids has been passed, use it */
-  if (ids)
-    prints_len = ids->len;
-
-  for (gint i = 0; i < prints_len; i++)
-    {
-      FpPrint *print = fp_print_new (FP_DEVICE (self));
-      fpi_print_set_type (print, FPI_PRINT_SDCP);
-      fpi_print_set_device_stored (print, FALSE);
-      fpi_sdcp_device_set_print_id (print, g_ptr_array_index (ids, i));
-      g_ptr_array_add (prints, g_object_ref_sink (print));
-    }
-
-  fpi_device_list_complete (FP_DEVICE (self), g_steal_pointer (&prints), NULL);
-
-  g_clear_pointer (&ids, g_ptr_array_unref);
-}
-
-/**
- * fpi_sdcp_device_enroll_commit:
- * @self: a #FpSdcpDevice fingerprint device
- * @nonce: The device generated nonce
- * @error: a #GError or %NULL on success
- *
- * Called when the print is ready to be committed to device memory.
- * During enrollment, fpi_device_enroll_progress() must be called for each
- * successful stage before the print can be committed.
- * The @nonce generated by the device-specific EnrollmentNonce response must be
- * provided in order for the enrollment ID to be generated.
- * The driver's enroll_commit() vfunc will be triggered upon successfully
- * generating the enrollment ID.
- */
-void
-fpi_sdcp_device_enroll_commit (FpSdcpDevice *self,
-                               GBytes       *nonce,
-                               GError       *error)
-{
-  FpSdcpDeviceClass *cls = FP_SDCP_DEVICE_GET_CLASS (self);
-
-  g_autoptr(GBytes) application_secret = NULL;
-  GBytes *id = NULL;
-  FpPrint *print;
-
-  g_return_if_fail (FP_IS_SDCP_DEVICE (self));
-  g_return_if_fail (fpi_device_get_current_action (FP_DEVICE (self)) == FPI_DEVICE_ACTION_ENROLL);
-  g_return_if_fail (nonce != NULL);
-
-  fpi_device_get_enroll_data (FP_DEVICE (self), &print);
-  fpi_sdcp_device_get_application_secret (self, &application_secret);
-
-  id = fpi_sdcp_generate_enrollment_id (application_secret, nonce, &error);
-  if (!id || error)
-    {
-      fp_warn ("Could not generate SDCP enrollment ID");
-      fpi_device_enroll_complete (FP_DEVICE (self), NULL, error);
-      g_object_set (print, "fpi-data", NULL, NULL);
-      return;
-    }
-
-  /* Set to true once committed */
-  fpi_print_set_device_stored (print, FALSE);
-
-  /* Attach the ID to the print */
-  fpi_sdcp_device_set_print_id (print, id);
-
-  cls->enroll_commit (self, id);
-
-  g_clear_pointer (&id, g_bytes_unref);
-}
-
-/**
- * fpi_sdcp_device_enroll_commit_complete:
- * @self: a #FpSdcpDevice fingerprint device
- * @error: a #GError or %NULL on success
- *
- * Called when device has committed the given print to memory.
- * This finalizes the enroll operation.
- */
-void
-fpi_sdcp_device_enroll_commit_complete (FpSdcpDevice *self,
-                                        GError       *error)
-{
-  g_autoptr(GBytes) id = NULL;
-  FpPrint *print;
-
-  g_return_if_fail (FP_IS_SDCP_DEVICE (self));
-  g_return_if_fail (fpi_device_get_current_action (FP_DEVICE (self)) == FPI_DEVICE_ACTION_ENROLL);
-
-  if (error)
-    {
-      fpi_device_enroll_complete (FP_DEVICE (self), NULL, error);
-      return;
-    }
-
-  fpi_device_get_enroll_data (FP_DEVICE (self), &print);
-
-  fpi_sdcp_device_get_print_id (print, &id);
-  if (!id)
-    {
-      g_error ("Inconsistent state; the print must have the enrolled ID attached at this point");
-      return;
-    }
-
-  fpi_print_set_type (print, FPI_PRINT_SDCP);
-  fpi_print_set_device_stored (print, TRUE);
-
-  fpi_device_enroll_complete (FP_DEVICE (self), g_object_ref (print), NULL);
-}
-
-/**
- * fpi_sdcp_device_identify_retry:
- * @self: a #FpSdcpDevice fingerprint device
- * @error: a #GError containing the retry condition
- *
- * Called when the device requires the finger to be presented again.
- * This should not be called for a verified no-match, it should only
- * be called if e.g. the finger was not centered properly or similar.
- *
- * Effectively this simply raises the error up. This function exists
- * to bridge the difference in semantics that SDPC has from how
- * libfprint works internally.
- */
-void
-fpi_sdcp_device_identify_retry (FpSdcpDevice *self,
-                                GError       *error)
-{
-  FpiDeviceAction action;
-
-  g_return_if_fail (FP_IS_SDCP_DEVICE (self));
-  action = fpi_device_get_current_action (FP_DEVICE (self));
-
-  g_return_if_fail (action == FPI_DEVICE_ACTION_IDENTIFY || action == FPI_DEVICE_ACTION_VERIFY);
-
-  if (action == FPI_DEVICE_ACTION_VERIFY)
-    fpi_device_verify_report (FP_DEVICE (self), FPI_MATCH_ERROR, NULL, error);
-  else if (action == FPI_DEVICE_ACTION_IDENTIFY)
-    fpi_device_identify_report (FP_DEVICE (self), NULL, NULL, error);
-}
-
-/**
- * fpi_sdcp_device_identify_complete:
- * @self: a #FpSdcpDevice fingerprint device
- * @id: (transfer none): the ID as reported by the device
- * @mac: (transfer none): MAC authenticating the message
- * @error: (transfer full): #GError if an error occured
- *
- * Called when device is done with the identification routine. The
- * returned ID may be %NULL if none of the in-device templates matched.
- */
-void
-fpi_sdcp_device_identify_complete (FpSdcpDevice *self,
-                                   GBytes       *id,
-                                   GBytes       *mac,
-                                   GError       *error)
-{
-  FpSdcpDevicePrivate *priv = fp_sdcp_device_get_instance_private (self);
-
-  g_autoptr(GBytes) application_secret = NULL;
-  FpPrint *identified_print;
-  FpiDeviceAction action;
-
-  g_return_if_fail (FP_IS_SDCP_DEVICE (self));
-  action = fpi_device_get_current_action (FP_DEVICE (self));
-
-  g_return_if_fail (action == FPI_DEVICE_ACTION_IDENTIFY || action == FPI_DEVICE_ACTION_VERIFY);
-  g_return_if_fail (priv->identify_nonce);
-
-  if (error)
-    {
-      g_clear_pointer (&priv->identify_nonce, g_bytes_unref);
-      fpi_device_action_error (FP_DEVICE (self), error);
-      return;
-    }
-
-  /* No error and no valid id/mac provided means that there was no match from the device */
-  if (!id || !mac || g_bytes_get_size (id) != SDCP_ENROLLMENT_ID_SIZE ||
-      g_bytes_get_size (mac) != SDCP_MAC_SIZE)
-    {
-      g_clear_pointer (&priv->identify_nonce, g_bytes_unref);
-      if (action == FPI_DEVICE_ACTION_VERIFY)
-        {
-          fpi_device_verify_report (FP_DEVICE (self), FPI_MATCH_FAIL, NULL, NULL);
-          fpi_device_verify_complete (FP_DEVICE (self), NULL);
-        }
-      else
-        {
-          fpi_device_identify_report (FP_DEVICE (self), NULL, NULL, NULL);
-          fpi_device_identify_complete (FP_DEVICE (self), NULL);
-        }
-      return;
-    }
-
-  fpi_sdcp_device_get_application_secret (self, &application_secret);
-
-  if (!fpi_sdcp_verify_identify (application_secret, priv->identify_nonce, id, mac, &error))
-    {
-      g_clear_pointer (&priv->identify_nonce, g_bytes_unref);
-      fpi_device_action_error (FP_DEVICE (self), error);
-      return;
-    }
-
-  /* Clear no longer needed private data */
-  g_clear_pointer (&priv->identify_nonce, g_bytes_unref);
-
-  /* Create a new print */
-  identified_print = fp_print_new (FP_DEVICE (self));
-
-  fpi_print_set_type (identified_print, FPI_PRINT_SDCP);
-
-  /* Set to true once committed */
-  fpi_print_set_device_stored (identified_print, FALSE);
-
-  /* Attach the ID to the print */
-  fpi_sdcp_device_set_print_id (identified_print, id);
-
-
-  /* The surrounding API expects a match/no-match against a given set. */
-  if (action == FPI_DEVICE_ACTION_VERIFY)
-    {
-      FpPrint *print;
-
-      fpi_device_get_verify_data (FP_DEVICE (self), &print);
-
-      if (fp_print_equal (print, identified_print))
-        fpi_device_verify_report (FP_DEVICE (self), FPI_MATCH_SUCCESS, identified_print, NULL);
-      else
-        fpi_device_verify_report (FP_DEVICE (self), FPI_MATCH_FAIL, identified_print, NULL);
-
-      fpi_device_verify_complete (FP_DEVICE (self), NULL);
-    }
-  else
-    {
-      GPtrArray *prints;
-      gint i;
-
-      fpi_device_get_identify_data (FP_DEVICE (self), &prints);
-
-      for (i = 0; i < prints->len; i++)
-        {
-          FpPrint *print = g_ptr_array_index (prints, i);
-
-          if (fp_print_equal (print, identified_print))
-            {
-              fpi_device_identify_report (FP_DEVICE (self), print, identified_print, NULL);
-              fpi_device_identify_complete (FP_DEVICE (self), NULL);
-              return;
-            }
-        }
-
-      /* Print wasn't in database. */
-      fpi_device_identify_report (FP_DEVICE (self), NULL, identified_print, NULL);
-      fpi_device_identify_complete (FP_DEVICE (self), NULL);
-    }
-}
-
-/**
- * fpi_sdcp_device_get_print_id:
- * @print: an SDCP device #FpPrint
- * @id: (out) (transfer full): the ID gotten from the @print data
- *
- * Gets the SDCP enrollment ID from the @print data.
- *
- * The returned @id may be %NULL if the data was not set or in the wrong format.
- */
-void
-fpi_sdcp_device_get_print_id (FpPrint *print,
-                              GBytes **id)
-{
-  g_autoptr(GVariant) id_var = NULL;
-  g_autoptr(GVariant) data = NULL;
-  const guint8 *id_data;
-  gsize id_len;
-
-  g_return_if_fail (print);
-  g_return_if_fail (*id == NULL);
-
-  g_object_get (G_OBJECT (print), "fpi-data", &data, NULL);
-
-  if (!data)
-    {
-      fp_warn ("SDCP print data has not been set.");
-      return;
-    }
-
-  if (!g_variant_check_format_string (data, "(@ay)", FALSE))
-    {
-      fp_warn ("SDCP print data is not in expected format.");
-      return;
-    }
-
-  g_variant_get (data, "(@ay)", &id_var);
-
-  id_data = g_variant_get_fixed_array (id_var, &id_len, sizeof (guint8));
-
-  *id = g_bytes_new (id_data, id_len);
-}
-
-/**
- * fpi_sdcp_device_set_print_id:
- * @print: an SDCP device #FpPrint
- * @id: the ID to set in the @print data
- *
- * Sets the SDCP enrollment ID in the @print data.
- */
-void
-fpi_sdcp_device_set_print_id (FpPrint *print,
-                              GBytes  *id)
-{
-  GVariant *id_var;
-  GVariant *data;
-
-  g_return_if_fail (print);
-  g_return_if_fail (id);
-
-  id_var = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
-                                      g_bytes_get_data (id, NULL),
-                                      g_bytes_get_size (id),
-                                      1);
-  data = g_variant_new ("(@ay)", id_var);
-
-  g_object_set (G_OBJECT (print), "fpi-data", data, NULL);
-}
@@ -1,185 +0,0 @@
-/*
- * FpSdcpDevice - A base class for SDCP enabled devices
- * Copyright (C) 2020 Benjamin Berg <bberg@redhat.com>
- * Copyright (C) 2025 Joshua Grisham <josh@joshuagrisham.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 "fp-sdcp-device.h"
-
-#define SDCP_PUBLIC_KEY_SIZE 65
-#define SDCP_APPLICATION_SECRET_SIZE 32
-#define SDCP_RANDOM_SIZE 32
-#define SDCP_MAC_SIZE 32
-#define SDCP_NONCE_SIZE 32
-#define SDCP_ENROLLMENT_ID_SIZE 32
-#define SDCP_SIGNATURE_SIZE 64
-
-/**
- * FpiSdcpClaim:
- * @model_certificate: Microsoft-issued per-model certificate encoded in x509
- *   ASN.1 DER format (`cert_m`)
- * @device_public_key: The per-device ECDSA public key (`pk_d`)
- * @firmware_public_key: The ephemeral public key generated by the device
- *   firmware (`pk_f`)
- * @firmware_hash: Hash of the firmware and firmware public key (`h_f`)
- * @model_signature: Device public key signed by the model key (`s_m`)
- * @device_signature: Firmware hash and public key signed by the device private
- *   key (`s_d`)
- *
- * Structure to hold the claim as produced by the device during a secure
- * connect. See the SDCP specification for more details.
- *
- * Note all of these may simply be memory views into a larger #GBytes created
- * using g_bytes_new_from_bytes().
- */
-struct _FpiSdcpClaim
-{
-  /*< public >*/
-  GBytes *model_certificate;    /* cert_m */
-  GBytes *device_public_key;    /* pk_d   */
-  GBytes *firmware_public_key;  /* pk_f   */
-  GBytes *firmware_hash;        /* h_f    */
-  GBytes *model_signature;      /* s_m    */
-  GBytes *device_signature;     /* s_d    */
-};
-typedef struct _FpiSdcpClaim FpiSdcpClaim;
-
-GType          fpi_sdcp_claim_get_type (void) G_GNUC_CONST;
-FpiSdcpClaim  *fpi_sdcp_claim_new (void);
-FpiSdcpClaim  *fpi_sdcp_claim_copy (FpiSdcpClaim *other);
-void           fpi_sdcp_claim_free (FpiSdcpClaim *claim);
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (FpiSdcpClaim, fpi_sdcp_claim_free)
-
-
-/**
- * FpSdcpDeviceClass:
- * @ignore_device_certificate: Set to %TRUE to skip validating the device's
- *   #FpiSdcpClaim.model_certificate against the SDCP truststore.
- * @ignore_device_signatures: Set to %TRUE to skip verifying the device's
- *   #FpiSdcpClaim.model_signature and #FpiSdcpClaim.device_signature.
- * @open: Open the device. Similar to #FpDeviceClass.open except that
- *   completion with fpi_sdcp_device_open_complete() will also take care of
- *   executing @connect and @reconnect as necessary.
- * @connect: Establish SDCP connection.
- * @reconnect: Perform a faster reconnect. Drivers do not need to provide this
- *   function. If reconnect fails, then a normal connect will be tried.
- * @list: List prints stored on the device. The driver must create a #GPtrArray
- *   of #GBytes with each enrollment ID stored on the device and use it to call
- *   fpi_sdcp_device_list_complete() in order to complete the operation.
- * @enroll: Start the enrollment procedure and capture all samples. The driver
- *   must report enrollment progress using fpi_device_enroll_progress(). It
- *   should also store available metadata about the print in device memory. The
- *   driver must call fpi_sdcp_device_enroll_commit() when all enrollment stages
- *   are complete and the print is ready to be commited to the device.
- * @enroll_commit: Commit the newly-enrolled print to the device memory using
- *   the passed id. id may be %NULL, in which case the driver must abort the
- *   enrollment process. id is owned by the base class and remains valid
- *   throughout the operation. On completion, the driver must call
- *   fpi_sdcp_device_enroll_commit_complete().
- * @identify: Start identification process. On completion, the driver must call
- *   fpi_sdcp_device_identify_complete(). To request the user to retry the
- *   fpi_sdcp_device_identify_retry() function is used.
- *
- * These are the main entry points for drivers implementing SDCP.
- *
- * Drivers *must* eventually call the corresponding function to finish the
- * operation.
- *
- * The following #FpDeviceClass entry points are also compatible and can be set
- * on the #FpDeviceClass if supported for a given device:
- * - #FpDeviceClass.probe
- * - #FpDeviceClass.close
- * - #FpDeviceClass.delete
- * - #FpDeviceClass.clear_storage
- * - #FpDeviceClass.cancel
- * - #FpDeviceClass.suspend
- * - #FpDeviceClass.resume
- *
- * XXX: Is the use of fpi_device_action_error() acceptable?
- *
- * Drivers *must* also handle cancellation properly for any long running
- * operation (i.e. any operation that requires capturing). It is entirely fine
- * to ignore cancellation requests for short operations (e.g. open/close).
- *
- * This API is solely intended for drivers. It is purely internal and neither
- * API nor ABI stable.
- */
-struct _FpSdcpDeviceClass
-{
-  FpDeviceClass parent_class;
-
-  gboolean      ignore_device_certificate;
-  gboolean      ignore_device_signatures;
-
-  void          (*open)          (FpSdcpDevice *sdcp_device);
-  void          (*connect)       (FpSdcpDevice *sdcp_device);
-  void          (*reconnect)     (FpSdcpDevice *sdcp_device);
-  void          (*list)          (FpSdcpDevice *sdcp_device);
-  void          (*enroll)        (FpSdcpDevice *sdcp_device);
-  void          (*enroll_commit) (FpSdcpDevice *sdcp_device,
-                                  GBytes       *id);
-  void          (*identify)      (FpSdcpDevice *sdcp_device);
-};
-
-void fpi_sdcp_device_open_complete (FpSdcpDevice *self,
-                                    GError       *error);
-
-void fpi_sdcp_device_get_connect_data (FpSdcpDevice *self,
-                                       GBytes      **host_random,
-                                       GBytes      **host_public_key);
-void fpi_sdcp_device_connect_complete (FpSdcpDevice *self,
-                                       GBytes       *device_random,
-                                       FpiSdcpClaim *claim,
-                                       GBytes       *mac,
-                                       GError       *error);
-
-void fpi_sdcp_device_get_reconnect_data (FpSdcpDevice *self,
-                                         GBytes      **reconnect_random);
-void fpi_sdcp_device_reconnect_complete (FpSdcpDevice *self,
-                                         GBytes       *mac,
-                                         GError       *error);
-
-void fpi_sdcp_device_list_complete (FpSdcpDevice *self,
-                                    GPtrArray    *ids,
-                                    GError       *error);
-
-void fpi_sdcp_device_enroll_commit (FpSdcpDevice *self,
-                                    GBytes       *nonce,
-                                    GError       *error);
-void fpi_sdcp_device_enroll_commit_complete (FpSdcpDevice *self,
-                                             GError       *error);
-
-void fpi_sdcp_device_get_identify_data (FpSdcpDevice *self,
-                                        GBytes      **nonce);
-void fpi_sdcp_device_set_identify_data (FpSdcpDevice *self,
-                                        GBytes       *nonce);
-void fpi_sdcp_device_identify_retry (FpSdcpDevice *self,
-                                     GError       *error);
-void fpi_sdcp_device_identify_complete (FpSdcpDevice *self,
-                                        GBytes       *id,
-                                        GBytes       *mac,
-                                        GError       *error);
-
-void fpi_sdcp_device_get_print_id (FpPrint *print,
-                                   GBytes **id);
-void fpi_sdcp_device_set_print_id (FpPrint *print,
-                                   GBytes  *id);
@@ -1,132 +0,0 @@
-/*
- * Secure Device Connection Protocol (SDCP) support implementation
- * Copyright (C) 2025 Joshua Grisham <josh@joshuagrisham.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-compat.h"
-
-#include "fpi-sdcp-device.h"
-
-/**
- * fpi_sdcp_generate_host_key:
- * @private_key: (out) (transfer full): The host private key (sk_h)
- * @public_key: (out) (transfer full): The host public key (pk_h)
- * @error: (out): #GError in case the out values are %NULL
- *
- * Function to generate a new ephemeral ECDH key pair for use with SDCP.
- **/
-void fpi_sdcp_generate_host_key (GBytes **private_key,
-                                 GBytes **public_key,
-                                 GError **error);
-
-/**
- * fpi_sdcp_generate_random:
- * @error: (out): #GError in case the return value is %NULL
- *
- * Returns: A new #GBytes with a secure random of length %SDCP_RANDOM_SIZE
- **/
-GBytes *fpi_sdcp_generate_random (GError **error);
-
-/**
- * fpi_sdcp_verify_connect:
- * @host_private_key: Private key generated using fpi_sdcp_generate_host_key() (sk_h)
- * @host_random: Random generated using fpi_sdcp_generate_random() (r_h)
- * @device_random: The random provided in the device's ConnectResponse (r_d)
- * @claim: #FpiSdcpClaim provided in the device's ConnectResponse (c)
- * @mac: The MAC provided in the device's ConnectResponse (m)
- * @validate_certificate: If the model certificate (cert_m) should be parsed and
- *   its trust chain validated as issued from Microsoft's well-known issuers
- * @verify_signatures: If the model signature (s_m) and device signature (s_d)
- *   should be validated against the certificate and keys provided in the claim
- * @application_secret: (out) (transfer full): A new #GBytes with the derived
- *   application secret (s) of length %SDCP_APPLICATION_SECRET_SIZE
- * @error: (out): #GError in case the return value is %NULL
- *
- * High level function which internally handles the derivation of all necessary
- * SDCP-related keys and secrets from the device's ConnectResponse and derives
- * the application secret for use with all other SDCP-related functions.
- *
- * This function will also perform a validation of the ConnectResponse MAC and
- * optionally perform additional verifications based on the provided
- * @validate_certificate and @verify_signatures booleans. If any of these these
- * validations fail then %NULL will be returned, indicating that the SDCP secure
- * connection channel could not be established.
- *
- * Returns: %TRUE if the @application_secret was successfully derived and the
- * ConnectResponse has been successfully verified
- **/
-gboolean fpi_sdcp_verify_connect (GBytes       *host_private_key,
-                                  GBytes       *host_random,
-                                  GBytes       *device_random,
-                                  FpiSdcpClaim *claim,
-                                  GBytes       *mac,
-                                  gboolean      validate_certificate,
-                                  gboolean      verify_signatures,
-                                  GBytes      **application_secret,
-                                  GError      **error);
-
-/**
- * fpi_sdcp_verify_reconnect:
- * @application_secret: The host's derived application secret (s)
- * @random: The host-generated random sent to the device's Reconnect command (r)
- * @mac: The MAC provided in the device's ReconnectResponse (m)
- * @error: (out): #GError in case the return value is %FALSE
- *
- * Verifies the SDCP ReconnectResponse.
- *
- * Returns: %TRUE if the ReconnectResponse is verified successfully
- **/
-gboolean fpi_sdcp_verify_reconnect (GBytes  *application_secret,
-                                    GBytes  *random,
-                                    GBytes  *mac,
-                                    GError **error);
-
-/**
- * fpi_sdcp_verify_identify:
- * @application_secret: The host's derived application secret (s)
- * @nonce: The host-generated nonce sent to the device's Identify command (n)
- * @id: The ID provided in the device's AuthorizedIdentity (id)
- * @mac: The MAC provided in the device's AuthorizedIdentity (m)
- * @error: (out): #GError in case the return value is %FALSE
- *
- * Verifies the SDCP ReconnectResponse.
- *
- * Returns: %TRUE if the ReconnectResponse is verified successfully
- **/
-gboolean fpi_sdcp_verify_identify (GBytes  *application_secret,
-                                   GBytes  *nonce,
-                                   GBytes  *id,
-                                   GBytes  *mac,
-                                   GError **error);
-
-/**
- * fpi_sdcp_generate_enrollment_id:
- * @application_secret: The host's derived application secret (s)
- * @nonce: The nonce received from the device in response to the EnrollBegin
- *   command (n)
- * @error: (out): #GError in case the return value is %NULL
- *
- * Generates a new id for use with the device's EnrollCommit command.
- *
- * Returns: A new #GBytes with the generated enrollment id of length
- * %SDCP_ENROLLMENT_ID_SIZE
- **/
-GBytes *fpi_sdcp_generate_enrollment_id (GBytes  *application_secret,
-                                         GBytes  *nonce,
-                                         GError **error);
@@ -18,6 +18,7 @@
 */

 #include "fpi-spi-transfer.h"
+#include "fpi-log.h"
 #include <sys/ioctl.h>
 #include <linux/spi/spidev.h>
 #include <errno.h>
@@ -41,38 +42,17 @@ static gsize block_size = 0;
 * Drivers should always use this API rather than calling read/write/ioctl on
 * the spidev device.
 *
- * Setting G_MESSAGES_DEBUG and FP_DEBUG_TRANSFER will result in the message
+ * Setting %G_MESSAGES_DEBUG and %FP_DEBUG_TRANSFER will result in the message
 * content to be dumped.
 */


 G_DEFINE_BOXED_TYPE (FpiSpiTransfer, fpi_spi_transfer, fpi_spi_transfer_ref, fpi_spi_transfer_unref)

-static void
-dump_buffer (guchar *buf, gssize dump_len)
-{
-  g_autoptr(GString) line = NULL;
-
-  line = g_string_new ("");
-  /* Dump the buffer. */
-  for (gssize i = 0; i < dump_len; i++)
-    {
-      g_string_append_printf (line, "%02x ", buf[i]);
-      if ((i + 1) % 16 == 0)
-        {
-          g_debug ("%s", line->str);
-          g_string_set_size (line, 0);
-        }
-    }
-
-  if (line->len)
-    g_debug ("%s", line->str);
-}
-
 static void
 log_transfer (FpiSpiTransfer *transfer, gboolean submit, GError *error)
 {
-  if (g_getenv ("FP_DEBUG_TRANSFER"))
+  if (fpi_log_is_debug_transfer_enabled ())
    {
      if (submit)
        {
@@ -82,7 +62,7 @@ log_transfer (FpiSpiTransfer *transfer, gboolean submit, GError *error)
                   transfer->length_rd);

          if (transfer->buffer_wr)
-            dump_buffer (transfer->buffer_wr, transfer->length_wr);
+            fp_dbg_hex_dump_data (transfer->buffer_wr, transfer->length_wr);
        }
      else
        {
@@ -98,7 +78,7 @@ log_transfer (FpiSpiTransfer *transfer, gboolean submit, GError *error)
                   transfer->length_wr,
                   transfer->length_rd);
          if (transfer->buffer_rd)
-            dump_buffer (transfer->buffer_rd, transfer->length_rd);
+            fp_dbg_hex_dump_data (transfer->buffer_rd, transfer->length_rd);
        }
    }
 }
@@ -615,7 +615,7 @@ fpi_ssm_get_cur_state (FpiSsm *machine)
 *
 * Returns the error code set by fpi_ssm_mark_failed().
 *
- * Returns: (transfer none): a error code
+ * Returns: (transfer none): a #GError or %NULL if not set.
 */
 GError *
 fpi_ssm_get_error (FpiSsm *machine)
@@ -631,7 +631,7 @@ fpi_ssm_get_error (FpiSsm *machine)
 *
 * Returns the error code set by fpi_ssm_mark_failed().
 *
- * Returns: (transfer full): a error code
+ * Returns: (transfer full): a #GError or %NULL if not set.
 */
 GError *
 fpi_ssm_dup_error (FpiSsm *machine)
@@ -657,6 +657,8 @@ fpi_ssm_dup_error (FpiSsm *machine)
 void
 fpi_ssm_silence_debug (FpiSsm *machine)
 {
+  g_return_if_fail (machine != NULL);
+
  machine->silence = TRUE;
 }

@@ -665,10 +667,10 @@ fpi_ssm_silence_debug (FpiSsm *machine)
 * @transfer: a #FpiUsbTransfer
 * @device: a #FpDevice
 * @unused_data: User data (unused)
- * @error: The #GError or %NULL
+ * @error: (transfer full): a #GError or %NULL.
 *
 * Can be used in as a #FpiUsbTransfer callback handler to automatically
- * advance or fail a statemachine on transfer completion.
+ * advance or fail a state machine on transfer completion.
 *
 * Make sure to set the #FpiSsm on the transfer.
 */
@@ -676,10 +678,11 @@ void
 fpi_ssm_usb_transfer_cb (FpiUsbTransfer *transfer, FpDevice *device,
                         gpointer unused_data, GError *error)
 {
+  g_return_if_fail (transfer != NULL);
  g_return_if_fail (transfer->ssm);

  if (error)
-    fpi_ssm_mark_failed (transfer->ssm, error);
+    fpi_ssm_mark_failed (transfer->ssm, g_steal_pointer (&error));
  else
    fpi_ssm_next_state (transfer->ssm);
 }
@@ -691,10 +694,10 @@ fpi_ssm_usb_transfer_cb (FpiUsbTransfer *transfer, FpDevice *device,
 * @weak_ptr: A #gpointer pointer to nullify. You can pass a pointer to any
 *            #gpointer to nullify when the callback is completed. I.e a
 *            pointer to the current #FpiUsbTransfer.
- * @error: The #GError or %NULL
+ * @error: (transfer full): a #GError or %NULL.
 *
 * Can be used in as a #FpiUsbTransfer callback handler to automatically
- * advance or fail a statemachine on transfer completion.
+ * advance or fail a state machine on transfer completion.
 * Passing a #gpointer* as @weak_ptr permits to nullify it once we're done
 * with the transfer.
 *
@@ -705,12 +708,13 @@ fpi_ssm_usb_transfer_with_weak_pointer_cb (FpiUsbTransfer *transfer,
                                           FpDevice *device, gpointer weak_ptr,
                                           GError *error)
 {
+  g_return_if_fail (transfer != NULL);
  g_return_if_fail (transfer->ssm);

  if (weak_ptr)
    g_nullify_pointer ((gpointer *) weak_ptr);

-  fpi_ssm_usb_transfer_cb (transfer, device, weak_ptr, error);
+  fpi_ssm_usb_transfer_cb (transfer, device, weak_ptr, g_steal_pointer (&error));
 }

 /**
@@ -718,10 +722,10 @@ fpi_ssm_usb_transfer_with_weak_pointer_cb (FpiUsbTransfer *transfer,
 * @transfer: a #FpiSpiTransfer
 * @device: a #FpDevice
 * @unused_data: User data (unused)
- * @error: The #GError or %NULL
+ * @error: (transfer full): a #GError or %NULL.
 *
 * Can be used in as a #FpiSpiTransfer callback handler to automatically
- * advance or fail a statemachine on transfer completion.
+ * advance or fail a state machine on transfer completion.
 *
 * Make sure to set the #FpiSsm on the transfer.
 */
@@ -729,10 +733,11 @@ void
 fpi_ssm_spi_transfer_cb (FpiSpiTransfer *transfer, FpDevice *device,
                         gpointer unused_data, GError *error)
 {
+  g_return_if_fail (transfer != NULL);
  g_return_if_fail (transfer->ssm);

  if (error)
-    fpi_ssm_mark_failed (transfer->ssm, error);
+    fpi_ssm_mark_failed (transfer->ssm, g_steal_pointer (&error));
  else
    fpi_ssm_next_state (transfer->ssm);
 }
@@ -744,10 +749,10 @@ fpi_ssm_spi_transfer_cb (FpiSpiTransfer *transfer, FpDevice *device,
 * @weak_ptr: A #gpointer pointer to nullify. You can pass a pointer to any
 *            #gpointer to nullify when the callback is completed. I.e a
 *            pointer to the current #FpiSpiTransfer.
- * @error: The #GError or %NULL
+ * @error: (transfer full): a #GError or %NULL.
 *
 * Can be used in as a #FpiSpiTransfer callback handler to automatically
- * advance or fail a statemachine on transfer completion.
+ * advance or fail a state machine on transfer completion.
 * Passing a #gpointer* as @weak_ptr permits to nullify it once we're done
 * with the transfer.
 *
@@ -758,10 +763,11 @@ fpi_ssm_spi_transfer_with_weak_pointer_cb (FpiSpiTransfer *transfer,
                                           FpDevice *device, gpointer weak_ptr,
                                           GError *error)
 {
+  g_return_if_fail (transfer != NULL);
  g_return_if_fail (transfer->ssm);

  if (weak_ptr)
    g_nullify_pointer ((gpointer *) weak_ptr);

-  fpi_ssm_spi_transfer_cb (transfer, device, weak_ptr, error);
+  fpi_ssm_spi_transfer_cb (transfer, device, weak_ptr, g_steal_pointer (&error));
 }
@@ -18,6 +18,7 @@
 */

 #include "fpi-usb-transfer.h"
+#include "fpi-log.h"

 /**
 * SECTION:fpi-usb-transfer
@@ -30,6 +31,9 @@
 *
 * Drivers should use this API only rather than accessing the GUsbDevice
 * directly in most cases.
+ *
+ * Setting %G_MESSAGES_DEBUG and %FP_DEBUG_TRANSFER will result in the message
+ * content to be dumped.
 */


@@ -38,7 +42,7 @@ G_DEFINE_BOXED_TYPE (FpiUsbTransfer, fpi_usb_transfer, fpi_usb_transfer_ref, fpi
 static void
 log_transfer (FpiUsbTransfer *transfer, gboolean submit, GError *error)
 {
-  if (g_getenv ("FP_DEBUG_TRANSFER"))
+  if (fpi_log_is_debug_transfer_enabled ())
    {
      if (!submit)
        {
@@ -65,25 +69,9 @@ log_transfer (FpiUsbTransfer *transfer, gboolean submit, GError *error)

      if (!submit == !!(transfer->endpoint & FPI_USB_ENDPOINT_IN))
        {
-          g_autoptr(GString) line = NULL;
-          gssize dump_len;
-
-          dump_len = (transfer->endpoint & FPI_USB_ENDPOINT_IN) ? transfer->actual_length : transfer->length;
-
-          line = g_string_new ("");
-          /* Dump the buffer. */
-          for (gint i = 0; i < dump_len; i++)
-            {
-              g_string_append_printf (line, "%02x ", transfer->buffer[i]);
-              if ((i + 1) % 16 == 0)
-                {
-                  g_debug ("%s", line->str);
-                  g_string_set_size (line, 0);
-                }
-            }
-
-          if (line->len)
-            g_debug ("%s", line->str);
+          fp_dbg_hex_dump_data (transfer->buffer,
+                                (transfer->endpoint & FPI_USB_ENDPOINT_IN) ?
+                                transfer->actual_length : transfer->length);
        }
    }
 }
@@ -344,7 +332,8 @@ transfer_finish_cb (GObject *source_object, GAsyncResult *res, gpointer user_dat
    {
      error = g_error_new (G_USB_DEVICE_ERROR,
                           G_USB_DEVICE_ERROR_IO,
-                           "Unexpected short error of %zd size (expected %zd)", transfer->actual_length, transfer->length);
+                           "Unexpected short error of %zd size (expected %zd)",
+                           transfer->actual_length, transfer->length);
    }

  callback = transfer->callback;
@@ -548,3 +537,23 @@ fpi_usb_transfer_submit_sync (FpiUsbTransfer *transfer,

  return res;
 }
+
+/**
+ * fpi_usb_transfer_set_short_error:
+ * @transfer: The transfer to submit, must have been filled.
+ * @short_is_error: Whether a short transfer should be considered an error
+ *
+ * Sets whether a short transfer (a transfer in which the transferred length
+ * does not match the expected length) should be considered an error
+ *
+ * By default, short transfers are not considered an error, but
+ * drivers can enforce a further check by setting this flag.
+ */
+void
+fpi_usb_transfer_set_short_error (FpiUsbTransfer *transfer,
+                                  gboolean        short_is_error)
+{
+  g_return_if_fail (transfer);
+
+  transfer->short_is_error = short_is_error;
+}
@@ -30,7 +30,7 @@
  "  <url type=\"homepage\">https://fprint.freedesktop.org</url>\n" \
  "  <url type=\"vcs-browser\">https://gitlab.freedesktop.org/libfprint/libfprint</url>\n" \
  "  <url type=\"help\">https://fprint.freedesktop.org/libfprint-dev</url>\n" \
-  "  <url type=\"bugtracker\">https://gitlab.freedesktop.org/libfprint/libfprint/-/issues</url>\n" \
+  "  <url type=\"bugtracker\">https://gitlab.freedesktop.org/libfprint/libfprint/-/work_items</url>\n" \
  "  <summary>Async fingerprint readers library</summary>\n" \
  "  <description>\n" \
  "    <p>\n" \
@@ -78,6 +78,8 @@ main (void)
  g_autoptr(GString) provided_modules = g_string_new (NULL);
  g_autoptr(GError) error = NULL;

+  g_log_writer_default_set_use_stderr (TRUE);
+
  g_array_sort (drivers, driver_compare);

  for (guint i = 0; i < drivers->len; ++i)
@@ -167,7 +167,6 @@ static const FpIdEntry allowlist_id_table[] = {
  { .vid = 0x298d, .pid = 0x2020 },
  { .vid = 0x298d, .pid = 0x2033 },
  { .vid = 0x2df0, .pid = 0x0003 },
-  { .vid = 0x3274, .pid = 0x8012 },
  { .vid = 0x3538, .pid = 0x0930 },
  { .vid = 0 },
 };
@@ -48,8 +48,8 @@ libfprint_private_headers = [
    'fpi-log.h',
    'fpi-minutiae.h',
    'fpi-print.h',
-    'fpi-ssm.h',
    'fpi-usb-transfer.h',
+    'fpi-ssm.h',
 ] + spi_headers

 nbis_sources = [
@@ -88,91 +88,66 @@ nbis_sources = [
 ]

 driver_sources = {
-    'upekts' :
-        [ 'drivers/upekts.c', 'drivers/upek_proto.c' ],
-    'upektc' :
-        [ 'drivers/upektc.c' ],
-    'upeksonly' :
-        [ 'drivers/upeksonly.c' ],
-    'uru4000' :
-        [ 'drivers/uru4000.c' ],
-    'aes1610' :
-        [ 'drivers/aes1610.c' ],
-    'aes1660' :
-        [ 'drivers/aes1660.c' ],
-    'aes2501' :
-        [ 'drivers/aes2501.c' ],
-    'aes2550' :
-        [ 'drivers/aes2550.c' ],
-    'aes2660' :
-        [ 'drivers/aes2660.c' ],
-    'aes3500' :
-        [ 'drivers/aes3500.c' ],
-    'aes4000' :
-        [ 'drivers/aes4000.c' ],
-    'vcom5s' :
-        [ 'drivers/vcom5s.c' ],
-    'vfs101' :
-        [ 'drivers/vfs101.c' ],
-    'vfs301' :
-        [ 'drivers/vfs301.c', 'drivers/vfs301_proto.c' ],
-    'vfs5011' :
-        [ 'drivers/vfs5011.c' ],
-    'vfs7552' :
-        [ 'drivers/vfs7552.c' ],
-    'upektc_img' :
-        [ 'drivers/upektc_img.c',  'drivers/upek_proto.c' ],
-    'etes603' :
-        [ 'drivers/etes603.c' ],
-    'egis0570' :
-        [ 'drivers/egis0570.c' ],
-    'egismoc' :
-        [ 'drivers/egismoc/egismoc.c' ],
-    'vfs0050' :
-        [ 'drivers/vfs0050.c' ],
-    'elan' :
-        [ 'drivers/elan.c' ],
-    'elanmoc' :
-        [ 'drivers/elanmoc/elanmoc.c' ],
-    'elanspi' :
-        [ 'drivers/elanspi.c' ],
-    'nb1010' :
-        [ 'drivers/nb1010.c' ],
-    'virtual_image' :
-        [ 'drivers/virtual-image.c' ],
-    'virtual_device' :
-        [ 'drivers/virtual-device.c' ],
-    'virtual_device_storage' :
-        [ 'drivers/virtual-device-storage.c' ],
-    'virtual_sdcp' :
-        [ 'drivers/virtual-sdcp.c' ],
-    'synaptics' :
-        [ 'drivers/synaptics/synaptics.c', 'drivers/synaptics/bmkt_message.c' ],
-    'goodixmoc' :
-        [ 'drivers/goodixmoc/goodix.c', 'drivers/goodixmoc/goodix_proto.c' ],
-    'fpcmoc' :
-        [ 'drivers/fpcmoc/fpc.c' ],
-    'realtek' :
-        [ 'drivers/realtek/realtek.c' ],
-    'focaltech_moc' :
-        [ 'drivers/focaltech_moc/focaltech_moc.c' ],
+    'upekts' : files(
+        'drivers/upekts.c',
+        'drivers/upek_proto.c',
+    ),
+    'upektc' : files('drivers/upektc.c'),
+    'upeksonly' : files('drivers/upeksonly.c'),
+    'uru4000' : files('drivers/uru4000.c'),
+    'aes1610' : files('drivers/aes1610.c'),
+    'aes1660' : files('drivers/aes1660.c'),
+    'aes2501' : files('drivers/aes2501.c'),
+    'aes2550' : files('drivers/aes2550.c'),
+    'aes2660' : files('drivers/aes2660.c'),
+    'aes3500' : files('drivers/aes3500.c'),
+    'aes4000' : files('drivers/aes4000.c'),
+    'vcom5s' : files('drivers/vcom5s.c'),
+    'vfs101' : files('drivers/vfs101.c'),
+    'vfs301' : files(
+        'drivers/vfs301.c',
+        'drivers/vfs301_proto.c',
+    ),
+    'vfs5011' : files('drivers/vfs5011.c'),
+    'vfs7552' : files('drivers/vfs7552.c'),
+    'upektc_img' : files(
+        'drivers/upektc_img.c',
+        'drivers/upek_proto.c',
+    ),
+    'etes603' : files('drivers/etes603.c'),
+    'egis0570' : files('drivers/egis0570.c'),
+    'egismoc' : files('drivers/egismoc/egismoc.c'),
+    'egis_etu905' : files('drivers/egismoc/egis_etu905.c'),
+    'vfs0050' : files('drivers/vfs0050.c'),
+    'elan' : files('drivers/elan.c'),
+    'elanmoc' : files('drivers/elanmoc/elanmoc.c'),
+    'elanspi' : files('drivers/elanspi.c'),
+    'nb1010' : files('drivers/nb1010.c'),
+    'virtual_image' : files('drivers/virtual-image.c'),
+    'virtual_device' : files('drivers/virtual-device.c'),
+    'virtual_device_storage' : files('drivers/virtual-device-storage.c'),
+    'synaptics' : files(
+        'drivers/synaptics/synaptics.c',
+        'drivers/synaptics/bmkt_message.c',
+    ),
+    'goodixmoc' : files(
+        'drivers/goodixmoc/goodix.c',
+        'drivers/goodixmoc/goodix_proto.c',
+    ),
+    'fpcmoc' : files('drivers/fpcmoc/fpc.c'),
+    'realtek' : files('drivers/realtek/realtek.c'),
+    'focaltech_moc' : files('drivers/focaltech_moc/focaltech_moc.c'),
+    'mafpmoc' : files('drivers/mafpmoc/mafpmoc.c'),
+    'secugen' : files('drivers/secugen.c'),
 }

 helper_sources = {
-    'aeslib' :
-        [ 'drivers/aeslib.c' ],
-    'aesx660' :
-        [ 'drivers/aesx660.c' ],
-    'aes3k' :
-        [ 'drivers/aes3k.c' ],
-    'openssl' :
-        [ ],
-    'sdcp' :
-        [ ],
-    'udev' :
-        [ ],
-    'virtual' :
-        [ 'drivers/virtual-device-listener.c' ],
+    'aeslib': files('drivers/aeslib.c'),
+    'aesx660': files('drivers/aesx660.c'),
+    'aes3k': files('drivers/aes3k.c'),
+    'openssl': files(),
+    'udev': files(),
+    'virtual': files('drivers/virtual-device-listener.c'),
 }

 drivers_sources = []
@@ -184,24 +159,6 @@ foreach helper : driver_helpers
    drivers_sources += helper_sources[helper]
 endforeach

-subdir('sdcp')
-if 'sdcp' in driver_helpers
-    libfprint_sources += [
-        'fp-sdcp-device.c',
-    ]
-    libfprint_private_sources += [
-        'fpi-sdcp.c',
-        'fpi-sdcp-device.c',
-        sdcp_truststore_resource_c,
-    ]
-    libfprint_public_headers += [
-        'fp-sdcp-device.h',
-    ]
-    libfprint_private_headers += [
-        'fpi-sdcp.h',
-        'fpi-sdcp-device.h',
-    ]
-endif

 fp_enums = gnome.mkenums_simple('fp-enums',
    sources: libfprint_public_headers,
@@ -254,6 +211,7 @@ deps = [
    enums_dep,
    gio_dep,
    glib_dep,
+    gmodule_dep,
    gobject_dep,
    gusb_dep,
    mathlib_dep,
@@ -346,7 +304,9 @@ udev_hwdb = executable('fprint-list-udev-hwdb',
    'fprint-list-udev-hwdb.c',
    dependencies: libfprint_private_dep,
    link_with: libfprint_drivers,
-    install: false)
+    install: false,
+    link_args: ['-Wl,--disable-new-dtags'],
+)

 udev_hwdb_generator = custom_target('udev-hwdb',
    output: 'autosuspend.hwdb',
@@ -360,7 +320,9 @@ metainfo = executable('fprint-list-metainfo',
    'fprint-list-metainfo.c',
    dependencies: libfprint_private_dep,
    link_with: libfprint_drivers,
-    install: false)
+    install: false,
+    link_args: ['-Wl,--disable-new-dtags'],
+)

 metainfo_generator = custom_target('metainfo',
    output: 'org.freedesktop.libfprint.metainfo.xml',
@@ -376,7 +338,9 @@ if install_udev_rules
        'fprint-list-udev-rules.c',
        dependencies: libfprint_private_dep,
        link_with: libfprint_drivers,
-        install: false)
+        install: false,
+        link_args: ['-Wl,--disable-new-dtags'],
+    )

    custom_target('udev-rules',
        output: '70-@0@.rules'.format(versioned_libname),
@@ -1,25 +0,0 @@
-#!/usr/bin/python3
-
-import os
-import sys
-
-if len(sys.argv) != 3:
-  print("generate-gresource.py: Generates SDCP Truststore GResource XML file from certificates in ./truststore/*.pem")
-  print("Usage: generate-gresource.py <libfprint_sdcp_source_dir> <output_xml_file>")
-  sys.exit(1)
-
-gresource_prefix = "/org/freedesktop/fprint/sdcp"
-relative_folder = "truststore"
-full_folder = os.path.join(sys.argv[1], relative_folder)
-output = sys.argv[2]
-
-files = [f for f in os.listdir(full_folder) if os.path.isfile(os.path.join(full_folder, f)) and f.endswith('.pem')]
-
-with open(output, 'w') as f:
-  f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-  f.write('<gresources>\n')
-  f.write(f'  <gresource prefix="{gresource_prefix}">\n')
-  for file in files:
-    f.write(f'    <file compressed="true">{relative_folder}/{file}</file>\n')
-  f.write('  </gresource>\n')
-  f.write('</gresources>\n')
@@ -1,32 +0,0 @@
-sdcp_truststore_gresource_xml = custom_target('sdcp-truststore.gresource',
-    input : 'generate-gresource.py',
-    output : 'sdcp-truststore.gresource.xml',
-    command : [find_program('python3'), '@INPUT@', meson.current_source_dir(), '@OUTPUT@'],
-)
-
-sdcp_truststore_resource_h = custom_target('fpi-sdcp-truststore-resource.h',
-    input : sdcp_truststore_gresource_xml,
-    output : 'fpi-sdcp-truststore-resource.h',
-    command : ['glib-compile-resources',
-               '--target=@OUTPUT@',
-               '--sourcedir=' + meson.current_source_dir(),
-               '--internal',
-               '--generate',
-               '--c-name', 'fpi_sdcp_truststore',
-               '--manual-register',
-               '@INPUT@']
-)
-
-sdcp_truststore_resource_c = custom_target('fpi-sdcp-truststore-resource.c',
-    depends : [sdcp_truststore_resource_h],
-    input : sdcp_truststore_gresource_xml,
-    output : 'fpi-sdcp-truststore-resource.c',
-    command : ['glib-compile-resources',
-               '--target=@OUTPUT@',
-               '--sourcedir=' + meson.current_source_dir(),
-               '--internal',
-               '--generate',
-               '--c-name', 'fpi_sdcp_truststore',
-               '--manual-register',
-               '@INPUT@']
-)
@@ -1,19 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIDIDCCAqWgAwIBAgIQKs9yK9kUXqlMVB+fSF1UMjAKBggqhkjOPQQDAzCBlDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1v
-bmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjE+MDwGA1UEAxM1TWlj
-cm9zb2Z0IEVDQyBEZXZpY2VzIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIw
-MTcwHhcNMTcxMTA5MTk0MDQ4WhcNNDIxMTA5MTk0ODE5WjCBlDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNV
-BAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjE+MDwGA1UEAxM1TWljcm9zb2Z0IEVD
-QyBEZXZpY2VzIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAARiivDX0DS0EXoGlfbd2PwxSC87Cszr6/aAjSx6pMwU
-4kzXcId0dhrjSkPSIO5UCz50ggQGQiTwqRzyhM44FlEyzbzl6OHGDwR1vAg3wdmm
-WEXWySzyAZKsfkwg0G7bPkijgbkwgbYwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFBTaW/EOZkfRXRNfW3rr618BCLVJMBAGCSsGAQQBgjcV
-AQQDAgEAMGUGA1UdIAReMFwwBgYEVR0gADBSBgwrBgEEAYI3TIN9AQEwQjBABggr
-BgEFBQcCARY0aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9Eb2NzL1Jl
-cG9zaXRvcnkuaHRtADAKBggqhkjOPQQDAwNpADBmAjEAxxAFFL8juLXiulXvZgBQ
-pGGPCcV2Tr3CorZ4p/uO2/rtBemqhL3CjKAm40VlhEz8AjEArE5fhA54SEDjoTwZ
-VUosaqXa8ych31qjZI+e1ttbOPebAZTt9ac7+lTzJcLTEQch
-----END CERTIFICATE-----
@@ -1,23 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIDwzCCA0qgAwIBAgITMwAAAAuNaMBkOddK4wAAAAAACzAKBggqhkjOPQQDAjCB
-hDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1Jl
-ZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEuMCwGA1UEAxMl
-V2luZG93cyBIZWxsbyBTZWN1cmUgRGV2aWNlcyBQQ0EgMjAxODAeFw0yMTEyMDky
-MzI1MDFaFw0zMDEyMDkyMzM1MDFaMFYxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVN
-aWNyb3NvZnQgQ29ycG9yYXRpb24xJzAlBgNVBAMTHldpbmRvd3MgSGVsbG8gMjA5
-NkFEQ0MgQ0EgMjAyMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJWgPvl44Gei
-RrTuA3f1eT60pAlBWM7ym7WSchqz3hge1WS8RUxPVedu0f7MCe/R6O6RVjV7HWq4
-c6jo9FwoiAGjggHGMIIBwjAQBgkrBgEEAYI3FQEEAwIBADAdBgNVHQ4EFgQUvzdI
-40pjLelTo7qJApjAaUcqmbkwVAYDVR0gBE0wSzBJBgRVHSAAMEEwPwYIKwYBBQUH
-AgEWM2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0
-b3J5Lmh0bTAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYw
-DwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTaykvQTFYDJ1+X63WjAsO/RZz4
-sTBoBgNVHR8EYTBfMF2gW6BZhldodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtp
-b3BzL2NybC9XaW5kb3dzJTIwSGVsbG8lMjBTZWN1cmUlMjBEZXZpY2VzJTIwUENB
-JTIwMjAxOC5jcmwwdQYIKwYBBQUHAQEEaTBnMGUGCCsGAQUFBzAChllodHRwOi8v
-d3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL1dpbmRvd3MlMjBIZWxsbyUy
-MFNlY3VyZSUyMERldmljZXMlMjBQQ0ElMjAyMDE4LmNydDAKBggqhkjOPQQDAgNn
-ADBkAjAeGyYlzf+uBQXI/EW84I5CGFbo/U6dL4k1Y83f2p94d0wrNwjUb/yprb4+
-L9+OKfQCME8PgRyJQxsvsne+WI6gr0ZzJilotoiRdvDzlMK4+hx5TGJWTV17AsAo
-z2330epHQQ==
-----END CERTIFICATE-----
@@ -1,26 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIEVjCCA9ygAwIBAgITMwAAAANsz+3iRHAZvwAAAAAAAzAKBggqhkjOPQQDAzCB
-lDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1Jl
-ZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjE+MDwGA1UEAxM1
-TWljcm9zb2Z0IEVDQyBEZXZpY2VzIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-IDIwMTcwHhcNMTgwMTI1MTk0OTM4WhcNMzMwMTI1MTk1OTM4WjCBhDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAc
-BgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEuMCwGA1UEAxMlV2luZG93cyBI
-ZWxsbyBTZWN1cmUgRGV2aWNlcyBQQ0EgMjAxODB2MBAGByqGSM49AgEGBSuBBAAi
-A2IABB3dCAIDJXUg4nGLrSgJgukG7oPFOmxLcZJQTiDpcrT8UyrvXcyatM12uJSX
-RLJxDsmxFgOhZSu56F1f8jAu3bErIPy+AIjqH6d/mYSYfHE+TTSDaZsIy3iyS73X
-Pr5noKOCAfwwggH4MBAGCSsGAQQBgjcVAQQDAgEAMB0GA1UdDgQWBBTaykvQTFYD
-J1+X63WjAsO/RZz4sTBlBgNVHSAEXjBcMAYGBFUdIAAwUgYMKwYBBAGCN0yDfQEB
-MEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMv
-RG9jcy9SZXBvc2l0b3J5Lmh0bQAwGQYJKwYBBAGCNxQCBAweCgBTAHUAYgBDAEEw
-CwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUFNpb8Q5m
-R9FdE19beuvrXwEItUkwegYDVR0fBHMwcTBvoG2ga4ZpaHR0cDovL3d3dy5taWNy
-b3NvZnQuY29tL3BraW9wcy9jcmwvTWljcm9zb2Z0JTIwRUNDJTIwRGV2aWNlcyUy
-MFJvb3QlMjBDZXJ0aWZpY2F0ZSUyMEF1dGhvcml0eSUyMDIwMTcuY3JsMIGHBggr
-BgEFBQcBAQR7MHkwdwYIKwYBBQUHMAKGa2h0dHA6Ly93d3cubWljcm9zb2Z0LmNv
-bS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwRUNDJTIwRGV2aWNlcyUyMFJvb3Ql
-MjBDZXJ0aWZpY2F0ZSUyMEF1dGhvcml0eSUyMDIwMTcuY3J0MAoGCCqGSM49BAMD
-A2gAMGUCMFYqrXJMuYyzI4D1X/ghlGYPdnfiewPdMF7LkMp45gstEuX3ZzFYcebz
-ZMEEs4vp4gIxALkgYbnQXjqkoor+HfwnYQuYFowCnCB/7vPLHwo3YrGOztmanqzm
-GtS48agrsbRAmw==
-----END CERTIFICATE-----
@@ -93,6 +93,7 @@ versioned_libname = meson.project_name() + '-' + soversion.to_string()
 glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
 gio_dep = dependency('gio-unix-2.0', version: '>=' + glib_min_version)
 gobject_dep = dependency('gobject-2.0', version: '>=' + glib_min_version)
+gmodule_dep = dependency('gmodule-2.0', version: '>=' + glib_min_version)
 gusb_dep = dependency('gusb', version: '>= 0.2.0')
 mathlib_dep = cc.find_library('m', required: false)

@@ -112,8 +113,8 @@ virtual_drivers = [
    'virtual_image',
    'virtual_device',
    'virtual_device_storage',
-    'virtual_sdcp',
 ]
+
 default_drivers = [
    'upektc_img',
    'vfs5011',
@@ -131,6 +132,7 @@ default_drivers = [
    'etes603',
    'egis0570',
    'egismoc',
+    'egis_etu905',
    'vcom5s',
    'synaptics',
    'elan',
@@ -144,6 +146,8 @@ default_drivers = [
    'fpcmoc',
    'realtek',
    'focaltech_moc',
+    'mafpmoc',
+    'secugen',
 ]

 spi_drivers = [
@@ -165,6 +169,7 @@ endian_independent_drivers = virtual_drivers + [
    'aes4000',
    'egis0570',
    'egismoc',
+    'egis_etu905',
    'elanmoc',
    'etes603',
    'focaltech_moc',
@@ -209,13 +214,11 @@ driver_helper_mapping = {
    'aes2660' : [ 'aeslib', 'aesx660' ],
    'aes3500' : [ 'aeslib', 'aes3k' ],
    'aes4000' : [ 'aeslib', 'aes3k' ],
-    'egismoc' : [ 'sdcp' ],
-    'elanspi' : [ 'udev' ],
    'uru4000' : [ 'openssl' ],
+    'elanspi' : [ 'udev' ],
    'virtual_image'          : [ 'virtual' ],
    'virtual_device'         : [ 'virtual' ],
    'virtual_device_storage' : [ 'virtual' ],
-    'virtual_sdcp'           : [ 'virtual', 'sdcp' ],
 }

 driver_helpers = []
@@ -274,13 +277,6 @@ foreach i : driver_helpers
            error('OpenSSL is required for @0@ and possibly others'.format(driver))
        endif

-        optional_deps += openssl_dep
-    elif i == 'sdcp'
-        openssl_dep = dependency('openssl', version: '>= 3.0.8', required: false)
-        if not openssl_dep.found()
-            error('OpenSSL >= 3.0.8 is required for SDCP support (@0@ and possibly others)'.format(driver))
-        endif
-
        optional_deps += openssl_dep
    elif i == 'udev'
        install_udev_rules = true
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import cairo
 import sys
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 BUILDDIR='@BUILDDIR@'
 SRCDIR='@SRCDIR@'
@@ -0,0 +1,137 @@
+#!/usr/bin/python3
+import traceback
+
+import sys
+import gi
+
+gi.require_version('FPrint', '2.0')
+from gi.repository import FPrint, GLib, Gio
+
+# Exit with error on any exception, included those happening in async callbacks
+sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
+
+ctx = GLib.main_context_default()
+
+c = FPrint.Context()
+c.enumerate()
+devices = c.get_devices()
+
+d = devices[0]
+del devices
+
+assert d.get_driver() == "egis_etu905"
+assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
+assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
+assert d.has_feature(FPrint.DeviceFeature.VERIFY)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
+
+d.open_sync()
+
+def enroll_progress(*args):
+    assert d.get_finger_status() == FPrint.FingerStatusFlags.PRESENT
+    print("enroll progress stage: " +  str(args[1]))
+
+def identify_done(dev, res):
+    global identified
+    identified = True
+    identify_match, identify_print = dev.identify_finish(res)
+    print("MATCH FOUND!" if identify_match else "NO MATCH FOUND")
+    assert identify_match.equal(identify_print)
+
+# List
+print("--- LISTING ---")
+stored = d.list_prints_sync()
+prints1 = len(stored)
+print(f"--- LIST DONE: Found {prints1} prints before enroll---")
+
+# Enroll
+print("--- ENROLLING ---")
+template = FPrint.Print.new(d)
+
+assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
+p = d.enroll_sync(template, None, enroll_progress, None)
+assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
+print("--- ENROLL DONE ---")
+del template
+
+# List
+print("--- LISTING ---")
+stored = d.list_prints_sync()
+prints2 = len(stored)
+print(f"--- LIST DONE: Found {prints2} prints after enroll---")
+assert (prints2 - prints1) == 1
+
+# Cancel test - start async identify and cancel it
+print("--- TESTING CANCELLATION ---")
+deserialized_prints = []
+for sp in stored:
+    deserialized_prints.append(FPrint.Print.deserialize(sp.serialize()))
+
+cancellable = Gio.Cancellable()
+identify_cancelled = False
+cancel_result = None
+
+def identify_cancelled_cb(dev, res):
+    global identify_cancelled, cancel_result
+    identify_cancelled = True
+    try:
+        result = dev.identify_finish(res)
+        cancel_result = result
+    except Exception as e:
+        cancel_result = e
+        print(f"Identify cancelled with error: {e}")
+
+d.identify(deserialized_prints, cancellable=cancellable, callback=identify_cancelled_cb)
+cancellable.cancel()
+
+while not identify_cancelled:
+    ctx.iteration(True)
+print(f"--- CANCELLATION TEST DONE, result: {cancel_result} ---")
+del deserialized_prints
+
+# Verify
+print("--- VERIFYING ---")
+assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
+verify_res, verify_print = d.verify_sync(p)
+assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
+print(f"--- VERIFY DONE: Result {verify_res} ---")
+
+# Identify
+print("--- ASYNC IDENTIFYING ---")
+identified = False
+deserialized_prints = []
+for p in stored:
+    deserialized_prints.append(FPrint.Print.deserialize(p.serialize()))
+    assert deserialized_prints[-1].equal(p)
+
+d.identify(deserialized_prints, callback=identify_done)
+del deserialized_prints
+
+while not identified:
+    ctx.iteration(True)
+print("--- IDENTIFY DONE ---")
+
+# Delete
+print("--- DELETING ---")
+p_to_delete = next((sp for sp in stored if sp.equal(p)), None)
+if p_to_delete:
+    d.delete_print_sync(p_to_delete)
+    print("--- DELETE DONE ---")
+del p_to_delete
+del p
+
+# List
+print("--- LISTING ---")
+stored = d.list_prints_sync()
+prints3 = len(stored)
+print(f"--- LIST DONE: Found {prints3} prints after deleting---")
+assert (prints2 - prints3) == 1
+del stored
+
+d.close_sync()
+
+del d
+del c
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -1,21 +1,17 @@
 P: /devices/pci0000:00/0000:00:14.0/usb3/3-5
-N: bus/usb/003/002=12010002FF0000407A1C820581110102030109022700010100A0320904000003FF000000070581020002000705020200020007058303400005
+N: bus/usb/003/012=12010002FF0000407A1C820581110102030109022700010100A0320904000003FF000000070581020002000705020200020007058303400005
 E: BUSNUM=003
-E: CURRENT_TAGS=:snap_cups_ippeveprinter:snap_android-platform-tools_fastboot:snap_android-platform-tools_adb:snap_cups_cupsd:
-E: DEVNAME=/dev/bus/usb/003/002
-E: DEVNUM=002
+E: CURRENT_TAGS=:snap_cups_ippeveprinter:snap_cups_cupsd:
+E: DEVNAME=/dev/bus/usb/003/012
+E: DEVNUM=012
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: ID_AUTOSUSPEND=1
 E: ID_BUS=usb
 E: ID_MODEL=ETU905A80-E
 E: ID_MODEL_ENC=ETU905A80-E
 E: ID_MODEL_ID=0582
 E: ID_PATH=pci-0000:00:14.0-usb-0:5
 E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_5
-E: ID_PATH_WITH_USB_REVISION=pci-0000:00:14.0-usbv2-0:5
-E: ID_PERSIST=0
-E: ID_PROCESSING=1
 E: ID_REVISION=1181
 E: ID_SERIAL=EGIS_ETU905A80-E_0E7828PBS393
 E: ID_SERIAL_SHORT=0E7828PBS393
@@ -34,10 +30,10 @@ E: ID_VENDOR_ENC=EGIS
 E: ID_VENDOR_FROM_DATABASE=LighTuning Technology Inc.
 E: ID_VENDOR_ID=1c7a
 E: MAJOR=189
-E: MINOR=257
+E: MINOR=267
 E: PRODUCT=1c7a/582/1181
 E: SUBSYSTEM=usb
-E: TAGS=:snap_cups_ippeveprinter:snap_android-platform-tools_fastboot:snap_cups_cupsd:snap_android-platform-tools_adb:
+E: TAGS=:snap_cups_ippeveprinter:snap_cups_cupsd:
 E: TYPE=255/0/0
 A: authorized=1\n
 A: avoid_reset_quirk=0\n
@@ -54,8 +50,8 @@ A: bmAttributes=a0\n
 A: busnum=3\n
 A: configuration=
 H: descriptors=12010002FF0000407A1C820581110102030109022700010100A0320904000003FF000000070581020002000705020200020007058303400005
-A: dev=189:257\n
-A: devnum=2\n
+A: dev=189:267\n
+A: devnum=12\n
 A: devpath=5\n
 L: driver=../../../../../bus/usb/drivers/usb
 L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:51/device:52/device:57
@@ -70,20 +66,20 @@ A: physical_location/lid=no\n
 A: physical_location/panel=unknown\n
 A: physical_location/vertical_position=center\n
 L: port=../3-0:1.0/usb3-port5
-A: power/active_duration=2329204\n
+A: power/active_duration=1425996\n
 A: power/async=enabled\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=96447632\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=1\n
+A: power/connected_duration=1426656\n
+A: power/control=on\n
+A: power/level=on\n
+A: power/persist=0\n
 A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=2345067\n
-A: power/runtime_enabled=enabled\n
+A: power/runtime_active_time=1426124\n
+A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
-A: power/runtime_suspended_time=94056717\n
-A: power/runtime_usage=0\n
+A: power/runtime_suspended_time=0\n
+A: power/runtime_usage=1\n
 A: power/wakeup=disabled\n
 A: power/wakeup_abort_count=\n
 A: power/wakeup_active=\n
@@ -100,13 +96,13 @@ A: rx_lanes=1\n
 A: serial=0E7828PBS393\n
 A: speed=480\n
 A: tx_lanes=1\n
-A: urbnum=10257\n
+A: urbnum=2803\n
 A: version= 2.00\n

 P: /devices/pci0000:00/0000:00:14.0/usb3
-N: bus/usb/003/001=12010002090001406B1D020015060302010109021900010100E0000904000001090000000705810304000C
+N: bus/usb/003/001=12010002090001406B1D020002060302010109021900010100E0000904000001090000000705810304000C
 E: BUSNUM=003
-E: CURRENT_TAGS=:snap_cups_ippeveprinter:seat:snap_android-platform-tools_fastboot:snap_cups_cupsd:snap_android-platform-tools_adb:
+E: CURRENT_TAGS=:seat:snap_cups_cupsd:snap_cups_ippeveprinter:
 E: DEVNAME=/dev/bus/usb/003/001
 E: DEVNUM=001
 E: DEVTYPE=usb_device
@@ -120,28 +116,28 @@ E: ID_MODEL_FROM_DATABASE=2.0 root hub
 E: ID_MODEL_ID=0002
 E: ID_PATH=pci-0000:00:14.0
 E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_REVISION=0615
-E: ID_SERIAL=Linux_6.15.1_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_REVISION=0602
+E: ID_SERIAL=Linux_6.2.0-34-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_SERIAL_SHORT=0000:00:14.0
 E: ID_USB_INTERFACES=:090000:
 E: ID_USB_MODEL=xHCI_Host_Controller
 E: ID_USB_MODEL_ENC=xHCI\x20Host\x20Controller
 E: ID_USB_MODEL_ID=0002
-E: ID_USB_REVISION=0615
-E: ID_USB_SERIAL=Linux_6.15.1_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_USB_REVISION=0602
+E: ID_USB_SERIAL=Linux_6.2.0-34-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_USB_SERIAL_SHORT=0000:00:14.0
-E: ID_USB_VENDOR=Linux_6.15.1_xhci-hcd
-E: ID_USB_VENDOR_ENC=Linux\x206.15.1\x20xhci-hcd
+E: ID_USB_VENDOR=Linux_6.2.0-34-generic_xhci-hcd
+E: ID_USB_VENDOR_ENC=Linux\x206.2.0-34-generic\x20xhci-hcd
 E: ID_USB_VENDOR_ID=1d6b
-E: ID_VENDOR=Linux_6.15.1_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x206.15.1\x20xhci-hcd
+E: ID_VENDOR=Linux_6.2.0-34-generic_xhci-hcd
+E: ID_VENDOR_ENC=Linux\x206.2.0-34-generic\x20xhci-hcd
 E: ID_VENDOR_FROM_DATABASE=Linux Foundation
 E: ID_VENDOR_ID=1d6b
 E: MAJOR=189
 E: MINOR=256
-E: PRODUCT=1d6b/2/615
+E: PRODUCT=1d6b/2/602
 E: SUBSYSTEM=usb
-E: TAGS=:snap_cups_ippeveprinter:seat:snap_android-platform-tools_fastboot:snap_cups_cupsd:snap_android-platform-tools_adb:
+E: TAGS=:snap_cups_cupsd:seat:snap_cups_ippeveprinter:
 E: TYPE=9/0/1
 A: authorized=1\n
 A: authorized_default=1\n
@@ -154,11 +150,11 @@ A: bMaxPacketSize0=64\n
 A: bMaxPower=0mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=0615\n
+A: bcdDevice=0602\n
 A: bmAttributes=e0\n
 A: busnum=3\n
 A: configuration=
-H: descriptors=12010002090001406B1D020015060302010109021900010100E0000904000001090000000705810304000C
+H: descriptors=12010002090001406B1D020002060302010109021900010100E0000904000001090000000705810304000C
 A: dev=189:256\n
 A: devnum=1\n
 A: devpath=0\n
@@ -168,20 +164,20 @@ A: idProduct=0002\n
 A: idVendor=1d6b\n
 A: interface_authorized_default=1\n
 A: ltm_capable=no\n
-A: manufacturer=Linux 6.15.1 xhci-hcd\n
+A: manufacturer=Linux 6.2.0-34-generic xhci-hcd\n
 A: maxchild=12\n
-A: power/active_duration=2362684\n
+A: power/active_duration=337953872\n
 A: power/async=enabled\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=96447784\n
+A: power/connected_duration=337978524\n
 A: power/control=auto\n
 A: power/level=auto\n
 A: power/runtime_active_kids=1\n
-A: power/runtime_active_time=2368910\n
+A: power/runtime_active_time=337962424\n
 A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
-A: power/runtime_suspended_time=94033284\n
+A: power/runtime_suspended_time=616\n
 A: power/runtime_usage=0\n
 A: power/wakeup=disabled\n
 A: power/wakeup_abort_count=\n
@@ -199,15 +195,12 @@ A: rx_lanes=1\n
 A: serial=0000:00:14.0\n
 A: speed=480\n
 A: tx_lanes=1\n
-A: urbnum=7078\n
+A: urbnum=4969\n
 A: version= 2.00\n

 P: /devices/pci0000:00/0000:00:14.0
 E: DRIVER=xhci_hcd
-E: ID_AUTOSUSPEND=1
 E: ID_MODEL_FROM_DATABASE=Alder Lake PCH USB 3.2 xHCI Host Controller
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
 E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
 E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
 E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
@@ -221,15 +214,10 @@ E: SUBSYSTEM=pci
 A: ari_enabled=0\n
 A: broken_parity_status=0\n
 A: class=0x0c0330\n
-H: config=8680ED51060490020130030C000080000400161D6000000000000000000000000000000000000000000000004D1470C8000000007000000000000000FF010000FD0134A089C27F8000000000000000003F6DD80F000000000000000000000000316000000000000000000000000000000180C2C10800000000000000000000000590B7001804E0FE000000000000000009B014F01000400100000000C10A080000080E00001800008F50020000010000090000018680C00009001014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B50F010112000000
+H: config=8680ED51060490020130030C000080000400161D6000000000000000000000000000000000000000000000004D1470C8000000007000000000000000FF010000FD0134A089C27F8000000000000000003F6DD80F000000000000000000000000316000000000000000000000000000000180C2C1080000000000000000000000059087007805E0FE000000000000000009B014F01000400100000000C10A080000080E00001800008F50020000010000090000018680C00009001014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B50F010112000000
 A: consistent_dma_mask_bits=64\n
 A: d3cold_allowed=1\n
 A: dbc=disabled\n
-A: dbc_bInterfaceProtocol=01\n
-A: dbc_bcdDevice=0010\n
-A: dbc_idProduct=0010\n
-A: dbc_idVendor=1d6b\n
-A: dbc_poll_interval_ms=64\n
 A: device=0x51ed\n
 A: dma_mask_bits=64\n
 L: driver=../../../bus/pci/drivers/xhci_hcd
@@ -239,39 +227,32 @@ L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:51
 A: index=7\n
 L: iommu=../../virtual/iommu/dmar1
 L: iommu_group=../../../kernel/iommu_groups/8
-A: irq=133\n
+A: irq=145\n
 A: label=Onboard - Other\n
 A: local_cpulist=0-15\n
 A: local_cpus=ffff\n
 A: modalias=pci:v00008086d000051EDsv0000144Dsd0000C870bc0Csc03i30\n
 A: msi_bus=1\n
-A: msi_irqs/133=msi\n
-A: msi_irqs/134=msi\n
-A: msi_irqs/135=msi\n
-A: msi_irqs/136=msi\n
-A: msi_irqs/137=msi\n
-A: msi_irqs/138=msi\n
-A: msi_irqs/139=msi\n
-A: msi_irqs/140=msi\n
+A: msi_irqs/145=msi\n
 A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts    6    7 2112  7\nxHCI ring segments   27   27 4096 27\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\n
+A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts    6    9 2112  9\nxHCI ring segments   26   34 4096 34\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0   32  128  1\nbuffer-32           0    0   32  0\n
 A: power/async=enabled\n
 A: power/control=auto\n
 A: power/runtime_active_kids=1\n
-A: power/runtime_active_time=2376480\n
+A: power/runtime_active_time=337964621\n
 A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
-A: power/runtime_suspended_time=94028360\n
+A: power/runtime_suspended_time=438\n
 A: power/runtime_usage=0\n
 A: power/wakeup=enabled\n
 A: power/wakeup_abort_count=0\n
 A: power/wakeup_active=0\n
-A: power/wakeup_active_count=1\n
+A: power/wakeup_active_count=7\n
 A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=1\n
-A: power/wakeup_last_time_ms=41666464\n
-A: power/wakeup_max_time_ms=101\n
-A: power/wakeup_total_time_ms=101\n
+A: power/wakeup_expire_count=7\n
+A: power/wakeup_last_time_ms=336554844\n
+A: power/wakeup_max_time_ms=105\n
+A: power/wakeup_total_time_ms=721\n
 A: power_state=D0\n
 A: resource=0x000000601d160000 0x000000601d16ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
 A: revision=0x01\n
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -0,0 +1,73 @@
+#!/usr/bin/python3
+
+import traceback
+import sys
+import gi
+
+gi.require_version('FPrint', '2.0')
+from gi.repository import FPrint, GLib
+
+sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
+
+ctx = GLib.main_context_default()
+
+c = FPrint.Context()
+c.enumerate()
+devices = c.get_devices()
+
+d = next((dev for dev in devices if dev.get_driver() == "focaltech_moc"), None)
+
+if d is None:
+    print("Error: Focaltech driver not loaded for any discovered device.")
+    sys.exit(1)
+
+del devices
+
+d.open_sync()
+assert d.get_driver() == "focaltech_moc"
+assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
+assert not d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
+
+
+print("Clearing storage (0xAC)...")
+d.clear_storage_sync()
+
+template = FPrint.Print.new(d)
+
+def enroll_progress(*args):
+    print('Enroll progress: ' + str(args))
+
+print("Enrolling (Perform 12 taps now)...")
+p = d.enroll_sync(template, None, enroll_progress, None)
+print("Enroll done.")
+
+print("Listing prints...")
+stored = d.list_prints_sync()
+assert len(stored) == 1
+assert stored[0].equal(p)
+print("List verified.")
+
+print("Verifying...")
+verify_res, verify_print = d.verify_sync(p)
+assert verify_res == True
+print("Verify done.")
+
+print("Delete is a no-op here")
+d.delete_print_sync(p)
+
+print('Identifying...')
+match, identify_print = d.identify_sync(stored, None, None, None)
+
+print('Identification SUCCESS')
+assert match.equal(identify_print)
+assert match.equal(p)
+
+print("Clearing storage...")
+d.clear_storage_sync()
+
+final_list = d.list_prints_sync()
+assert len(final_list) == 0
+print("Cleanup verified.")
+
+d.close_sync()
@@ -0,0 +1,267 @@
+P: /devices/pci0000:00/0000:00:14.0/usb3/3-2
+N: bus/usb/003/002=12010102000000400828536501210301020109022000010104A0FA0904000002DCA0B0000705010240000007058202400000
+E: BUSNUM=003
+E: CURRENT_TAGS=:seat:
+E: DEVNAME=/dev/bus/usb/003/002
+E: DEVNUM=002
+E: DEVTYPE=usb_device
+E: DRIVER=usb
+E: ID_AUTOSUSPEND=1
+E: ID_BUS=usb
+E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_2
+E: ID_MODEL=Focaltech_FT9365_ESS
+E: ID_MODEL_ENC=Focaltech\x20FT9365\x20ESS
+E: ID_MODEL_ID=6553
+E: ID_PATH=pci-0000:00:14.0-usb-0:2
+E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_2
+E: ID_PATH_WITH_USB_REVISION=pci-0000:00:14.0-usbv2-0:2
+E: ID_PERSIST=0
+E: ID_REVISION=2101
+E: ID_SERIAL=Generic_Focaltech_FT9365_ESS_201801010001
+E: ID_SERIAL_SHORT=201801010001
+E: ID_USB_INTERFACES=:dca0b0:
+E: ID_USB_MODEL=Focaltech_FT9365_ESS
+E: ID_USB_MODEL_ENC=Focaltech\x20FT9365\x20ESS
+E: ID_USB_MODEL_ID=6553
+E: ID_USB_REVISION=2101
+E: ID_USB_SERIAL=Generic_Focaltech_FT9365_ESS_201801010001
+E: ID_USB_SERIAL_SHORT=201801010001
+E: ID_USB_VENDOR=Generic
+E: ID_USB_VENDOR_ENC=Generic
+E: ID_USB_VENDOR_ID=2808
+E: ID_VENDOR=Generic
+E: ID_VENDOR_ENC=Generic
+E: ID_VENDOR_ID=2808
+E: MAJOR=189
+E: MINOR=257
+E: PRODUCT=2808/6553/2101
+E: SUBSYSTEM=usb
+E: TAGS=:seat:
+E: TYPE=0/0/0
+A: authorized=1\n
+A: avoid_reset_quirk=0\n
+A: bConfigurationValue=1\n
+A: bDeviceClass=00\n
+A: bDeviceProtocol=00\n
+A: bDeviceSubClass=00\n
+A: bMaxPacketSize0=64\n
+A: bMaxPower=500mA\n
+A: bNumConfigurations=1\n
+A: bNumInterfaces= 1\n
+A: bcdDevice=2101\n
+A: bmAttributes=a0\n
+H: bos_descriptors=050F2900021C100500DF60DDD88945C74C9CD2659D9E648A9F000003066E0315000810110103000000
+A: busnum=3\n
+A: configuration=Focaltech FT9365 ESS\n
+H: descriptors=12010102000000400828536501210301020109022000010104A0FA0904000002DCA0B0000705010240000007058202400000
+A: dev=189:257\n
+A: devnum=2\n
+A: devpath=2\n
+L: driver=../../../../../bus/usb/drivers/usb
+L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:56/device:57/device:59
+A: idProduct=6553\n
+A: idVendor=2808\n
+A: ltm_capable=no\n
+A: manufacturer=Generic\n
+A: maxchild=0\n
+A: physical_location/dock=no\n
+A: physical_location/horizontal_position=left\n
+A: physical_location/lid=no\n
+A: physical_location/panel=top\n
+A: physical_location/vertical_position=upper\n
+L: port=../3-0:1.0/usb3-port2
+A: power/active_duration=886464\n
+A: power/autosuspend=2\n
+A: power/autosuspend_delay_ms=2000\n
+A: power/connected_duration=15109711\n
+A: power/control=auto\n
+A: power/level=auto\n
+A: power/persist=0\n
+A: power/runtime_active_time=894614\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=14214859\n
+A: power/wakeup=disabled\n
+A: power/wakeup_abort_count=\n
+A: power/wakeup_active=\n
+A: power/wakeup_active_count=\n
+A: power/wakeup_count=\n
+A: power/wakeup_expire_count=\n
+A: power/wakeup_last_time_ms=\n
+A: power/wakeup_max_time_ms=\n
+A: power/wakeup_total_time_ms=\n
+A: product=Focaltech FT9365 ESS\n
+A: quirks=0x0\n
+A: removable=fixed\n
+A: rx_lanes=1\n
+A: serial=201801010001\n
+A: speed=12\n
+A: tx_lanes=1\n
+A: urbnum=12224\n
+A: version= 2.01\n
+
+P: /devices/pci0000:00/0000:00:14.0/usb3
+N: bus/usb/003/001=12010002090001406B1D020018060302010109021900010100E0000904000001090000000705810304000C
+E: BUSNUM=003
+E: CURRENT_TAGS=:seat:
+E: DEVNAME=/dev/bus/usb/003/001
+E: DEVNUM=001
+E: DEVTYPE=usb_device
+E: DRIVER=usb
+E: ID_AUTOSUSPEND=1
+E: ID_BUS=usb
+E: ID_FOR_SEAT=usb-pci-0000_00_14_0
+E: ID_MODEL=xHCI_Host_Controller
+E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
+E: ID_MODEL_FROM_DATABASE=2.0 root hub
+E: ID_MODEL_ID=0002
+E: ID_PATH=pci-0000:00:14.0
+E: ID_PATH_TAG=pci-0000_00_14_0
+E: ID_REVISION=0618
+E: ID_SERIAL=Linux_6.18.9-arch1-2_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_SERIAL_SHORT=0000:00:14.0
+E: ID_USB_INTERFACES=:090000:
+E: ID_USB_MODEL=xHCI_Host_Controller
+E: ID_USB_MODEL_ENC=xHCI\x20Host\x20Controller
+E: ID_USB_MODEL_ID=0002
+E: ID_USB_REVISION=0618
+E: ID_USB_SERIAL=Linux_6.18.9-arch1-2_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_USB_SERIAL_SHORT=0000:00:14.0
+E: ID_USB_VENDOR=Linux_6.18.9-arch1-2_xhci-hcd
+E: ID_USB_VENDOR_ENC=Linux\x206.18.9-arch1-2\x20xhci-hcd
+E: ID_USB_VENDOR_ID=1d6b
+E: ID_VENDOR=Linux_6.18.9-arch1-2_xhci-hcd
+E: ID_VENDOR_ENC=Linux\x206.18.9-arch1-2\x20xhci-hcd
+E: ID_VENDOR_FROM_DATABASE=Linux Foundation
+E: ID_VENDOR_ID=1d6b
+E: MAJOR=189
+E: MINOR=256
+E: PRODUCT=1d6b/2/618
+E: SUBSYSTEM=usb
+E: TAGS=:seat:
+E: TYPE=9/0/1
+A: authorized=1\n
+A: authorized_default=1\n
+A: avoid_reset_quirk=0\n
+A: bConfigurationValue=1\n
+A: bDeviceClass=09\n
+A: bDeviceProtocol=01\n
+A: bDeviceSubClass=00\n
+A: bMaxPacketSize0=64\n
+A: bMaxPower=0mA\n
+A: bNumConfigurations=1\n
+A: bNumInterfaces= 1\n
+A: bcdDevice=0618\n
+A: bmAttributes=e0\n
+A: busnum=3\n
+A: configuration=
+H: descriptors=12010002090001406B1D020018060302010109021900010100E0000904000001090000000705810304000C
+A: dev=189:256\n
+A: devnum=1\n
+A: devpath=0\n
+L: driver=../../../../bus/usb/drivers/usb
+L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:56/device:57
+A: idProduct=0002\n
+A: idVendor=1d6b\n
+A: interface_authorized_default=1\n
+A: ltm_capable=no\n
+A: manufacturer=Linux 6.18.9-arch1-2 xhci-hcd\n
+A: maxchild=12\n
+A: power/active_duration=7247968\n
+A: power/autosuspend=0\n
+A: power/autosuspend_delay_ms=0\n
+A: power/connected_duration=15109854\n
+A: power/control=auto\n
+A: power/level=auto\n
+A: power/runtime_active_time=7247962\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=7861889\n
+A: power/wakeup=disabled\n
+A: power/wakeup_abort_count=\n
+A: power/wakeup_active=\n
+A: power/wakeup_active_count=\n
+A: power/wakeup_count=\n
+A: power/wakeup_expire_count=\n
+A: power/wakeup_last_time_ms=\n
+A: power/wakeup_max_time_ms=\n
+A: power/wakeup_total_time_ms=\n
+A: product=xHCI Host Controller\n
+A: quirks=0x0\n
+A: removable=unknown\n
+A: rx_lanes=1\n
+A: serial=0000:00:14.0\n
+A: speed=480\n
+A: tx_lanes=1\n
+A: urbnum=1929\n
+A: version= 2.00\n
+
+P: /devices/pci0000:00/0000:00:14.0
+E: DRIVER=xhci_hcd
+E: ID_AUTOSUSPEND=1
+E: ID_MODEL_FROM_DATABASE=Alder Lake PCH USB 3.2 xHCI Host Controller
+E: ID_PATH=pci-0000:00:14.0
+E: ID_PATH_TAG=pci-0000_00_14_0
+E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
+E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
+E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
+E: ID_VENDOR_FROM_DATABASE=Intel Corporation
+E: MODALIAS=pci:v00008086d000051EDsv0000144Dsd0000C1D9bc0Csc03i30
+E: PCI_CLASS=C0330
+E: PCI_ID=8086:51ED
+E: PCI_SLOT_NAME=0000:00:14.0
+E: PCI_SUBSYS_ID=144D:C1D9
+E: SUBSYSTEM=pci
+A: ari_enabled=0\n
+A: broken_parity_status=0\n
+A: class=0x0c0330\n
+H: config=8680ED51060490020130030C00008000040012016000000000000000000000000000000000000000000000004D14D9C1000000007000000000000000FF010000FD0134A089C27F8000000000000000003F6DD80F000000000000000000000000316000000000000000000000000000000180C2C10800000000000000000000000590B7001804E0FE000000000000000009B014F01000400100000000C10A080000080E00001800008F50020000010000090000018680C00009001014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B50F110112000000
+A: consistent_dma_mask_bits=64\n
+A: d3cold_allowed=1\n
+A: dbc=disabled\n
+A: dbc_bInterfaceProtocol=01\n
+A: dbc_bcdDevice=0010\n
+A: dbc_idProduct=0010\n
+A: dbc_idVendor=1d6b\n
+A: dbc_poll_interval_ms=64\n
+A: device=0x51ed\n
+A: dma_mask_bits=64\n
+L: driver=../../../bus/pci/drivers/xhci_hcd
+A: driver_override=(null)\n
+A: enable=1\n
+L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:56
+A: index=5\n
+A: irq=131\n
+A: label=Onboard - Other\n
+A: local_cpulist=0-11\n
+A: local_cpus=fff\n
+A: modalias=pci:v00008086d000051EDsv0000144Dsd0000C1D9bc0Csc03i30\n
+A: msi_bus=1\n
+A: msi_irqs/131=msi\n
+A: msi_irqs/132=msi\n
+A: msi_irqs/133=msi\n
+A: msi_irqs/134=msi\n
+A: msi_irqs/135=msi\n
+A: msi_irqs/136=msi\n
+A: msi_irqs/137=msi\n
+A: msi_irqs/138=msi\n
+A: numa_node=-1\n
+A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 256 port bw ctx arrays    0    0  256  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts    8    9 2112  9\nxHCI ring segments   33   33 4096 33\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\n
+A: power/control=auto\n
+A: power/runtime_active_time=7261537\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=7861354\n
+A: power/wakeup=enabled\n
+A: power/wakeup_abort_count=0\n
+A: power/wakeup_active=0\n
+A: power/wakeup_active_count=0\n
+A: power/wakeup_count=0\n
+A: power/wakeup_expire_count=0\n
+A: power/wakeup_last_time_ms=0\n
+A: power/wakeup_max_time_ms=0\n
+A: power/wakeup_total_time_ms=0\n
+A: power_state=D0\n
+A: resource=0x0000006001120000 0x000000600112ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
+A: revision=0x01\n
+A: subsystem_device=0xc1d9\n
+A: subsystem_vendor=0x144d\n
+A: vendor=0x8086\n
+
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -27,10 +27,14 @@ assert not d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
 assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
-assert not d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)

 d.open_sync()

+print("Clear")
+d.clear_storage_sync()
+print("Clear done")
+
 template = FPrint.Print.new(d)

 def enroll_progress(*args):
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -0,0 +1,96 @@
+#!/usr/bin/python3
+
+import traceback
+import sys
+import gi
+
+gi.require_version('FPrint', '2.0')
+from gi.repository import FPrint, GLib
+
+# Exit with error on any exception, included those happening in async callbacks
+sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
+
+ctx = GLib.main_context_default()
+
+c = FPrint.Context()
+c.enumerate()
+devices = c.get_devices()
+
+d = devices[0]
+del devices
+
+assert d.get_driver() == "mafpmoc"
+assert not d.has_feature(FPrint.DeviceFeature.CAPTURE)
+assert d.has_feature(FPrint.DeviceFeature.IDENTIFY)
+assert d.has_feature(FPrint.DeviceFeature.VERIFY)
+assert not d.has_feature(FPrint.DeviceFeature.DUPLICATES_CHECK)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE_LIST)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE_DELETE)
+assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
+
+d.open_sync()
+
+d.clear_storage_sync()
+
+template = FPrint.Print.new(d)
+
+def enroll_progress(*args):
+    assert d.get_finger_status() == FPrint.FingerStatusFlags.NEEDED
+    print('enroll progress: ' + str(args))
+
+def identify_done(dev, res):
+    global identified, identify_match
+
+    identified = True
+    identify_match, identify_print = dev.identify_finish(res)
+    print('indentification_done. match:', identify_match.get_description(),
+          'print:', identify_print.get_description())
+    assert identify_match.equal(identify_print)
+
+# List, enroll, list, verify, identify, delete
+print("enrolling")
+assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
+enrolled = d.enroll_sync(template, None, enroll_progress, None)
+assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
+print("enroll done")
+
+print("listing")
+stored = d.list_prints_sync()
+print("listing done")
+assert len(stored) == 1
+assert stored[0].equal(enrolled)
+print("verifying")
+assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
+verify_res, verify_print = d.verify_sync(enrolled)
+assert d.get_finger_status() == FPrint.FingerStatusFlags.NONE
+print("verify done")
+assert verify_res == True
+
+identified = False
+deserialized_prints = []
+for p in stored:
+    deserialized_prints.append(FPrint.Print.deserialize(p.serialize()))
+    assert deserialized_prints[-1].equal(p)
+del stored
+
+print('async identifying')
+identify_match = None
+d.identify(deserialized_prints, callback=identify_done)
+del deserialized_prints
+
+while not identified:
+    ctx.iteration(True)
+
+assert identify_match.equal(enrolled)
+
+print("deleting")
+d.delete_print_sync(enrolled)
+print("delete done")
+
+del enrolled
+
+d.close_sync()
+
+del d
+del c
@@ -0,0 +1,375 @@
+P: /devices/pci0000:00/0000:00:11.0/0000:02:00.0/usb1/1-2/1-2.1
+N: bus/usb/001/013=12011001000000087432128000010102030109022700010100A0320904000003FF010100070583024000010705030240000107058203100001
+E: DEVNAME=/dev/bus/usb/001/013
+E: DEVTYPE=usb_device
+E: DRIVER=usb
+E: PRODUCT=3274/8012/100
+E: TYPE=0/0/0
+E: BUSNUM=001
+E: DEVNUM=013
+E: MAJOR=189
+E: MINOR=12
+E: SUBSYSTEM=usb
+E: ID_VENDOR=MicroarrayTechnology
+E: ID_VENDOR_ENC=MicroarrayTechnology
+E: ID_VENDOR_ID=3274
+E: ID_MODEL=MAFP_General_Device
+E: ID_MODEL_ENC=MAFP\x20General\x20Device\x20
+E: ID_MODEL_ID=8012
+E: ID_REVISION=0100
+E: ID_SERIAL=MicroarrayTechnology_MAFP_General_Device_1120031604020321
+E: ID_SERIAL_SHORT=1120031604020321
+E: ID_BUS=usb
+E: ID_USB_INTERFACES=:ff0101:
+E: ID_PATH=pci-0000:02:00.0-usb-0:2.1
+E: ID_PATH_TAG=pci-0000_02_00_0-usb-0_2_1
+E: ID_FOR_SEAT=usb-pci-0000_02_00_0-usb-0_2_1
+E: TAGS=:seat:
+E: CURRENT_TAGS=:seat:
+A: authorized=1\n
+A: avoid_reset_quirk=0\n
+A: bConfigurationValue=1\n
+A: bDeviceClass=00\n
+A: bDeviceProtocol=00\n
+A: bDeviceSubClass=00\n
+A: bMaxPacketSize0=8\n
+A: bMaxPower=100mA\n
+A: bNumConfigurations=1\n
+A: bNumInterfaces= 1\n
+A: bcdDevice=0100\n
+A: bmAttributes=a0\n
+A: busnum=1\n
+A: configuration=
+H: descriptors=12011001000000087432128000010102030109022700010100A0320904000003FF010100070583024000010705030240000107058203100001
+A: dev=189:12\n
+A: devnum=13\n
+A: devpath=2.1\n
+L: driver=../../../../../../../bus/usb/drivers/usb
+A: idProduct=8012\n
+A: idVendor=3274\n
+A: ltm_capable=no\n
+A: manufacturer=MicroarrayTechnology\n
+A: maxchild=0\n
+L: port=../1-2:1.0/1-2-port1
+A: power/active_duration=28368880\n
+A: power/async=enabled\n
+A: power/autosuspend=2\n
+A: power/autosuspend_delay_ms=2000\n
+A: power/connected_duration=28368880\n
+A: power/control=on\n
+A: power/level=on\n
+A: power/persist=1\n
+A: power/runtime_active_kids=0\n
+A: power/runtime_active_time=28368091\n
+A: power/runtime_enabled=forbidden\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=0\n
+A: power/runtime_usage=2\n
+A: power/wakeup=disabled\n
+A: power/wakeup_abort_count=\n
+A: power/wakeup_active=\n
+A: power/wakeup_active_count=\n
+A: power/wakeup_count=\n
+A: power/wakeup_expire_count=\n
+A: power/wakeup_last_time_ms=\n
+A: power/wakeup_max_time_ms=\n
+A: power/wakeup_total_time_ms=\n
+A: product=MAFP General Device \n
+A: quirks=0x0\n
+A: removable=unknown\n
+A: rx_lanes=1\n
+A: serial=1120031604020321\n
+A: speed=12\n
+A: tx_lanes=1\n
+A: urbnum=3289\n
+A: version= 1.10\n
+
+P: /devices/pci0000:00/0000:00:11.0/0000:02:00.0/usb1/1-2
+N: bus/usb/001/003=12011001090000080F0E020000010102000109021900010101E000090400000109000001070581030100FF
+E: DEVNAME=/dev/bus/usb/001/003
+E: DEVTYPE=usb_device
+E: DRIVER=usb
+E: PRODUCT=e0f/2/100
+E: TYPE=9/0/0
+E: BUSNUM=001
+E: DEVNUM=003
+E: MAJOR=189
+E: MINOR=2
+E: SUBSYSTEM=usb
+E: ID_VENDOR=VMware__Inc.
+E: ID_VENDOR_ENC=VMware\x2c\x20Inc.
+E: ID_VENDOR_ID=0e0f
+E: ID_MODEL=VMware_Virtual_USB_Hub
+E: ID_MODEL_ENC=VMware\x20Virtual\x20USB\x20Hub
+E: ID_MODEL_ID=0002
+E: ID_REVISION=0100
+E: ID_SERIAL=VMware__Inc._VMware_Virtual_USB_Hub
+E: ID_BUS=usb
+E: ID_USB_INTERFACES=:090000:
+E: ID_VENDOR_FROM_DATABASE=VMware, Inc.
+E: ID_MODEL_FROM_DATABASE=Virtual USB Hub
+E: ID_PATH=pci-0000:02:00.0-usb-0:2
+E: ID_PATH_TAG=pci-0000_02_00_0-usb-0_2
+E: ID_FOR_SEAT=usb-pci-0000_02_00_0-usb-0_2
+E: TAGS=:seat:
+E: CURRENT_TAGS=:seat:
+A: authorized=1\n
+A: avoid_reset_quirk=0\n
+A: bConfigurationValue=1\n
+A: bDeviceClass=09\n
+A: bDeviceProtocol=00\n
+A: bDeviceSubClass=00\n
+A: bMaxPacketSize0=8\n
+A: bMaxPower=0mA\n
+A: bNumConfigurations=1\n
+A: bNumInterfaces= 1\n
+A: bcdDevice=0100\n
+A: bmAttributes=e0\n
+A: busnum=1\n
+A: configuration=VMware, Inc.\n
+H: descriptors=12011001090000080F0E020000010102000109021900010101E000090400000109000001070581030100FF
+A: dev=189:2\n
+A: devnum=3\n
+A: devpath=2\n
+L: driver=../../../../../../bus/usb/drivers/usb
+A: idProduct=0002\n
+A: idVendor=0e0f\n
+A: ltm_capable=no\n
+A: manufacturer=VMware, Inc.\n
+A: maxchild=7\n
+L: port=../1-0:1.0/usb1-port2
+A: power/active_duration=68737416\n
+A: power/async=enabled\n
+A: power/autosuspend=0\n
+A: power/autosuspend_delay_ms=0\n
+A: power/connected_duration=352042384\n
+A: power/control=auto\n
+A: power/level=auto\n
+A: power/runtime_active_kids=1\n
+A: power/runtime_active_time=68737343\n
+A: power/runtime_enabled=enabled\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=283304757\n
+A: power/runtime_usage=0\n
+A: power/wakeup=disabled\n
+A: power/wakeup_abort_count=\n
+A: power/wakeup_active=\n
+A: power/wakeup_active_count=\n
+A: power/wakeup_count=\n
+A: power/wakeup_expire_count=\n
+A: power/wakeup_last_time_ms=\n
+A: power/wakeup_max_time_ms=\n
+A: power/wakeup_total_time_ms=\n
+A: product=VMware Virtual USB Hub\n
+A: quirks=0x0\n
+A: removable=unknown\n
+A: rx_lanes=1\n
+A: speed=12\n
+A: tx_lanes=1\n
+A: urbnum=2459\n
+A: version= 1.10\n
+
+P: /devices/pci0000:00/0000:00:11.0/0000:02:00.0/usb1
+N: bus/usb/001/001=12011001090000406B1D010005060302010109021900010100E000090400000109000000070581030200FF
+E: DEVNAME=/dev/bus/usb/001/001
+E: DEVTYPE=usb_device
+E: DRIVER=usb
+E: PRODUCT=1d6b/1/605
+E: TYPE=9/0/0
+E: BUSNUM=001
+E: DEVNUM=001
+E: MAJOR=189
+E: MINOR=0
+E: SUBSYSTEM=usb
+E: ID_VENDOR=Linux_6.5.0-27-generic_uhci_hcd
+E: ID_VENDOR_ENC=Linux\x206.5.0-27-generic\x20uhci_hcd
+E: ID_VENDOR_ID=1d6b
+E: ID_MODEL=UHCI_Host_Controller
+E: ID_MODEL_ENC=UHCI\x20Host\x20Controller
+E: ID_MODEL_ID=0001
+E: ID_REVISION=0605
+E: ID_SERIAL=Linux_6.5.0-27-generic_uhci_hcd_UHCI_Host_Controller_0000:02:00.0
+E: ID_SERIAL_SHORT=0000:02:00.0
+E: ID_BUS=usb
+E: ID_USB_INTERFACES=:090000:
+E: ID_VENDOR_FROM_DATABASE=Linux Foundation
+E: ID_AUTOSUSPEND=1
+E: ID_MODEL_FROM_DATABASE=1.1 root hub
+E: ID_PATH=pci-0000:02:00.0
+E: ID_PATH_TAG=pci-0000_02_00_0
+E: ID_FOR_SEAT=usb-pci-0000_02_00_0
+E: TAGS=:seat:
+E: CURRENT_TAGS=:seat:
+A: authorized=1\n
+A: authorized_default=1\n
+A: avoid_reset_quirk=0\n
+A: bConfigurationValue=1\n
+A: bDeviceClass=09\n
+A: bDeviceProtocol=00\n
+A: bDeviceSubClass=00\n
+A: bMaxPacketSize0=64\n
+A: bMaxPower=0mA\n
+A: bNumConfigurations=1\n
+A: bNumInterfaces= 1\n
+A: bcdDevice=0605\n
+A: bmAttributes=e0\n
+A: busnum=1\n
+A: configuration=
+H: descriptors=12011001090000406B1D010005060302010109021900010100E000090400000109000000070581030200FF
+A: dev=189:0\n
+A: devnum=1\n
+A: devpath=0\n
+L: driver=../../../../../bus/usb/drivers/usb
+A: idProduct=0001\n
+A: idVendor=1d6b\n
+A: interface_authorized_default=1\n
+A: ltm_capable=no\n
+A: manufacturer=Linux 6.5.0-27-generic uhci_hcd\n
+A: maxchild=2\n
+A: power/active_duration=352042808\n
+A: power/async=enabled\n
+A: power/autosuspend=0\n
+A: power/autosuspend_delay_ms=0\n
+A: power/connected_duration=352042820\n
+A: power/control=auto\n
+A: power/level=auto\n
+A: power/runtime_active_kids=2\n
+A: power/runtime_active_time=352042818\n
+A: power/runtime_enabled=enabled\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=0\n
+A: power/runtime_usage=0\n
+A: power/wakeup=disabled\n
+A: power/wakeup_abort_count=\n
+A: power/wakeup_active=\n
+A: power/wakeup_active_count=\n
+A: power/wakeup_count=\n
+A: power/wakeup_expire_count=\n
+A: power/wakeup_last_time_ms=\n
+A: power/wakeup_max_time_ms=\n
+A: power/wakeup_total_time_ms=\n
+A: product=UHCI Host Controller\n
+A: quirks=0x0\n
+A: removable=unknown\n
+A: rx_lanes=1\n
+A: serial=0000:02:00.0\n
+A: speed=12\n
+A: tx_lanes=1\n
+A: urbnum=157\n
+A: version= 1.10\n
+
+P: /devices/pci0000:00/0000:00:11.0/0000:02:00.0
+E: DRIVER=uhci_hcd
+E: PCI_CLASS=C0300
+E: PCI_ID=15AD:0774
+E: PCI_SUBSYS_ID=15AD:1976
+E: PCI_SLOT_NAME=0000:02:00.0
+E: MODALIAS=pci:v000015ADd00000774sv000015ADsd00001976bc0Csc03i00
+E: SUBSYSTEM=pci
+E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
+E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
+E: ID_PCI_INTERFACE_FROM_DATABASE=UHCI
+E: ID_VENDOR_FROM_DATABASE=VMware
+E: ID_MODEL_FROM_DATABASE=USB1.1 UHCI Controller
+A: acpi_index=16777728\n
+A: ari_enabled=0\n
+A: broken_parity_status=0\n
+A: class=0x0c0300\n
+H: config=AD157407050090020000030C0040000000000000000000000000000000000000812000000000000000000000AD1576190000000040000000000000000A010000130006030000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+A: consistent_dma_mask_bits=32\n
+A: d3cold_allowed=0\n
+A: device=0x0774\n
+A: dma_mask_bits=32\n
+L: driver=../../../../bus/pci/drivers/uhci_hcd
+A: driver_override=(null)\n
+A: enable=1\n
+L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A03:00/device:05/device:06
+A: irq=18\n
+A: label=usb\n
+A: local_cpulist=0-1\n
+A: local_cpus=00000000,00000000,00000000,00000003\n
+A: modalias=pci:v000015ADd00000774sv000015ADsd00001976bc0Csc03i00\n
+A: msi_bus=1\n
+A: numa_node=-1\n
+A: pools=poolinfo - 0.1\nuhci_qh            18   32  128  1\nuhci_td            11  192   64  3\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          3   32  128  1\nbuffer-32           0    0   32  0\n
+A: power/async=enabled\n
+A: power/control=on\n
+A: power/runtime_active_kids=1\n
+A: power/runtime_active_time=352043941\n
+A: power/runtime_enabled=forbidden\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=0\n
+A: power/runtime_usage=2\n
+A: power/wakeup=enabled\n
+A: power/wakeup_abort_count=0\n
+A: power/wakeup_active=0\n
+A: power/wakeup_active_count=0\n
+A: power/wakeup_count=0\n
+A: power/wakeup_expire_count=0\n
+A: power/wakeup_last_time_ms=0\n
+A: power/wakeup_max_time_ms=0\n
+A: power/wakeup_total_time_ms=0\n
+A: power_state=D0\n
+A: reset_method=af_flr bus\n
+A: resource=0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000002080 0x000000000000209f 0x0000000000040101\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
+A: revision=0x00\n
+A: subsystem_device=0x1976\n
+A: subsystem_vendor=0x15ad\n
+A: vendor=0x15ad\n
+
+P: /devices/pci0000:00/0000:00:11.0
+E: PCI_CLASS=60401
+E: PCI_ID=15AD:0790
+E: PCI_SUBSYS_ID=15AD:0790
+E: PCI_SLOT_NAME=0000:00:11.0
+E: MODALIAS=pci:v000015ADd00000790sv000015ADsd00000790bc06sc04i01
+E: SUBSYSTEM=pci
+E: ID_PCI_CLASS_FROM_DATABASE=Bridge
+E: ID_PCI_SUBCLASS_FROM_DATABASE=PCI bridge
+E: ID_PCI_INTERFACE_FROM_DATABASE=Subtractive decode
+E: ID_VENDOR_FROM_DATABASE=VMware
+E: ID_MODEL_FROM_DATABASE=PCI bridge
+A: ari_enabled=0\n
+A: broken_parity_status=0\n
+A: class=0x060401\n
+H: config=AD1590070700900202010406084001000000000000000000000202442030800250FDF0FDB1E7F1E70000000000000000000000004000000000000000FF0006000D000000AD15900700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+A: consistent_dma_mask_bits=32\n
+A: d3cold_allowed=0\n
+A: device=0x0790\n
+A: dma_mask_bits=32\n
+A: driver_override=(null)\n
+A: enable=1\n
+L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A03:00/device:05
+A: irq=0\n
+A: local_cpulist=0-1\n
+A: local_cpus=00000000,00000000,00000000,00000003\n
+A: modalias=pci:v000015ADd00000790sv000015ADsd00000790bc06sc04i01\n
+A: msi_bus=1\n
+A: numa_node=-1\n
+A: power/async=enabled\n
+A: power/control=on\n
+A: power/runtime_active_kids=5\n
+A: power/runtime_active_time=352044194\n
+A: power/runtime_enabled=forbidden\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=0\n
+A: power/runtime_usage=1\n
+A: power/wakeup=disabled\n
+A: power/wakeup_abort_count=\n
+A: power/wakeup_active=\n
+A: power/wakeup_active_count=\n
+A: power/wakeup_count=\n
+A: power/wakeup_expire_count=\n
+A: power/wakeup_last_time_ms=\n
+A: power/wakeup_max_time_ms=\n
+A: power/wakeup_total_time_ms=\n
+A: power_state=D0\n
+A: resource=0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000002000 0x0000000000003fff 0x0000000000000100\n0x00000000fd500000 0x00000000fdffffff 0x0000000000000200\n0x00000000e7b00000 0x00000000e7ffffff 0x0000000000102201\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
+A: revision=0x02\n
+A: secondary_bus_number=2\n
+A: subordinate_bus_number=2\n
+A: subsystem_device=0x0790\n
+A: subsystem_vendor=0x15ad\n
+A: vendor=0x15ad\n
+A: waiting_for_supplier=0\n
+
@@ -10,16 +10,16 @@ envs.set('G_TEST_SRCDIR', meson.current_source_dir())
 envs.set('G_TEST_BUILDDIR', meson.current_build_dir())
 envs.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libfprint')

-# Set FP_DEVICE_EMULATION so that drivers can adapt (e.g. to use fixed
+# Set fp_device_emulation_env_var so that drivers can adapt (e.g. to use fixed
 # random numbers rather than proper ones)
-envs.set('FP_DEVICE_EMULATION', '1')
+fp_device_emulation_env_var = 'FP_DEVICE_EMULATION'
+envs.set(fp_device_emulation_env_var, '1')

 # Set a colon-separated list of native drivers we enable in tests
 envs.set('FP_DRIVERS_ALLOWLIST', ':'.join([
    'virtual_image',
    'virtual_device',
    'virtual_device_storage',
-    'virtual_sdcp',
 ]))

 envs.set('FP_PRINTS_PATH', meson.project_source_root() / 'examples' / 'prints')
@@ -33,34 +33,38 @@ installed_tests_execdir = libexecdir / 'installed-tests' / versioned_libname
 installed_tests_testdir = datadir / 'installed-tests' / versioned_libname
 installed_tests_libdir = libdir

-drivers_tests = [
-    'aes2501',
-    'aes3500',
-    'elan',
-    'elan-cobo',
-    'elanmoc',
-    'elanspi',
-    'synaptics',
-    'upektc_img',
-    'upektc_img-tcs1s',
-    'uru4000-msv2',
-    'uru4000-4500',
-    'vfs0050',
-    'vfs301',
-    'vfs5011',
-    'vfs7552',
-    'goodixmoc',
-    'nb1010',
-    'egis0570',
-    'egismoc',
-#    'egismoc-05a1', # commented out until new capture with SDCP support can be provided
-#    'egismoc-0586', # commented out until new capture with SDCP support can be provided
-#    'egismoc-0587', # commented out until new capture with SDCP support can be provided
-    'fpcmoc',
-	'realtek',
-	'realtek-5816',
-    'focaltech_moc',
-]
+drivers_tests = {
+    'aes2501': {},
+    'aes3500': {},
+    'elan': {},
+    'elan-cobo': {},
+    'elanmoc': {},
+    'elanspi': {},
+    'synaptics': {},
+    'upektc_img': {},
+    'upektc_img-tcs1s': {},
+    'uru4000-msv2': {},
+    'uru4000-4500': {},
+    'vfs0050': {},
+    'vfs301': {},
+    'vfs5011': {},
+    'vfs7552': {},
+    'goodixmoc': {},
+    'nb1010': {},
+    'egis0570': {},
+    'egismoc': {},
+    'egis_etu905': {},
+    'egismoc-05a1': {},
+    'egismoc-0586': {},
+    'egismoc-0587': {},
+    'fpcmoc': {},
+	'realtek': {},
+	'realtek-5816': {},
+    'focaltech_moc': { 'timeout': 30 },
+    'focaltech_moc-6553': {},
+    'mafpmoc': {},
+    'secugen': {},
+}

 if get_option('introspection')
  conf = configuration_data()
@@ -71,6 +75,25 @@ if get_option('introspection')
      output: 'create-driver-test.py')
 endif

+test_emulation_lib = shared_library('fprint-test-emulation',
+    'test-emulation.c',
+    dependencies: libfprint_private_dep,
+    install: installed_tests,
+    install_dir: installed_tests_execdir,
+)
+
+# Paths where the test-emulation helper may be loaded via dlopen
+test_emulation = configuration_data()
+test_emulation.set_quoted('FPI_EMULATION_ENV_VAR',
+  fp_device_emulation_env_var)
+test_emulation.set_quoted('FPI_EMULATION_HELPER_BUILDDIR',
+  meson.project_build_root() / 'tests')
+test_emulation.set_quoted('FPI_EMULATION_HELPER_INSTALLDIR',
+  libexecdir / 'installed-tests' / versioned_libname)
+test_emulation.set_quoted('FPI_EMULATION_HELPER_MODULE',
+  fs.name(test_emulation_lib.full_path()))
+configure_file(output: 'fpi-test-emulation.h', configuration: test_emulation)
+
 env_parser_cmd = '''
 import os;
 print(" ".join([f"{k}={v}" for k, v in os.environ.items()
@@ -92,7 +115,6 @@ if get_option('introspection')
    virtual_devices_tests = [
        'virtual-image',
        'virtual-device',
-        'virtual-sdcp',
    ]

    unittest_inspector = find_program('unittest_inspector.py')
@@ -131,9 +153,11 @@ if get_option('introspection')
                    python3,
                    args: ut_args,
                    suite: ut_suite,
-                    depends: libfprint_typelib,
+                    depends: [
+                        libfprint_typelib,
+                        test_emulation_lib,
+                    ],
                    env: envs,
-                    workdir: meson.current_source_dir(),
                )
            endforeach

@@ -169,7 +193,7 @@ if get_option('introspection')
    endforeach

    driver_tests_enabled = false
-    foreach driver_test: drivers_tests
+    foreach driver_test, args: drivers_tests
        driver_name = driver_test.split('-')[0]
        driver_envs = envs
        driver_envs.set('FP_DRIVERS_ALLOWLIST', driver_name)
@@ -184,10 +208,12 @@ if get_option('introspection')
                    meson.current_source_dir() / driver_test,
                ],
                env: driver_envs,
-                workdir: meson.current_source_dir(),
                suite: ['drivers'],
-                timeout: 15,
-                depends: libfprint_typelib,
+                timeout: args.get('timeout', 15),
+                depends: [
+                    libfprint_typelib,
+                    test_emulation_lib,
+                ],
            )

            if installed_tests
@@ -248,10 +274,13 @@ else
    endforeach
 endif

-test_util_sources = [
-    'test-utils.c',
-    'test-device-fake.c',
-]
+test_utils = static_library('fprint-test-utils',
+    sources: [
+        'test-utils.c',
+        'test-device-fake.c',
+    ],
+    dependencies: libfprint_private_dep,
+    install: false)

 unit_tests = [
    'fpi-device',
@@ -266,17 +295,6 @@ if 'virtual_image' in drivers
    ]
 endif

-if 'sdcp' in driver_helpers
-    unit_tests += [
-        'fpi-sdcp',
-    ]
-endif
-
-test_utils = static_library('fprint-test-utils',
-    sources: test_util_sources,
-    dependencies: libfprint_private_dep,
-    install: false)
-
 unit_tests_deps = { 'fpi-assembling' : [cairo_dep] }

 foreach test_name: unit_tests
@@ -334,14 +352,16 @@ foreach test_name: unit_tests
 endforeach

 # Run udev rule generator with fatal warnings
-envs.set('UDEV_HWDB', udev_hwdb.full_path())
-envs.set('UDEV_HWDB_CHECK_CONTENTS', default_drivers_are_enabled ? '1' : '0')
-envs.set('G_MESSAGES_DEBUG', '')
+hwdb_envs = envs
+hwdb_envs.set('UDEV_HWDB', udev_hwdb.full_path())
+hwdb_envs.set('UDEV_HWDB_CHECK_CONTENTS', default_drivers_are_enabled ? '1' : '0')
+hwdb_envs.set('G_MESSAGES_DEBUG', '')
 test('udev-hwdb',
     find_program('test-generated-hwdb.sh'),
     depends: udev_hwdb,
     suite: ['data', 'no-valgrind'],
-     env: envs)
+     env: hwdb_envs,
+)

 appstreamcli = find_program('appstreamcli', required: false)
 if appstreamcli.found()
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import traceback
 import sys
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 import os
 import gi
@@ -1,6 +1,5 @@
 /*
- * FpSdcpDevice - A base class for SDCP enabled devices
- * Copyright (C) 2020 Benjamin Berg <bberg@redhat.com>
+ * Copyright (C) 2026 Canonical, Ltd.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -17,13 +16,18 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#pragma once
+#include "fpi-device.h"
+#include "fpi-test-emulation.h"

-#include <fp-device.h>
+gboolean
+  (fpi_device_emulation_mode_enabled) (FpDevice *device)
+{
+  static gsize emulation_mode = 0;

-G_BEGIN_DECLS
+  if (g_once_init_enter (&emulation_mode))
+    g_once_init_leave (&emulation_mode,
+                       g_strcmp0 (g_getenv (FPI_EMULATION_ENV_VAR), "1") == 0 ?
+                       TRUE : G_MAXSIZE);

-#define FP_TYPE_SDCP_DEVICE (fp_sdcp_device_get_type ())
-G_DECLARE_DERIVABLE_TYPE (FpSdcpDevice, fp_sdcp_device, FP, SDCP_DEVICE, FpDevice)
-
-G_END_DECLS
+  return emulation_mode == TRUE;
+}
@@ -1,210 +0,0 @@
-/*
- * Secure Device Connection Protocol (SDCP) support unit tests
- * Copyright (C) 2025 Joshua Grisham <josh@joshuagrisham.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 "test_fpi_sdcp"
-#include "fpi-log.h"
-
-#include "fpi-sdcp.h"
-#include "fpi-sdcp-device.h"
-
-/* We can re-use the test payloads from virtual-sdcp */
-#include "drivers/virtual-sdcp.h"
-
-/******************************************************************************/
-
-static const guint8 from_hex_map[] = {
-  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,   // 01234567
-  0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   // 89:;<=>?
-  0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,         // @abcdef
-};
-
-static GBytes *
-g_bytes_from_hex (const gchar *hex)
-{
-  g_autoptr(GBytes) res = NULL;
-  guint8 b0, b1;
-  gsize bytes_len = strlen (hex) / 2;
-  guint8 *bytes = g_malloc0 (bytes_len);
-
-  for (int i = 0; i < strlen (hex) - 1; i += 2)
-    {
-      b0 = ((guint8) hex[i + 0] & 0x1F) ^ 0x10;
-      b1 = ((guint8) hex[i + 1] & 0x1F) ^ 0x10;
-      bytes[i / 2] = (guint8) (from_hex_map[b0] << 4) | from_hex_map[b1];
-    }
-
-  res = g_bytes_new_take (bytes, bytes_len);
-
-  return g_steal_pointer (&res);
-}
-
-static FpiSdcpClaim *
-get_fake_sdcp_claim (void)
-{
-  FpiSdcpClaim *claim = g_new0 (FpiSdcpClaim, 1);
-
-  claim->model_certificate = g_bytes_from_hex (model_certificate_hex);
-  claim->device_public_key = g_bytes_from_hex (device_public_key_hex);
-  claim->firmware_public_key = g_bytes_from_hex (firmware_public_key_hex);
-  claim->firmware_hash = g_bytes_from_hex (firmware_hash_hex);
-  claim->model_signature = g_bytes_from_hex (model_signature_hex);
-  claim->device_signature = g_bytes_from_hex (device_signature_hex);
-  return g_steal_pointer (&claim);
-}
-
-/******************************************************************************/
-
-static void
-test_generate_enrollment_id (void)
-{
-  g_autoptr(GBytes) id = NULL;
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GBytes) application_secret = g_bytes_from_hex (application_secret_hex);
-  g_autoptr(GBytes) nonce = g_bytes_from_hex (enrollment_nonce_hex);
-  g_autoptr(GBytes) expected_id = g_bytes_from_hex (enrollment_id_hex);
-
-  id = fpi_sdcp_generate_enrollment_id (application_secret, nonce, &error);
-
-  fp_dbg ("id:");
-  fp_dbg_hex_dump_gbytes (id);
-
-  fp_dbg ("expected:");
-  fp_dbg_hex_dump_gbytes (expected_id);
-
-  g_assert (g_bytes_equal (expected_id, id));
-  g_assert_null (error);
-}
-
-static void
-test_verify_identify (void)
-{
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GBytes) application_secret = g_bytes_from_hex (application_secret_hex);
-  g_autoptr(GBytes) nonce = g_bytes_from_hex (identify_nonce_hex);
-  g_autoptr(GBytes) id = g_bytes_from_hex (enrollment_id_hex);
-  g_autoptr(GBytes) mac = g_bytes_from_hex (identify_mac_hex);
-
-  g_assert_true (fpi_sdcp_verify_identify (application_secret, nonce, id, mac, &error));
-  g_assert_null (error);
-}
-
-static void
-test_verify_reconnect (void)
-{
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GBytes) application_secret = g_bytes_from_hex (application_secret_hex);
-  g_autoptr(GBytes) random = g_bytes_from_hex (reconnect_random_hex);
-  g_autoptr(GBytes) mac = g_bytes_from_hex (reconnect_mac_hex);
-
-  g_assert_true (fpi_sdcp_verify_reconnect (application_secret, random, mac, &error));
-  g_assert_null (error);
-}
-
-static void
-test_verify_connect (void)
-{
-  g_autoptr(GBytes) application_secret = NULL;
-  g_autoptr(GError) error = NULL;
-
-  g_autoptr(GBytes) host_private_key = g_bytes_from_hex (host_private_key_hex);
-  g_autoptr(GBytes) host_random = g_bytes_from_hex (host_random_hex);
-  g_autoptr(GBytes) device_random = g_bytes_from_hex (device_random_hex);
-  g_autoptr(GBytes) connect_mac = g_bytes_from_hex (connect_mac_hex);
-  FpiSdcpClaim *claim = get_fake_sdcp_claim ();
-
-  g_autoptr(GBytes) expected_application_secret = g_bytes_from_hex (application_secret_hex);
-
-  g_assert_true (fpi_sdcp_verify_connect (host_private_key,
-                                          host_random,
-                                          device_random,
-                                          claim,
-                                          connect_mac,
-                                          TRUE,
-                                          TRUE,
-                                          &application_secret,
-                                          &error));
-
-  g_assert_null (error);
-  g_assert (g_bytes_get_size (application_secret) == SDCP_APPLICATION_SECRET_SIZE);
-
-  fp_dbg ("application_secret:");
-  fp_dbg_hex_dump_gbytes (application_secret);
-
-  fp_dbg ("expected:");
-  fp_dbg_hex_dump_gbytes (expected_application_secret);
-
-  g_assert_true (g_bytes_equal (expected_application_secret, application_secret));
-
-  fpi_sdcp_claim_free (claim);
-}
-
-static void
-test_generate_random (void)
-{
-  g_autoptr(GBytes) random = NULL;
-  g_autoptr(GError) error = NULL;
-
-  random = fpi_sdcp_generate_random (&error);
-
-  g_assert_null (error);
-  g_assert (g_bytes_get_size (random) == SDCP_RANDOM_SIZE);
-
-  fp_dbg ("random:");
-  fp_dbg_hex_dump_gbytes (random);
-}
-
-static void
-test_generate_host_key (void)
-{
-  g_autoptr(GBytes) private_key = NULL;
-  g_autoptr(GBytes) public_key = NULL;
-  g_autoptr(GError) error = NULL;
-  gsize len = 0;
-
-  fpi_sdcp_generate_host_key (&private_key, &public_key, &error);
-
-  g_assert_null (error);
-
-  g_bytes_get_data (private_key, &len);
-  g_assert (len == 32);
-
-  fp_dbg ("private_key:");
-  fp_dbg_hex_dump_gbytes (private_key);
-
-  g_bytes_get_data (public_key, &len);
-  g_assert (len == SDCP_PUBLIC_KEY_SIZE);
-
-  fp_dbg ("public_key:");
-  fp_dbg_hex_dump_gbytes (public_key);
-}
-
-int
-main (int argc, char *argv[])
-{
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/sdcp/generate_host_key", test_generate_host_key);
-  g_test_add_func ("/sdcp/generate_random", test_generate_random);
-  g_test_add_func ("/sdcp/verify_connect", test_verify_connect);
-  g_test_add_func ("/sdcp/verify_reconnect", test_verify_reconnect);
-  g_test_add_func ("/sdcp/verify_identify", test_verify_identify);
-  g_test_add_func ("/sdcp/generate_enrollment_id", test_generate_enrollment_id);
-
-  return g_test_run ();
-}
@@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#pragma once
+
 #include <glib.h>

 typedef enum {
@@ -123,13 +123,17 @@ class VirtualDeviceBase(unittest.TestCase):
            del self.ctx
        super().tearDown()

+    def sleep_multiplier(self):
+        return 5 if 'UNDER_VALGRIND' in os.environ else 1
+
    def wait_timeout(self, interval):
+        multiplier = self.sleep_multiplier()
        timeout_reached = False
        def on_timeout():
            nonlocal timeout_reached
            timeout_reached = True

-        GLib.timeout_add(interval, on_timeout)
+        GLib.timeout_add(interval * multiplier, on_timeout)
        while not timeout_reached:
            ctx.iteration(False)

@@ -183,8 +187,7 @@ class VirtualDeviceBase(unittest.TestCase):

    def send_sleep(self, interval):
        self.assertGreater(interval, 0)
-        multiplier = 5 if 'UNDER_VALGRIND' in os.environ else 1
-        self.send_command('SLEEP', interval * multiplier)
+        self.send_command('SLEEP', interval * self.sleep_multiplier())

    def enroll_print(self, nick, finger, username='testuser', retry_scan=-1):
        self._enrolled = None
@@ -1,172 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-try:
-    import gi
-    import os
-
-    from gi.repository import GLib
-
-    import unittest
-except Exception as e:
-    print("Missing dependencies: %s" % str(e))
-    sys.exit(77)
-
-FPrint = None
-
-# Only permit loading virtual_sdcp driver for tests in this file
-os.environ['FP_DRIVERS_WHITELIST'] = 'virtual_sdcp'
-
-if hasattr(os.environ, 'MESON_SOURCE_ROOT'):
-    root = os.environ['MESON_SOURCE_ROOT']
-else:
-    root = os.path.join(os.path.dirname(__file__), '..')
-
-ctx = GLib.main_context_default()
-
-class VirtualSDCPBase(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        os.environ['FP_VIRTUAL_SDCP'] = '1'
-
-        cls.ctx = FPrint.Context()
-
-        cls.dev = None
-        for dev in cls.ctx.get_devices():
-            cls.dev = dev
-            break
-
-        assert cls.dev is not None, "You need to compile with virtual_sdcp for testing"
-
-    @classmethod
-    def tearDownClass(cls):
-        del cls.dev
-        del cls.ctx
-
-    def setUp(self):
-        self.ctx = FPrint.Context()
-        self.assertIsNotNone(self.dev)
-        self.assertFalse(self.dev.is_open())
-        self.dev.open_sync()
-        self.assertTrue(self.dev.is_open())
-
-    def tearDown(self):
-        self.dev.close_sync()
-        self.assertFalse(self.dev.is_open())
-        del self.ctx
-
-class VirtualSDCP(VirtualSDCPBase):
-
-    def setUp(self):
-        os.environ.pop('FP_VIRTUAL_SDCP_NO_RECONNECT', None)
-        super().setUp()
-
-    def test_connect(self):
-        # Nothing to do here since setUp and tearDown will open and close the device
-        pass
-
-    def test_reconnect(self):
-        # Ensure device was opened once before, this may be a reconnect if
-        # it is the same process as another test.
-        self.dev.close_sync()
-
-        # Check that a reconnect happens on next open. To know about this, we
-        # need to parse check log messages for that.
-        success = [False]
-        def log_func(domain, level, msg):
-            print("log: '%s', '%s', '%s'" % (str(domain), str(level), msg))
-            if msg == 'SDCP Reconnect succeeded':
-                success[0] = True
-
-            # Call default handler
-            GLib.log_default_handler(domain, level, msg)
-
-        handler_id = GLib.log_set_handler('libfprint-sdcp_device', GLib.LogLevelFlags.LEVEL_DEBUG, log_func)
-        self.dev.open_sync()
-        GLib.log_remove_handler('libfprint-sdcp_device', handler_id)
-        assert success[0]
-
-    def test_list(self):
-        prints = self.dev.list_prints_sync()
-        assert len(prints) >= 0
-
-    def test_enroll_list_verify(self):
-        # Set up a new print
-        template = FPrint.Print.new(self.dev)
-        template.set_finger(FPrint.Finger.LEFT_THUMB)
-
-        # Enroll the new print
-        new_print = self.dev.enroll_sync(template, None, None, None)
-        self.assertIsInstance(new_print, FPrint.Print)
-
-        # Get the print list again and ensure there is exactly 1 print
-        prints = self.dev.list_prints_sync()
-        self.assertTrue(len(prints) == 1)
-
-        # Ensure the one print from list is the same as new_print
-        self.assertTrue(prints[0].equal(new_print))
-
-        # Verify new_print
-        verify_res, verify_print = self.dev.verify_sync(prints[0])
-        self.assertTrue(verify_res)
-        self.assertTrue(verify_print.equal(prints[0]))
-
-        # Set up a second new print
-        template = FPrint.Print.new(self.dev)
-        template.set_finger(FPrint.Finger.LEFT_INDEX)
-
-        # Enroll the second print
-        new_print2 = self.dev.enroll_sync(template, None, None, None)
-        self.assertIsInstance(new_print2, FPrint.Print)
-
-        # Get the print list again and ensure there is exactly 2 prints
-        prints = self.dev.list_prints_sync()
-        self.assertTrue(len(prints) == 2)
-
-        # Ensure the second print from list is the same as new_print2
-        self.assertTrue(prints[1].equal(new_print2))
-
-class VirtualSDCPNoReconnect(VirtualSDCPBase):
-
-    def setUp(self):
-        os.environ['FP_VIRTUAL_SDCP_NO_RECONNECT'] = '1'
-        super().setUp()
-
-    def test_connect(self):
-        # Nothing to do here since setUp and tearDown will open and close the device
-        pass
-
-    def test_reconnect(self):
-        # Ensure device was opened once before, this may be a reconnect if
-        # it is the same process as another test.
-        self.dev.close_sync()
-
-        # Check that a reconnect happens on next open. To know about this, we
-        # need to parse check log messages for that.
-        success = [False]
-        def log_func(domain, level, msg):
-            print("log: '%s', '%s', '%s'" % (str(domain), str(level), msg))
-            if msg == 'SDCP Reconnect succeeded':
-                success[0] = True
-
-            # Call default handler
-            GLib.log_default_handler(domain, level, msg)
-
-        handler_id = GLib.log_set_handler('libfprint-sdcp_device', GLib.LogLevelFlags.LEVEL_DEBUG, log_func)
-        self.dev.open_sync()
-        GLib.log_remove_handler('libfprint-sdcp_device', handler_id)
-
-        # Ensure that we did NOT see "SDCP Reconnect succeeded" in the log
-        assert success[0] == False
-
-
-if __name__ == '__main__':
-    try:
-        gi.require_version('FPrint', '2.0')
-        from gi.repository import FPrint
-    except Exception as e:
-        print("Missing dependencies: %s" % str(e))
-        sys.exit(77)
-
-    unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))
Author	SHA1	Message	Date
Benjamin Berg	3a3d70f0bc	egis_etu905: move commands into read-only memory There is no need for them to be writable and with the previous commit this change will also not result in any compiler warnings. Simply change all of the static definitions to be static const. Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>	2026-06-28 12:31:23 +02:00
Benjamin Berg	44704a9b1e	egis_etu905: use const buffer for egis_etu905_exec_cmd command The function only uses the passed command as a const buffer and makes a copy immediately. As such, there is also no need for a destroy callback as the caller can simply clean up afterwards. Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>	2026-06-28 12:25:34 +02:00
Benjamin Berg	4ea0726f45	fixup! egis_etu905: support template update after identify/verify Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>	2026-06-28 12:25:28 +02:00
Jason HuangandBenjamin Berg	d643231546	egis_etu905: support template update after identify/verify Add IDENTIFY_SEND_CANCEL_RESULT state to send cancel command after identify/verify completes, triggering firmware template update. Implement cancel() callback for enroll and identify/verify cancellation. Updated umockdev test data to cover the new flow.	2026-06-28 12:12:11 +02:00
Marco Trevisan (Treviño)	accbf7828e	virtual-device: Set the finger on the new scanned prints	2026-06-26 13:44:02 +02:00
Marco Trevisan (Treviño)	1fd4024bd0	fp-print: Rely on GBytes to align memory The old workaround is not needed anymore for the GLib version we're depending on	2026-06-26 13:44:02 +02:00
Marco Trevisan (Treviño)	2d4b1c39e0	virtual-device: Use newer GLib functions	2026-06-26 13:44:02 +02:00
Aelin	a25f71cf97	realtek: Support 3274:9003 Generic Realtek USB2.0 Finger Print Bridge Found in my Medion SPRCHRGD 14 S1 Elite laptop, no further changes are necessary to get enrollment and verification working.	2026-06-23 16:48:51 +02:00
Marco Trevisan (Treviño)	5dbcb0dfa4	fpi-{usb,spi}: Adjust docs to mention required env variables for logging	2026-06-22 15:22:04 +02:00
Marco Trevisan (Treviño)	3a54e4f837	fpi-log: Add atomic and unique check for FP_DEBUG_TRANSFER Rather than check it all the times the variable, just rely on an atomic check that is just done once for all	2026-06-22 15:22:04 +02:00
Marco Trevisan (Treviño)	8009a86247	fpi-log: Use single-line hex bytes dump It's easier to parse and copy and also it makes easier to use it with tools such as python's bytes.fromhex() without reformatting it.	2026-06-22 15:19:30 +02:00
Marco Trevisan (Treviño)	3db8184a30	fpi-log: Add functions to dump bytes Drivers may need to to hex-dumps for debugging purposes, so expose what we already had in the fpi transfers in the internal API	2026-06-22 15:19:30 +02:00
Marco Trevisan (Treviño)	5cadc90e7a	fpi-ssm: Add checks on parameters validity	2026-06-22 12:50:16 +02:00
Marco Trevisan (Treviño)	d1194070b1	fpi-ssm: Fix typo on docs	2026-06-22 12:49:50 +02:00
Marco Trevisan (Treviño)	92b7ced91c	fpi-ssm: Clarify errors ownership	2026-06-22 12:49:28 +02:00
Marco Trevisan (Treviño)	3d91527eb9	secugen: Ignore wrong and unneeded device emulation mode check	2026-06-19 16:09:11 +02:00
Marco Trevisan (Treviño)	5c6fcb8f00	build: Define variable early enough	2026-06-19 16:08:52 +02:00
Marco Trevisan (Treviño)	f800bbd485	fpi-device: Get the emulation mode only through compile-time defined libs In test mode, dynamically load libraries in well known locations that can allow to override the libfprint behavior. It would still be possible to potentially inject code by replicating the distro build directory and adding a library there, but if one is able to access there, they would already be able to access any path. Plus the env variable check is still there, so again they would need to be able to change the fprintd environment	2026-06-19 15:55:13 +02:00
Marco Trevisan (Treviño)	3933e5d468	fpi-device: Only use emulation mode by pre-loading a library Rather than just do it in production if set, make it more difficult to potentially inject the test mode. So rely on a weak definition of fpi_device_emulation_mode_enabled() that can be only set externally	2026-06-19 15:50:18 +02:00
Marco Trevisan (Treviño)	98fb001883	fpi-device: Introduce a properly defined fpi_device_emulation_mode_enabled() Drivers may do some adjustments in test mode, initially we wanted to reduce this to the minimum but the usage of `FP_DEVICE_EMULATION` exploded, so move this instead into a properly defined variable that: - Uses GLib compiler optimizations - Is read just once per process - Cannot be misused	2026-06-19 15:43:45 +02:00
Marco Trevisan (Treviño)	debc6c601e	fp-print: Use a switch to match the print type	2026-06-19 15:43:45 +02:00
Marco Trevisan (Treviño)	59ecce0a99	virtual-device: Use consistent sleep/wait multiplier under valgrind	2026-06-19 15:43:09 +02:00
Marco Trevisan (Treviño)	b587e78b09	test-utils: Do not include the header multiple times	2026-06-19 15:43:09 +02:00
Marco Trevisan (Treviño)	2373769e5b	tests/build: Increase the focaltech_moc test timeout As per commit `bad930503c` the test data is way bigger than it used to be, so the test duration is longer. Thus increase the timeout not to have failures	2026-06-19 15:43:09 +02:00
Marco Trevisan (Treviño)	bf91b0ede8	tests/build: Allow to define per-test parameters via a dict	2026-06-19 15:43:09 +02:00
Marco Trevisan (Treviño)	7925c5af13	drivers-api: Add fpi-enums header	2026-06-19 15:37:34 +02:00
Marco Trevisan (Treviño)	71d4c9e7e4	build: Use files to track drivers files While it's not much needed to ensure rebuild on changes, it may be useful to get the drivers paths in future	2026-06-19 15:37:34 +02:00
Marco Trevisan (Treviño)	f0d4a8830b	libfprint/build: Ignore LD_LIBRARY_PATH (and use rpath) on local binaries DT_RUNPATH is intentionally searched after $LD_LIBRARY_PATH. -Wl,--disable-new-dtags switches to the old DT_RPATH tag, which is searched before $LD_LIBRARY_PATH. So the embedded paths in the build binary will now win over whatever is in the environment. Not breaking builds.	2026-06-19 15:37:34 +02:00
Marco Trevisan (Treviño)	9e59d69271	fprint-list-metainfo: Write errors messages to stderr by default So logging won't affect the result	2026-06-19 12:10:33 +02:00
Marco Trevisan (Treviño)	6498a64f3a	tests/hwdb: Use all hwdb-related variables for that test only	2026-06-19 12:10:33 +02:00
Marco Trevisan (Treviño)	bfa74c2816	ci: Do not fail on coverage report page publication	2026-06-19 12:05:29 +02:00
Marco Trevisan (Treviño)	ba5a6a9447	focaltech_moc: Check transfer lengths	2026-06-18 18:10:39 +02:00
Marco Trevisan (Treviño)	169d9addc9	focaltech_moc: Do not set delete feature for 6553	2026-06-18 18:10:39 +02:00
Sid1803andMarco Trevisan (Treviño)	8d2462dad1	focaltech-moc: Add storage clear for 2808:6553	2026-06-18 18:10:39 +02:00
PetaptonandMarco Trevisan	2bdc2b7ca6	Add support for 04f3:0c9c Elan Microelectronics Corp. ELAN:ARM-M4	2026-06-18 13:59:57 +00:00
Marco Trevisan (Treviño)	4e92d67048	mafpmoc: bound tpl_info uid usage in logs Use bounded uid strings for template-info handling. - stop printing fixed-size device buffers with raw %s - use g_strndup(..., TEMPLATE_UID_SIZE) before logging tpl_info.uid - compare delete target uid against the bounded copy - log handshake response as bytes instead of %s This avoids over-read/invalid-UTF8 issues when unknown/corrupted entries contain non-NUL or 0xff-filled uid data.	2026-06-18 15:49:29 +02:00
Marco Trevisan (Treviño)	4eea5c5e17	mafpmoc: Add various memory cleanups and hardenings	2026-06-18 15:49:27 +02:00
Marco Trevisan (Treviño)	4f743766a5	mafpmoc/custom: Improve test script checking for identified match	2026-06-18 15:49:25 +02:00
Marco Trevisan (Treviño)	c1bb621b59	mafpmoc: Fix error handling	2026-06-18 15:49:23 +02:00
Marco Trevisan (Treviño)	3e300ae7ae	mapfmoc: Do not use reserved FP prefix for driver types	2026-06-18 15:49:22 +02:00
Marco Trevisan (Treviño)	7df9fc18cf	mafpmoc: Use consistent error handling and fix some leaks	2026-06-18 15:49:20 +02:00
Marco Trevisan (Treviño)	14d40fb515	mafpmoc: Code cleanups	2026-06-18 15:49:16 +02:00
Marco Trevisan (Treviño)	a4eb3013da	mafpmoc: Init the device enroll stage at class init	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	77b73b04b4	mafpmoc: Allow listing non-fprint prints It's then up to the upper levels to handle them differently, and fprintd is already strong enough to ignore them.	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	5a2762fe17	mafpmoc: Cleanup handling of identify and matching prints Make clearer the ownership of the prints we're tracking	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	147f3db814	mafpmoc: Ensure the current task SSM reference is always cleaned up	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	3cbeb34d36	libfprint/fprint-list-udev-hwdb: Drop mafpmoc from unsupported list	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	4be0fc60a4	mafpmoc: Init print id value	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	893003799d	mafpmoc: Ignore prints not enrolled by FPrint when listing them	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	b25cbff9be	mafpmoc: Do not compare differently signed values	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	b141eca270	mafpmoc: Handle cancellation without overriding the error	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	95ecaa156d	mafpmoc: Improve creation and destruction of templates list	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	3ce345b876	mafpmoc: Do not pack templates structure Otherwise undefined sanitizer would fail for unaligned memory access	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	b3ad630fb4	mafpmoc: Steal errors when forwarding their ownerships	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	8d81299743	mafpmoc: Clear errors when they are not forwarded	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	67649a0efd	pafpmoc: Drop check on fprintd templates It's not up to the drivers do do this check	2026-06-18 15:47:34 +02:00
Marco Trevisan (Treviño)	bbd4ca2fdf	mafpmoc: Cleanup code	2026-06-18 15:47:34 +02:00
‘王毅’andMarco Trevisan (Treviño)	e1caa3de3b	formatting	2026-06-18 15:47:34 +02:00
王毅andMarco Trevisan (Treviño)	beab941894	Modify debugging print interface, modify comments	2026-06-18 15:47:34 +02:00
王毅andMarco Trevisan (Treviño)	7cf358d42a	mafpmoc: Support Microarray Inc. series fingerprint sensor PID 8012	2026-06-18 15:47:34 +02:00
lichenggangandMarco Trevisan (Treviño)	4610f2285e	elan: Add support for 0x0c58 sensor response codes The Elan 04f3:0c58 sensor returns 0xaf during capture which indicates finger removed or sensor busy. Also 0x00 can occur meaning not ready. These responses should trigger a retry instead of failing. To avoid changing behavior for other Elan devices, limit the new retry logic to the 0x0c58 device type and add a small 10ms delay between retries. Additionally, increase calibration attempts from 10 to 30 for 0x0c58 as this sensor needs more time to complete calibration. Source: https://gitlab.freedesktop.org/libfprint/libfprint/-/work_items/763 Signed-off-by: lichenggang <lichenggang@uniontech.com> Co-Authored-By: Marco Trevisan (Treviño) <mail@3v1n0.net>	2026-06-17 20:05:02 +02:00
Marco Trevisan (Treviño)	5b01f0b7c1	secugen: Do image processing inside GTask threads Do not block the main loop to process image data	2026-06-17 19:47:24 +02:00
Marco Trevisan (Treviño)	4a7842347e	secugen: Use autopointers	2026-06-17 19:47:24 +02:00
Marco Trevisan (Treviño)	0c34a2b888	secugen: Use device timeout rather than a custom one	2026-06-17 19:47:23 +02:00
Marco Trevisan (Treviño)	3af57e3483	secugen: Check transfers have a minimal lengths	2026-06-17 19:47:23 +02:00
Marco Trevisan (Treviño)	726cf8a515	secugen: Protect against invalid fw_data This fixes an issue detected by scan build	2026-06-17 19:47:23 +02:00
Jared VacantiandMarco Trevisan (Treviño)	5b34908a21	Add driver for SecuGen Hamster Pro 20 Add support for the SecuGen Hamster Pro 20 (1162:2200), a 500 DPI press-type optical scanner built around the SIDO020A sensor. The protocol was reverse-engineered from USB packet captures. The sensor is configured over I2C-tunneled vendor control transfers and streams 956x688 raw frames over the bulk endpoint, read in 64KB chunks so the standard pcap-based test tooling can record full frames (the kernel usbmon interface truncates single URBs at ring_size/5). Frames are processed with band compensation, an edge-aware unsharp mask, a fixed-point bilinear downsample to 300x400, flat-field blending and directional sharpening, driven by per-device factory calibration data read from the device firmware. The fixed-point pipeline keeps the output bit-identical across compilers and architectures for the image comparison test. The sensor has no proximity hardware and its GET_STATUS request always returns zeros, so finger presence is detected by polling preview frames and comparing the mean brightness of the central region against a calibration background frame. Includes a umockdev capture/replay test with a reference image. Closes: https://gitlab.freedesktop.org/libfprint/libfprint/-/work_items/353	2026-06-17 19:47:23 +02:00
Marco Trevisan (Treviño)	732dbe855e	fprint-list-metainfo: Update the bug tracker URI	2026-06-17 19:36:59 +02:00
Mikko NymanandMarco Trevisan (Treviño)	0dc384b90e	focaltech_moc: add new pid:0xA97A	2026-06-11 19:08:52 +02:00
Harshith GokaandMarco Trevisan (Treviño)	e43137c760	feat: Add support for Goodix device 0x27C6:0x6984 It includes autosuspend configuration.	2026-06-11 18:08:30 +02:00
Daniel SchaeferandMarco Trevisan	20f5ce682e	tests: /usr/bin/env shebang Not all distros have /usr/bin/python3. Using env is more portable. Signed-off-by: Daniel Schaefer <git@danielschaefer.me>	2026-06-11 15:47:32 +00:00
Daniel SchaeferandMarco Trevisan	8a2123ce6a	fpcmoc: Avoid dead-store Fixes the CI test_scan_build libfprint/drivers/fpcmoc/fpc.c:275 — [deadcode.DeadStores] warning: Value stored to 'data' during its initialization is never read CommandData *data = fpi_ssm_get_data (ssm); Signed-off-by: Daniel Schaefer <dhs@frame.work>	2026-06-11 15:40:46 +00:00
Marco Trevisan (Treviño)	7111218427	docs: Address various issues leading to wrong docs	2026-06-11 15:15:48 +02:00
Marco Trevisan (Treviño)	58a40bb4a3	ci/scan-build: Exclude the full path of the build dir The tool runs in the build dir as cwd, but let' make this clearer	2026-06-11 15:10:36 +02:00
Marco Trevisan (Treviño)	7c5d1b454d	ci: Do pages job also on new tag	2026-06-11 15:10:30 +02:00
Marco Trevisan (Treviño)	e40f9825fd	ci: Also export docs in pages	2026-06-11 15:10:24 +02:00
Marco Trevisan (Treviño)	ed1b18e687	ci: Use upstream image all the times	2026-06-11 15:10:16 +02:00
Daniel SchaeferandDaniel Schaefer	710735efdd	examples/clear-storage: Clarify default as N Pressing enter, selects N(o), make that obvious by capitalizing N instead of Y. Signed-off-by: Daniel Schaefer <git@danielschaefer.me>	2026-06-11 14:24:56 +08:00
Daniel SchaeferandMarco Trevisan	c0a4626a3b	focal: Add PID 5158 Signed-off-by: Daniel Schaefer <git@danielschaefer.me>	2026-06-10 08:36:48 +00:00
Daniel SchaeferandMarco Trevisan	bad930503c	focal: Add clear_storage Signed-off-by: Daniel Schaefer <git@danielschaefer.me>	2026-06-10 08:23:00 +00:00
Marco Trevisan (Treviño)	6a71e039a1	egis_etu905: Double-check that the identified ID is part of the enrolled list	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	06ad44bc1d	egis_etu905: Improve the identify callback data reading	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	c0a9811053	egis_etu905: Do not try to continue a failed SSM	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	5b51f9c8cc	egis_etu905: Sanitize print data parsing	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	65c3dcb1eb	egis_etu905: Avoid potential wrong memory accesses	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	c6f9f094af	egis_etu905: drop unused sid field We read it but we never use it	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	4b8f46f1f9	egis_etu905: Use fpi-bytes-reader to get the firmware string	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	42f0b96c10	egis_etu905: Rely on default device cancellable for all the actions I don't see a reason why we should rely on a different cancellable for interrupts, but happy to learn more about this	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	12af25d43b	egis_etu905: Set short error using function	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	f5806825de	egis_etu905: Remove unused variable	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	fdbc9ee655	egis_etu905: Remove unused transfer	2026-06-10 10:14:51 +02:00
Marco Trevisan (Treviño)	c216f04dd1	egis_etu905: Do not leak the transfer buffer The buffer is now owned by the data, so we should not steal it when passing it around or we'll leak.	2026-06-10 10:14:51 +02:00
Jason HuangandMarco Trevisan (Treviño)	9bddd90f06	egis_etu905: Add 1c7a:05ae and 1c7a:9201 fingerprint readers	2026-06-10 10:14:47 +02:00
Vincent HuangandMarco Trevisan (Treviño)	0209e7735e	synaptics: add new PID 0x1A4	2026-06-09 14:05:20 +02:00
Marco Trevisan (Treviño)	9d4e7fc87b	fpi-usb-transfer: Wrap g_error_new arguments	2026-06-08 14:45:40 +02:00
Marco Trevisan (Treviño)	e7c80e748e	fpi-usb-transfer: Add missing definition of set_short_error() It was in the header but not implemented	2026-06-08 14:45:40 +02:00
Marco Trevisan (Treviño)	f6a8cae5b4	fpi-byte-reader: Add support to read to a static buffer This works through macros when the size of a buffer is statically defined	2026-06-08 12:44:44 +00:00
Marco Trevisan (Treviño)	dc48ab8b40	fpi-byte-reader: Add support to read and get/peek GBytes	2026-06-08 12:44:44 +00:00
Marco Trevisan (Treviño)	14763d29cf	fpi-byte-writer: Add APIs to write and get GBytes It makes it handier to handle data elements without having to keep size and data separated	2026-06-08 12:44:44 +00:00
Marco Trevisan (Treviño)	9c140036e9	doc: Include Binary buffer I/O section for the byte reader/writer	2026-06-08 12:44:44 +00:00
jialei	8961a5ee45	goodixmoc:Fixed inconsistent enrollment progress when swiping quickly.	2026-05-22 18:11:52 +08:00
lichenggang	d79f157282	goodixmoc: Add support for 0x27C6:0x6090 Signed-off-by: lichenggang <lichenggang@uniontech.com>	2026-04-14 13:43:46 +08:00
YooLcandMarco Trevisan	3ce79986cf	goodixmoc: add new PID 0x6890	2026-04-13 13:01:01 +00:00
lichenggangandzeno	d8641635c5	fpcmoc: Add support for 0x10A5:0x9B24 Add the new FPC fingerprint device (0x10A5:0x9B24) to the driver and autosuspend hwdb. Signed-off-by: lichenggang <lichenggang@uniontech.com>	2026-04-09 06:43:40 +00:00
Ken	ee422fc3c5	elanmoc: Add new PID 0xCB2	2026-03-20 11:23:09 +08:00