From 01b0f7aba0f9389b3bedadd0fe463971b7ad6b4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 28 Oct 2021 16:39:35 +0200
Subject: [PATCH 1/4] doc: Include missing types (SPI) and functions to the
 Drivers API

---
 doc/libfprint-2-sections.txt | 18 ++++++++++++++++++
 doc/libfprint-docs.xml       |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/doc/libfprint-2-sections.txt b/doc/libfprint-2-sections.txt
index 33189854..d355ba88 100644
--- a/doc/libfprint-2-sections.txt
+++ b/doc/libfprint-2-sections.txt
@@ -179,6 +179,7 @@ fpi_device_enroll_complete
 fpi_device_verify_complete
 fpi_device_identify_complete
 fpi_device_capture_complete
+fpi_device_clear_storage_complete
 fpi_device_delete_complete
 fpi_device_list_complete
 fpi_device_suspend_complete
@@ -286,3 +287,20 @@ FPI_TYPE_USB_TRANSFER
 fpi_usb_transfer_get_type
 </SECTION>
 
+<SECTION>
+<FILE>fpi-spi-transfer</FILE>
+FpiSpiTransferCallback
+FpiSpiTransfer
+fpi_spi_transfer_new
+fpi_spi_transfer_ref
+fpi_spi_transfer_unref
+fpi_spi_transfer_write
+fpi_spi_transfer_write_full
+fpi_spi_transfer_read
+fpi_spi_transfer_read_full
+fpi_spi_transfer_submit
+fpi_spi_transfer_submit_sync
+<SUBSECTION Standard>
+FPI_TYPE_SPI_TRANSFER
+fpi_spi_transfer_get_type
+</SECTION>
diff --git a/doc/libfprint-docs.xml b/doc/libfprint-docs.xml
index b866aab0..0a57efb4 100644
--- a/doc/libfprint-docs.xml
+++ b/doc/libfprint-docs.xml
@@ -41,7 +41,8 @@
     </chapter>
 
     <chapter id="driver-helpers">
-      <title>USB and State Machine helpers</title>
+      <title>USB, SPI and State Machine helpers</title>
+      <xi:include href="xml/fpi-spi-transfer.xml"/>
       <xi:include href="xml/fpi-usb-transfer.xml"/>
       <xi:include href="xml/fpi-ssm.xml"/>
       <xi:include href="xml/fpi-log.xml"/>

From 378fae0ea2105058a78bb0960549ef301a8690ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 28 Oct 2021 16:56:11 +0200
Subject: [PATCH 2/4] doc: Add missing Drivers API SSM functions

---
 doc/libfprint-2-sections.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/libfprint-2-sections.txt b/doc/libfprint-2-sections.txt
index d355ba88..91258b62 100644
--- a/doc/libfprint-2-sections.txt
+++ b/doc/libfprint-2-sections.txt
@@ -260,7 +260,10 @@ fpi_ssm_get_device
 fpi_ssm_get_error
 fpi_ssm_dup_error
 fpi_ssm_get_cur_state
+fpi_ssm_spi_transfer_cb
+fpi_ssm_spi_transfer_with_weak_pointer_cb
 fpi_ssm_usb_transfer_cb
+fpi_ssm_usb_transfer_with_weak_pointer_cb
 FpiSsm
 </SECTION>
 

From 2cfff27729e9faa12e1e5de3788b431adeb3e7c3 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Tue, 2 Nov 2021 16:27:33 +0100
Subject: [PATCH 3/4] udev-hwdb: Update unsupported device list

---
 data/autosuspend.hwdb             | 1 +
 libfprint/fprint-list-udev-hwdb.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
index 42d22ca7..cbc6109f 100644
--- a/data/autosuspend.hwdb
+++ b/data/autosuspend.hwdb
@@ -286,6 +286,7 @@ usb:v0A5Cp5842*
 usb:v0A5Cp5843*
 usb:v0A5Cp5844*
 usb:v0A5Cp5845*
+usb:v0BDAp5812*
 usb:v10A5p0007*
 usb:v1188p9545*
 usb:v138Ap0007*
diff --git a/libfprint/fprint-list-udev-hwdb.c b/libfprint/fprint-list-udev-hwdb.c
index d271752a..f5674574 100644
--- a/libfprint/fprint-list-udev-hwdb.c
+++ b/libfprint/fprint-list-udev-hwdb.c
@@ -60,6 +60,7 @@ static const FpIdEntry whitelist_id_table[] = {
   { .vid = 0x0a5c, .pid = 0x5843 },
   { .vid = 0x0a5c, .pid = 0x5844 },
   { .vid = 0x0a5c, .pid = 0x5845 },
+  { .vid = 0x0bda, .pid = 0x5812 },
   { .vid = 0x10a5, .pid = 0x0007 },
   { .vid = 0x1188, .pid = 0x9545 },
   { .vid = 0x138a, .pid = 0x0007 },

From 5e4bb268012f4051fc72578e6a1866c729cd8a2f Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Tue, 2 Nov 2021 16:20:32 +0100
Subject: [PATCH 4/4] Release 1.94.2

---
 NEWS        | 7 +++++++
 meson.build | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index cf96ff33..eacd99c9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.
 
+2021-11-02: v1.94.2 release
+
+Highlights:
+ * goodixmoc: Fix protocol error with certain username lengths
+ * elanmoc: New PID 0x0c7d
+ * goodixmoc: New PID 0x63cc
+
 2021-09-24: v1.94.1 release
 
 Highlights:
diff --git a/meson.build b/meson.build
index 795f313c..f2750519 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('libfprint', [ 'c', 'cpp' ],
-    version: '1.94.1',
+    version: '1.94.2',
     license: 'LGPLv2.1+',
     default_options: [
         'buildtype=debugoptimized',