mirror of
https://gitlab.freedesktop.org/libfprint/libfprint.git
synced 2026-06-11 02:28:05 +00:00
debian/patches: Drop all (applied upstream)
This commit is contained in:
Marco Trevisan (Treviño)
-20
@@ -1,20 +0,0 @@
|
||||
From: mbv06 <mbv06.dev@gmail.com>
|
||||
Date: Tue, 27 Sep 2022 08:59:49 +0000
|
||||
Subject: Update autosuspend.hwdb
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index d8127c3..ca2435a 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -212,6 +212,7 @@ usb:v147Ep1001*
|
||||
|
||||
# Supported by libfprint driver upektc
|
||||
usb:v0483p2015*
|
||||
+usb:v0483p2017*
|
||||
usb:v147Ep3001*
|
||||
ID_AUTOSUSPEND=1
|
||||
ID_PERSIST=0
|
||||
-54
@@ -1,54 +0,0 @@
|
||||
From: Josh Chen <josh.chen@emc.com.tw>
|
||||
Date: Wed, 13 Apr 2022 14:48:29 +0800
|
||||
Subject: elan: add PID 0x0c4b
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 2 +-
|
||||
libfprint/drivers/elan.h | 1 +
|
||||
libfprint/fprint-list-udev-hwdb.c | 1 -
|
||||
3 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index c305c44..49fcacf 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -133,6 +133,7 @@ usb:v04F3p0C32*
|
||||
usb:v04F3p0C33*
|
||||
usb:v04F3p0C3D*
|
||||
usb:v04F3p0C42*
|
||||
+usb:v04F3p0C4B*
|
||||
usb:v04F3p0C4D*
|
||||
usb:v04F3p0C4F*
|
||||
usb:v04F3p0C63*
|
||||
@@ -259,7 +260,6 @@ usb:v138Ap0091*
|
||||
# Known unsupported devices
|
||||
usb:v04F3p036B*
|
||||
usb:v04F3p0C00*
|
||||
-usb:v04F3p0C4B*
|
||||
usb:v04F3p0C4C*
|
||||
usb:v04F3p0C57*
|
||||
usb:v04F3p0C5E*
|
||||
diff --git a/libfprint/drivers/elan.h b/libfprint/drivers/elan.h
|
||||
index 33f3aef..7d08994 100644
|
||||
--- a/libfprint/drivers/elan.h
|
||||
+++ b/libfprint/drivers/elan.h
|
||||
@@ -215,6 +215,7 @@ static const FpIdEntry elan_id_table[] = {
|
||||
{.vid = ELAN_VEND_ID, .pid = 0x0c33, .driver_data = ELAN_ALL_DEV},
|
||||
{.vid = ELAN_VEND_ID, .pid = 0x0c3d, .driver_data = ELAN_ALL_DEV},
|
||||
{.vid = ELAN_VEND_ID, .pid = 0x0c42, .driver_data = ELAN_0C42},
|
||||
+ {.vid = ELAN_VEND_ID, .pid = 0x0c4b, .driver_data = ELAN_ALL_DEV},
|
||||
{.vid = ELAN_VEND_ID, .pid = 0x0c4d, .driver_data = ELAN_ALL_DEV},
|
||||
{.vid = ELAN_VEND_ID, .pid = 0x0c4f, .driver_data = ELAN_ALL_DEV},
|
||||
{.vid = ELAN_VEND_ID, .pid = 0x0c63, .driver_data = ELAN_ALL_DEV},
|
||||
diff --git a/libfprint/fprint-list-udev-hwdb.c b/libfprint/fprint-list-udev-hwdb.c
|
||||
index ad9cdd0..5244cc6 100644
|
||||
--- a/libfprint/fprint-list-udev-hwdb.c
|
||||
+++ b/libfprint/fprint-list-udev-hwdb.c
|
||||
@@ -31,7 +31,6 @@ static const FpIdEntry whitelist_id_table[] = {
|
||||
*/
|
||||
{ .vid = 0x04f3, .pid = 0x036b },
|
||||
{ .vid = 0x04f3, .pid = 0x0c00 },
|
||||
- { .vid = 0x04f3, .pid = 0x0c4b },
|
||||
{ .vid = 0x04f3, .pid = 0x0c4c },
|
||||
{ .vid = 0x04f3, .pid = 0x0c57 },
|
||||
{ .vid = 0x04f3, .pid = 0x0c5e },
|
||||
Binary file not shown.
-33
@@ -1,33 +0,0 @@
|
||||
From: ArronYen <arron.yen@emc.com.tw>
|
||||
Date: Wed, 2 Mar 2022 10:43:20 +0800
|
||||
Subject: elanmoc: add PID 0x0c82
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/elanmoc/elanmoc.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index 91a14eb..d55ed3e 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -144,6 +144,7 @@ usb:v04F3p0C58*
|
||||
# Supported by libfprint driver elanmoc
|
||||
usb:v04F3p0C7D*
|
||||
usb:v04F3p0C7E*
|
||||
+usb:v04F3p0C82*
|
||||
ID_AUTOSUSPEND=1
|
||||
ID_PERSIST=0
|
||||
|
||||
diff --git a/libfprint/drivers/elanmoc/elanmoc.c b/libfprint/drivers/elanmoc/elanmoc.c
|
||||
index 69700a0..3185ee7 100644
|
||||
--- a/libfprint/drivers/elanmoc/elanmoc.c
|
||||
+++ b/libfprint/drivers/elanmoc/elanmoc.c
|
||||
@@ -27,6 +27,7 @@ G_DEFINE_TYPE (FpiDeviceElanmoc, fpi_device_elanmoc, FP_TYPE_DEVICE)
|
||||
static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x04f3, .pid = 0x0c7d, },
|
||||
{ .vid = 0x04f3, .pid = 0x0c7e, },
|
||||
+ { .vid = 0x04f3, .pid = 0x0c82, },
|
||||
{ .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */
|
||||
};
|
||||
|
||||
-33
@@ -1,33 +0,0 @@
|
||||
From: ArronYen <arron.yen@emc.com.tw>
|
||||
Date: Mon, 20 Jun 2022 14:03:05 +0800
|
||||
Subject: elanmoc: add PID 0x0c88
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/elanmoc/elanmoc.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index d55ed3e..725c602 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -145,6 +145,7 @@ usb:v04F3p0C58*
|
||||
usb:v04F3p0C7D*
|
||||
usb:v04F3p0C7E*
|
||||
usb:v04F3p0C82*
|
||||
+usb:v04F3p0C88*
|
||||
ID_AUTOSUSPEND=1
|
||||
ID_PERSIST=0
|
||||
|
||||
diff --git a/libfprint/drivers/elanmoc/elanmoc.c b/libfprint/drivers/elanmoc/elanmoc.c
|
||||
index 3185ee7..ad23e93 100644
|
||||
--- a/libfprint/drivers/elanmoc/elanmoc.c
|
||||
+++ b/libfprint/drivers/elanmoc/elanmoc.c
|
||||
@@ -28,6 +28,7 @@ static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x04f3, .pid = 0x0c7d, },
|
||||
{ .vid = 0x04f3, .pid = 0x0c7e, },
|
||||
{ .vid = 0x04f3, .pid = 0x0c82, },
|
||||
+ { .vid = 0x04f3, .pid = 0x0c88, },
|
||||
{ .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */
|
||||
};
|
||||
|
||||
-103
@@ -1,103 +0,0 @@
|
||||
From: Johnny Li <johnny.li@emc.com.tw>
|
||||
Date: Mon, 25 Jul 2022 14:11:37 +0800
|
||||
Subject: elanmoc: add PID 0x0c8c & 0x0c8d
|
||||
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfprint/+bug/1989314
|
||||
---
|
||||
data/autosuspend.hwdb | 2 ++
|
||||
libfprint/drivers/elanmoc/elanmoc.c | 27 ++++++++++++++++++++++++---
|
||||
libfprint/drivers/elanmoc/elanmoc.h | 1 +
|
||||
3 files changed, 27 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index 6e53964..5977aa8 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -147,6 +147,8 @@ usb:v04F3p0C7D*
|
||||
usb:v04F3p0C7E*
|
||||
usb:v04F3p0C82*
|
||||
usb:v04F3p0C88*
|
||||
+usb:v04F3p0C8C*
|
||||
+usb:v04F3p0C8D*
|
||||
ID_AUTOSUSPEND=1
|
||||
ID_PERSIST=0
|
||||
|
||||
diff --git a/libfprint/drivers/elanmoc/elanmoc.c b/libfprint/drivers/elanmoc/elanmoc.c
|
||||
index 5bcfce2..77e22f2 100644
|
||||
--- a/libfprint/drivers/elanmoc/elanmoc.c
|
||||
+++ b/libfprint/drivers/elanmoc/elanmoc.c
|
||||
@@ -29,6 +29,8 @@ static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x04f3, .pid = 0x0c7e, },
|
||||
{ .vid = 0x04f3, .pid = 0x0c82, },
|
||||
{ .vid = 0x04f3, .pid = 0x0c88, },
|
||||
+ { .vid = 0x04f3, .pid = 0x0c8c, },
|
||||
+ { .vid = 0x04f3, .pid = 0x0c8d, },
|
||||
{ .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */
|
||||
};
|
||||
|
||||
@@ -377,9 +379,9 @@ elanmoc_enroll_cb (FpiDeviceElanmoc *self,
|
||||
enroll_status_report (self, ENROLL_RSP_RETRY, self->num_frames, NULL);
|
||||
}
|
||||
|
||||
- if (self->num_frames == ELAN_MOC_ENROLL_TIMES && buffer_in[1] == ELAN_MSG_OK)
|
||||
+ if (self->num_frames == self->max_moc_enroll_time && buffer_in[1] == ELAN_MSG_OK)
|
||||
fpi_ssm_next_state (self->task_ssm);
|
||||
- else if (self->num_frames < ELAN_MOC_ENROLL_TIMES)
|
||||
+ else if (self->num_frames < self->max_moc_enroll_time)
|
||||
fpi_ssm_jump_to_state (self->task_ssm, MOC_ENROLL_WAIT_FINGER);
|
||||
else
|
||||
fpi_ssm_mark_failed (self->task_ssm, error);
|
||||
@@ -442,7 +444,7 @@ elan_enroll_run_state (FpiSsm *ssm, FpDevice *dev)
|
||||
case MOC_ENROLL_WAIT_FINGER:
|
||||
cmd_buf = elanmoc_compose_cmd (&elanmoc_enroll_cmd);
|
||||
cmd_buf[3] = self->curr_enrolled;
|
||||
- cmd_buf[4] = ELAN_MOC_ENROLL_TIMES;
|
||||
+ cmd_buf[4] = self->max_moc_enroll_time;
|
||||
cmd_buf[5] = self->num_frames;
|
||||
elanmoc_get_cmd (dev, cmd_buf, elanmoc_enroll_cmd.cmd_len, elanmoc_enroll_cmd.resp_len, 1, elanmoc_enroll_cb);
|
||||
break;
|
||||
@@ -1069,6 +1071,7 @@ elanmoc_open (FpDevice *device)
|
||||
{
|
||||
FpiDeviceElanmoc *self = FPI_DEVICE_ELANMOC (device);
|
||||
GError *error = NULL;
|
||||
+ gint productid = 0;
|
||||
|
||||
if (!g_usb_device_reset (fpi_device_get_usb_device (device), &error))
|
||||
goto error;
|
||||
@@ -1076,6 +1079,24 @@ elanmoc_open (FpDevice *device)
|
||||
if (!g_usb_device_claim_interface (fpi_device_get_usb_device (device), 0, 0, &error))
|
||||
goto error;
|
||||
|
||||
+ productid = g_usb_device_get_pid (fpi_device_get_usb_device (device));
|
||||
+ switch (productid)
|
||||
+ {
|
||||
+ case 0x0c8c:
|
||||
+ self->max_moc_enroll_time = 11;
|
||||
+ break;
|
||||
+
|
||||
+ case 0x0c8d:
|
||||
+ self->max_moc_enroll_time = 17;
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ self->max_moc_enroll_time = ELAN_MOC_ENROLL_TIMES;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ fpi_device_set_nr_enroll_stages (device, self->max_moc_enroll_time);
|
||||
+
|
||||
self->task_ssm = fpi_ssm_new (FP_DEVICE (self), dev_init_handler, DEV_INIT_STATES);
|
||||
fpi_ssm_start (self->task_ssm, task_ssm_init_done);
|
||||
return;
|
||||
diff --git a/libfprint/drivers/elanmoc/elanmoc.h b/libfprint/drivers/elanmoc/elanmoc.h
|
||||
index 312a4b4..a948d40 100644
|
||||
--- a/libfprint/drivers/elanmoc/elanmoc.h
|
||||
+++ b/libfprint/drivers/elanmoc/elanmoc.h
|
||||
@@ -188,6 +188,7 @@ struct _FpiDeviceElanmoc
|
||||
unsigned char y_trace;
|
||||
int num_frames;
|
||||
int curr_enrolled;
|
||||
+ int max_moc_enroll_time;
|
||||
int cancel_result;
|
||||
int cmd_retry_cnt;
|
||||
int list_index;
|
||||
-22
@@ -1,22 +0,0 @@
|
||||
From: Matthew Mirvish <matthew@mm12.xyz>
|
||||
Date: Sun, 8 May 2022 18:32:29 -0400
|
||||
Subject: elanspi: add 04f3:241f
|
||||
|
||||
Reported as working with this config in
|
||||
https://github.com/mincrmatt12/elan-spi-fingerprint/issues/11.
|
||||
---
|
||||
libfprint/drivers/elanspi.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libfprint/drivers/elanspi.h b/libfprint/drivers/elanspi.h
|
||||
index ffe3416..a8d7319 100644
|
||||
--- a/libfprint/drivers/elanspi.h
|
||||
+++ b/libfprint/drivers/elanspi.h
|
||||
@@ -348,6 +348,7 @@ static const FpIdEntry elanspi_id_table[] = {
|
||||
{.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x30b2}, .driver_data = ELANSPI_NO_ROTATE},
|
||||
{.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN70A1", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x30b2}, .driver_data = ELANSPI_NO_ROTATE},
|
||||
{.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x309f}, .driver_data = ELANSPI_180_ROTATE},
|
||||
+ {.udev_types = ELANSPI_UDEV_TYPES, .spi_acpi_id = "ELAN7001", .hid_id = {.vid = ELANSPI_TP_VID, .pid = 0x241f}, .driver_data = ELANSPI_NO_ROTATE},
|
||||
{.udev_types = 0}
|
||||
};
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
|
||||
Date: Sun, 17 Jul 2022 17:16:11 +0200
|
||||
Subject: fpi-device: Avoid using device action strings
|
||||
|
||||
It may cause initializing a type twice in some cases, and thus some
|
||||
hard-locking, let's just avoid it since we don't care about full debug
|
||||
strings here.
|
||||
|
||||
LP: #1966911
|
||||
---
|
||||
libfprint/fpi-device.c | 11 +++--------
|
||||
1 file changed, 3 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libfprint/fpi-device.c b/libfprint/fpi-device.c
|
||||
index 89504da..7efdfe5 100644
|
||||
--- a/libfprint/fpi-device.c
|
||||
+++ b/libfprint/fpi-device.c
|
||||
@@ -747,11 +747,8 @@ fpi_device_action_error (FpDevice *device,
|
||||
|
||||
if (error != NULL)
|
||||
{
|
||||
- g_autofree char *action_str = NULL;
|
||||
-
|
||||
- action_str = g_enum_to_string (FPI_TYPE_DEVICE_ACTION, priv->current_action);
|
||||
- g_debug ("Device reported generic error (%s) during action; action was: %s",
|
||||
- error->message, action_str);
|
||||
+ g_debug ("Device reported generic error (%s) during action; action was: %d",
|
||||
+ error->message, priv->current_action);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -965,15 +962,13 @@ fp_device_task_return_in_idle_cb (gpointer user_data)
|
||||
{
|
||||
FpDeviceTaskReturnData *data = user_data;
|
||||
FpDevicePrivate *priv = fp_device_get_instance_private (data->device);
|
||||
- g_autofree char *action_str = NULL;
|
||||
FpiDeviceAction action;
|
||||
|
||||
g_autoptr(GTask) task = NULL;
|
||||
g_autoptr(GError) cancellation_reason = NULL;
|
||||
|
||||
|
||||
- action_str = g_enum_to_string (FPI_TYPE_DEVICE_ACTION, priv->current_action);
|
||||
- g_debug ("Completing action %s in idle!", action_str);
|
||||
+ g_debug ("Completing action %d in idle!", priv->current_action);
|
||||
|
||||
task = g_steal_pointer (&priv->current_task);
|
||||
action = priv->current_action;
|
||||
@@ -1,33 +0,0 @@
|
||||
From: Benjamin Berg <bberg@redhat.com>
|
||||
Date: Tue, 14 Jun 2022 15:32:56 +0200
|
||||
Subject: goodix: Lower poor capture warnings to debug message
|
||||
|
||||
It is completely fine for a capture to have a low quality or fail. No
|
||||
need to warn about this. Main reason to remove it though is so that
|
||||
recordings that contain such a message do not trigger a failure.
|
||||
---
|
||||
libfprint/drivers/goodixmoc/goodix.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c
|
||||
index 0686856..48dafe1 100644
|
||||
--- a/libfprint/drivers/goodixmoc/goodix.c
|
||||
+++ b/libfprint/drivers/goodixmoc/goodix.c
|
||||
@@ -661,7 +661,7 @@ fp_enroll_capture_cb (FpiDeviceGoodixMoc *self,
|
||||
/* */
|
||||
if (resp->result >= GX_FAILED)
|
||||
{
|
||||
- fp_warn ("Capture sample failed, result: 0x%x", resp->result);
|
||||
+ fp_info ("Capture sample failed, result: 0x%x", resp->result);
|
||||
fpi_device_enroll_progress (FP_DEVICE (self),
|
||||
self->enroll_stage,
|
||||
NULL,
|
||||
@@ -675,7 +675,7 @@ fp_enroll_capture_cb (FpiDeviceGoodixMoc *self,
|
||||
if ((resp->capture_data_resp.img_quality < self->sensorcfg->config[4]) ||
|
||||
(resp->capture_data_resp.img_coverage < self->sensorcfg->config[5]))
|
||||
{
|
||||
- fp_warn ("Capture sample poor quality(%d): %d or coverage(%d): %d",
|
||||
+ fp_info ("Capture sample poor quality(%d): %d or coverage(%d): %d",
|
||||
self->sensorcfg->config[4],
|
||||
resp->capture_data_resp.img_quality,
|
||||
self->sensorcfg->config[5],
|
||||
@@ -1,26 +0,0 @@
|
||||
From: Benjamin Berg <bberg@redhat.com>
|
||||
Date: Wed, 22 Jun 2022 17:37:26 +0200
|
||||
Subject: goodix: Make fingerlist parse error non-fatal
|
||||
|
||||
Otherwise we cannot recover from the error by doing a device reset.
|
||||
---
|
||||
libfprint/drivers/goodixmoc/goodix_proto.c | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libfprint/drivers/goodixmoc/goodix_proto.c b/libfprint/drivers/goodixmoc/goodix_proto.c
|
||||
index b615dba..72511a8 100644
|
||||
--- a/libfprint/drivers/goodixmoc/goodix_proto.c
|
||||
+++ b/libfprint/drivers/goodixmoc/goodix_proto.c
|
||||
@@ -393,10 +393,8 @@ gx_proto_parse_body (uint16_t cmd, uint8_t *buffer, uint16_t buffer_len, pgxfp_c
|
||||
fingerid_length,
|
||||
&presp->finger_list_resp.finger_list[num]) != 0)
|
||||
{
|
||||
- g_error ("parse fingerlist error");
|
||||
- presp->finger_list_resp.finger_num = 0;
|
||||
- presp->result = GX_FAILED;
|
||||
- break;
|
||||
+ g_warning ("Failed to parse finger list");
|
||||
+ return -1;
|
||||
}
|
||||
offset += fingerid_length;
|
||||
}
|
||||
Binary file not shown.
-42
@@ -1,42 +0,0 @@
|
||||
From: Lv Ying <lvying.system.thoughts@gmail.com>
|
||||
Date: Sat, 17 Sep 2022 13:59:11 +0800
|
||||
Subject: goodixmoc: add PID 0x6014
|
||||
|
||||
Signed-off-by: Lv Ying <lvying.system.thoughts@gmail.com>
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/goodixmoc/goodix.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index ca2435a..5291831 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -159,6 +159,7 @@ usb:v1C7Ap0603*
|
||||
|
||||
# Supported by libfprint driver goodixmoc
|
||||
usb:v27C6p5840*
|
||||
+usb:v27C6p6014*
|
||||
usb:v27C6p6094*
|
||||
usb:v27C6p609C*
|
||||
usb:v27C6p60A2*
|
||||
diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c
|
||||
index b894feb..0686856 100644
|
||||
--- a/libfprint/drivers/goodixmoc/goodix.c
|
||||
+++ b/libfprint/drivers/goodixmoc/goodix.c
|
||||
@@ -1359,6 +1359,7 @@ gx_fp_probe (FpDevice *device)
|
||||
{
|
||||
case 0x6496:
|
||||
case 0x60A2:
|
||||
+ case 0x6014:
|
||||
case 0x6094:
|
||||
case 0x609C:
|
||||
case 0x631C:
|
||||
@@ -1600,6 +1601,7 @@ fpi_device_goodixmoc_init (FpiDeviceGoodixMoc *self)
|
||||
|
||||
static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x27c6, .pid = 0x5840, },
|
||||
+ { .vid = 0x27c6, .pid = 0x6014, },
|
||||
{ .vid = 0x27c6, .pid = 0x6094, },
|
||||
{ .vid = 0x27c6, .pid = 0x609C, },
|
||||
{ .vid = 0x27c6, .pid = 0x60A2, },
|
||||
-41
@@ -1,41 +0,0 @@
|
||||
From: mahaosen <mahaosen@goodix.com>
|
||||
Date: Sat, 13 Aug 2022 17:28:37 +0800
|
||||
Subject: goodixmoc: add PID 0x631C
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/goodixmoc/goodix.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index 5977aa8..1181d52 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -161,6 +161,7 @@ usb:v1C7Ap0603*
|
||||
usb:v27C6p5840*
|
||||
usb:v27C6p609C*
|
||||
usb:v27C6p60A2*
|
||||
+usb:v27C6p631C*
|
||||
usb:v27C6p6384*
|
||||
usb:v27C6p639C*
|
||||
usb:v27C6p63AC*
|
||||
diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c
|
||||
index a99c564..0fc17e9 100644
|
||||
--- a/libfprint/drivers/goodixmoc/goodix.c
|
||||
+++ b/libfprint/drivers/goodixmoc/goodix.c
|
||||
@@ -1360,6 +1360,7 @@ gx_fp_probe (FpDevice *device)
|
||||
case 0x6496:
|
||||
case 0x60A2:
|
||||
case 0x609C:
|
||||
+ case 0x631C:
|
||||
case 0x6384:
|
||||
case 0x639C:
|
||||
case 0x63AC:
|
||||
@@ -1599,6 +1600,7 @@ static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x27c6, .pid = 0x5840, },
|
||||
{ .vid = 0x27c6, .pid = 0x609C, },
|
||||
{ .vid = 0x27c6, .pid = 0x60A2, },
|
||||
+ { .vid = 0x27c6, .pid = 0x631C, },
|
||||
{ .vid = 0x27c6, .pid = 0x6384, },
|
||||
{ .vid = 0x27c6, .pid = 0x639C, },
|
||||
{ .vid = 0x27c6, .pid = 0x63AC, },
|
||||
-41
@@ -1,41 +0,0 @@
|
||||
From: mahaosen <mahaosen@goodix.com>
|
||||
Date: Fri, 26 Aug 2022 16:46:16 +0800
|
||||
Subject: goodixmoc: add PID 0x634C
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/goodixmoc/goodix.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index 7d18ce8..e25b026 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -162,6 +162,7 @@ usb:v27C6p5840*
|
||||
usb:v27C6p609C*
|
||||
usb:v27C6p60A2*
|
||||
usb:v27C6p631C*
|
||||
+usb:v27C6p634C*
|
||||
usb:v27C6p6384*
|
||||
usb:v27C6p639C*
|
||||
usb:v27C6p63AC*
|
||||
diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c
|
||||
index 0fc17e9..574f19c 100644
|
||||
--- a/libfprint/drivers/goodixmoc/goodix.c
|
||||
+++ b/libfprint/drivers/goodixmoc/goodix.c
|
||||
@@ -1361,6 +1361,7 @@ gx_fp_probe (FpDevice *device)
|
||||
case 0x60A2:
|
||||
case 0x609C:
|
||||
case 0x631C:
|
||||
+ case 0x634C:
|
||||
case 0x6384:
|
||||
case 0x639C:
|
||||
case 0x63AC:
|
||||
@@ -1601,6 +1602,7 @@ static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x27c6, .pid = 0x609C, },
|
||||
{ .vid = 0x27c6, .pid = 0x60A2, },
|
||||
{ .vid = 0x27c6, .pid = 0x631C, },
|
||||
+ { .vid = 0x27c6, .pid = 0x634C, },
|
||||
{ .vid = 0x27c6, .pid = 0x6384, },
|
||||
{ .vid = 0x27c6, .pid = 0x639C, },
|
||||
{ .vid = 0x27c6, .pid = 0x63AC, },
|
||||
-42
@@ -1,42 +0,0 @@
|
||||
From: Marcus Pfeffer <marcus.pfeffer@web.de>
|
||||
Date: Wed, 22 Jun 2022 10:05:25 +0200
|
||||
Subject: goodixmoc: add PID 0x6384
|
||||
|
||||
Closes: #489
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/goodixmoc/goodix.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index e1b9f3c..6e53964 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -159,6 +159,7 @@ usb:v1C7Ap0603*
|
||||
usb:v27C6p5840*
|
||||
usb:v27C6p609C*
|
||||
usb:v27C6p60A2*
|
||||
+usb:v27C6p6384*
|
||||
usb:v27C6p639C*
|
||||
usb:v27C6p63AC*
|
||||
usb:v27C6p63BC*
|
||||
diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c
|
||||
index 595b19b..a99c564 100644
|
||||
--- a/libfprint/drivers/goodixmoc/goodix.c
|
||||
+++ b/libfprint/drivers/goodixmoc/goodix.c
|
||||
@@ -1360,6 +1360,7 @@ gx_fp_probe (FpDevice *device)
|
||||
case 0x6496:
|
||||
case 0x60A2:
|
||||
case 0x609C:
|
||||
+ case 0x6384:
|
||||
case 0x639C:
|
||||
case 0x63AC:
|
||||
case 0x63BC:
|
||||
@@ -1598,6 +1599,7 @@ static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x27c6, .pid = 0x5840, },
|
||||
{ .vid = 0x27c6, .pid = 0x609C, },
|
||||
{ .vid = 0x27c6, .pid = 0x60A2, },
|
||||
+ { .vid = 0x27c6, .pid = 0x6384, },
|
||||
{ .vid = 0x27c6, .pid = 0x639C, },
|
||||
{ .vid = 0x27c6, .pid = 0x63AC, },
|
||||
{ .vid = 0x27c6, .pid = 0x63BC, },
|
||||
-41
@@ -1,41 +0,0 @@
|
||||
From: yangdi <yangdi@goodix.com>
|
||||
Date: Tue, 19 Jul 2022 11:37:09 +0800
|
||||
Subject: goodixmoc: add PID 0x659A
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/goodixmoc/goodix.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index 9e462e7..e1b9f3c 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -168,6 +168,7 @@ usb:v27C6p6584*
|
||||
usb:v27C6p658C*
|
||||
usb:v27C6p6592*
|
||||
usb:v27C6p6594*
|
||||
+usb:v27C6p659A*
|
||||
usb:v27C6p659C*
|
||||
usb:v27C6p6A94*
|
||||
ID_AUTOSUSPEND=1
|
||||
diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c
|
||||
index ab84130..595b19b 100644
|
||||
--- a/libfprint/drivers/goodixmoc/goodix.c
|
||||
+++ b/libfprint/drivers/goodixmoc/goodix.c
|
||||
@@ -1365,6 +1365,7 @@ gx_fp_probe (FpDevice *device)
|
||||
case 0x63BC:
|
||||
case 0x63CC:
|
||||
case 0x6A94:
|
||||
+ case 0x659A:
|
||||
self->max_enroll_stage = 12;
|
||||
break;
|
||||
|
||||
@@ -1606,6 +1607,7 @@ static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x27c6, .pid = 0x658C, },
|
||||
{ .vid = 0x27c6, .pid = 0x6592, },
|
||||
{ .vid = 0x27c6, .pid = 0x6594, },
|
||||
+ { .vid = 0x27c6, .pid = 0x659A, },
|
||||
{ .vid = 0x27c6, .pid = 0x659C, },
|
||||
{ .vid = 0x27c6, .pid = 0x6A94, },
|
||||
{ .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */
|
||||
-41
@@ -1,41 +0,0 @@
|
||||
From: "Paulo E. Castro" <pecastro@wormholenet.com>
|
||||
Date: Mon, 18 Jul 2022 19:32:23 +0100
|
||||
Subject: goodixmoc: add PID 6094
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/goodixmoc/goodix.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index e25b026..d8127c3 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -159,6 +159,7 @@ usb:v1C7Ap0603*
|
||||
|
||||
# Supported by libfprint driver goodixmoc
|
||||
usb:v27C6p5840*
|
||||
+usb:v27C6p6094*
|
||||
usb:v27C6p609C*
|
||||
usb:v27C6p60A2*
|
||||
usb:v27C6p631C*
|
||||
diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c
|
||||
index 574f19c..b894feb 100644
|
||||
--- a/libfprint/drivers/goodixmoc/goodix.c
|
||||
+++ b/libfprint/drivers/goodixmoc/goodix.c
|
||||
@@ -1359,6 +1359,7 @@ gx_fp_probe (FpDevice *device)
|
||||
{
|
||||
case 0x6496:
|
||||
case 0x60A2:
|
||||
+ case 0x6094:
|
||||
case 0x609C:
|
||||
case 0x631C:
|
||||
case 0x634C:
|
||||
@@ -1599,6 +1600,7 @@ fpi_device_goodixmoc_init (FpiDeviceGoodixMoc *self)
|
||||
|
||||
static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x27c6, .pid = 0x5840, },
|
||||
+ { .vid = 0x27c6, .pid = 0x6094, },
|
||||
{ .vid = 0x27c6, .pid = 0x609C, },
|
||||
{ .vid = 0x27c6, .pid = 0x60A2, },
|
||||
{ .vid = 0x27c6, .pid = 0x631C, },
|
||||
Vendored
-24
@@ -1,24 +0,0 @@
|
||||
tod-Add-wrapper-for-goodix-tod-not-handling-identificatio.patch
|
||||
fpi-device-Avoid-using-device-action-strings.patch
|
||||
elanmoc-add-PID-0x0c82.patch
|
||||
elanmoc-add-PID-0x0c88.patch
|
||||
synaptics-Add-new-PID-0x0168.patch
|
||||
elan-add-PID-0x0c4b.patch
|
||||
elanspi-add-04f3-241f.patch
|
||||
synaptics-Add-new-PID-0x015F.patch
|
||||
goodix-Reset-device-if-storage-listing-fails.patch
|
||||
goodix-Make-fingerlist-parse-error-non-fatal.patch
|
||||
elanmoc-Make-sure-sensor-in-the-right-mode-at-identity.patch
|
||||
goodixmoc-add-PID-0x659A.patch
|
||||
goodixmoc-add-PID-0x6384.patch
|
||||
elanmoc-add-PID-0x0c8c-0x0c8d.patch
|
||||
goodixmoc-add-PID-0x631C.patch
|
||||
synaptics-Add-new-PID-0x0104.patch
|
||||
goodixmoc-add-PID-0x634C.patch
|
||||
goodixmoc-add-PID-6094.patch
|
||||
upek-add-PID-0x2017.patch
|
||||
Update-autosuspend.hwdb.patch
|
||||
goodixmoc-add-PID-0x6014.patch
|
||||
goodix-Lower-poor-capture-warnings-to-debug-message.patch
|
||||
synaptics-goodix-Properly-check-for-finger-status-during-.patch
|
||||
tests-Ensure-python-tests-exit-with-error-on-every-except.patch
|
||||
@@ -1,33 +0,0 @@
|
||||
From: Aris Lin <Aris.Lin@synaptics.com>
|
||||
Date: Sun, 7 Aug 2022 09:29:51 +0800
|
||||
Subject: synaptics: Add new PID 0x0104
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/synaptics/synaptics.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index 1181d52..7d18ce8 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -197,6 +197,7 @@ usb:v06CBp0126*
|
||||
usb:v06CBp0129*
|
||||
usb:v06CBp0168*
|
||||
usb:v06CBp015F*
|
||||
+usb:v06CBp0104*
|
||||
ID_AUTOSUSPEND=1
|
||||
ID_PERSIST=0
|
||||
|
||||
diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
|
||||
index effdaac..18f0377 100644
|
||||
--- a/libfprint/drivers/synaptics/synaptics.c
|
||||
+++ b/libfprint/drivers/synaptics/synaptics.c
|
||||
@@ -44,6 +44,7 @@ static const FpIdEntry id_table[] = {
|
||||
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0129, },
|
||||
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0168, },
|
||||
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0x015F, },
|
||||
+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0104, },
|
||||
{ .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */
|
||||
};
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From: Aris Lin <Aris.Lin@synaptics.com>
|
||||
Date: Mon, 23 May 2022 21:06:23 +0800
|
||||
Subject: synaptics: Add new PID 0x015F
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/synaptics/synaptics.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index 49fcacf..9e462e7 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -191,6 +191,7 @@ usb:v06CBp0123*
|
||||
usb:v06CBp0126*
|
||||
usb:v06CBp0129*
|
||||
usb:v06CBp0168*
|
||||
+usb:v06CBp015F*
|
||||
ID_AUTOSUSPEND=1
|
||||
ID_PERSIST=0
|
||||
|
||||
diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
|
||||
index b89989b..effdaac 100644
|
||||
--- a/libfprint/drivers/synaptics/synaptics.c
|
||||
+++ b/libfprint/drivers/synaptics/synaptics.c
|
||||
@@ -43,6 +43,7 @@ static const FpIdEntry id_table[] = {
|
||||
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0126, },
|
||||
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0129, },
|
||||
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0168, },
|
||||
+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x015F, },
|
||||
{ .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */
|
||||
};
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From: Aris Lin <Aris.Lin@synaptics.com>
|
||||
Date: Wed, 6 Apr 2022 14:17:34 +0800
|
||||
Subject: synaptics: Add new PID 0x0168
|
||||
|
||||
---
|
||||
data/autosuspend.hwdb | 1 +
|
||||
libfprint/drivers/synaptics/synaptics.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
|
||||
index 725c602..c305c44 100644
|
||||
--- a/data/autosuspend.hwdb
|
||||
+++ b/data/autosuspend.hwdb
|
||||
@@ -189,6 +189,7 @@ usb:v06CBp0103*
|
||||
usb:v06CBp0123*
|
||||
usb:v06CBp0126*
|
||||
usb:v06CBp0129*
|
||||
+usb:v06CBp0168*
|
||||
ID_AUTOSUSPEND=1
|
||||
ID_PERSIST=0
|
||||
|
||||
diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
|
||||
index 7a2c6eb..b89989b 100644
|
||||
--- a/libfprint/drivers/synaptics/synaptics.c
|
||||
+++ b/libfprint/drivers/synaptics/synaptics.c
|
||||
@@ -42,6 +42,7 @@ static const FpIdEntry id_table[] = {
|
||||
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0123, },
|
||||
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0126, },
|
||||
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0129, },
|
||||
+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0168, },
|
||||
{ .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */
|
||||
};
|
||||
|
||||
-40
@@ -1,40 +0,0 @@
|
||||
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
|
||||
Date: Wed, 28 Sep 2022 01:21:31 +0200
|
||||
Subject: synaptics,
|
||||
goodix: Properly check for finger status during enroll progress
|
||||
|
||||
It may contain other values, but for sure we finger must be neeeded
|
||||
---
|
||||
tests/goodixmoc/custom.py | 2 +-
|
||||
tests/synaptics/custom.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
mode change 100755 => 100644 tests/goodixmoc/custom.py
|
||||
|
||||
diff --git a/tests/goodixmoc/custom.py b/tests/goodixmoc/custom.py
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
index 38fdd26..73f90a5
|
||||
--- a/tests/goodixmoc/custom.py
|
||||
+++ b/tests/goodixmoc/custom.py
|
||||
@@ -31,7 +31,7 @@ d.clear_storage_sync()
|
||||
template = FPrint.Print.new(d)
|
||||
|
||||
def enroll_progress(*args):
|
||||
- assert d.get_finger_status() == FPrint.FingerStatusFlags.NEEDED
|
||||
+ assert d.get_finger_status() & FPrint.FingerStatusFlags.NEEDED
|
||||
print('enroll progress: ' + str(args))
|
||||
|
||||
def identify_done(dev, res):
|
||||
diff --git a/tests/synaptics/custom.py b/tests/synaptics/custom.py
|
||||
index 3e48341..dae651b 100755
|
||||
--- a/tests/synaptics/custom.py
|
||||
+++ b/tests/synaptics/custom.py
|
||||
@@ -29,7 +29,7 @@ d.clear_storage_sync()
|
||||
template = FPrint.Print.new(d)
|
||||
|
||||
def enroll_progress(*args):
|
||||
- assert d.get_finger_status() == FPrint.FingerStatusFlags.NEEDED
|
||||
+ assert d.get_finger_status() & FPrint.FingerStatusFlags.NEEDED
|
||||
print('enroll progress: ' + str(args))
|
||||
|
||||
# List, enroll, list, verify, delete, list
|
||||
-110
@@ -1,110 +0,0 @@
|
||||
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
|
||||
Date: Wed, 28 Sep 2022 01:22:15 +0200
|
||||
Subject: tests: Ensure python tests exit with error on every exception
|
||||
|
||||
We ignored assertions happening on callbacks as they only raise
|
||||
exceptions that does not stop the execution.
|
||||
|
||||
So ensure that this is happening in all the tests as synaptics was
|
||||
doing already
|
||||
---
|
||||
tests/capture.py | 9 +++++++--
|
||||
tests/elanmoc/custom.py | 6 ++++++
|
||||
tests/goodixmoc/custom.py | 6 ++++++
|
||||
tests/virtual-device.py | 3 +++
|
||||
tests/virtual-image.py | 3 +++
|
||||
5 files changed, 25 insertions(+), 2 deletions(-)
|
||||
mode change 100644 => 100755 tests/goodixmoc/custom.py
|
||||
|
||||
diff --git a/tests/capture.py b/tests/capture.py
|
||||
index c25afbf..d6573a8 100755
|
||||
--- a/tests/capture.py
|
||||
+++ b/tests/capture.py
|
||||
@@ -1,10 +1,15 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
+import cairo
|
||||
+import sys
|
||||
+import traceback
|
||||
import gi
|
||||
+
|
||||
gi.require_version('FPrint', '2.0')
|
||||
from gi.repository import FPrint, GLib
|
||||
-import cairo
|
||||
-import sys
|
||||
+
|
||||
+# Exit with error on any exception, included those happening in async callbacks
|
||||
+sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
|
||||
|
||||
if len(sys.argv) != 2:
|
||||
print("Please specify exactly one argument, the output location for the capture image")
|
||||
diff --git a/tests/elanmoc/custom.py b/tests/elanmoc/custom.py
|
||||
index c64414c..1a3b8b3 100755
|
||||
--- a/tests/elanmoc/custom.py
|
||||
+++ b/tests/elanmoc/custom.py
|
||||
@@ -1,9 +1,15 @@
|
||||
#!/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()
|
||||
diff --git a/tests/goodixmoc/custom.py b/tests/goodixmoc/custom.py
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index 73f90a5..aee4391
|
||||
--- a/tests/goodixmoc/custom.py
|
||||
+++ b/tests/goodixmoc/custom.py
|
||||
@@ -1,9 +1,15 @@
|
||||
#!/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()
|
||||
diff --git a/tests/virtual-device.py b/tests/virtual-device.py
|
||||
index e15b432..beec97f 100644
|
||||
--- a/tests/virtual-device.py
|
||||
+++ b/tests/virtual-device.py
|
||||
@@ -22,6 +22,9 @@ except Exception as e:
|
||||
|
||||
FPrint = None
|
||||
|
||||
+# 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()
|
||||
|
||||
|
||||
diff --git a/tests/virtual-image.py b/tests/virtual-image.py
|
||||
index e4a464e..5563003 100755
|
||||
--- a/tests/virtual-image.py
|
||||
+++ b/tests/virtual-image.py
|
||||
@@ -21,6 +21,9 @@ except Exception as e:
|
||||
|
||||
FPrint = None
|
||||
|
||||
+# Exit with error on any exception, included those happening in async callbacks
|
||||
+sys.excepthook = lambda *args: (traceback.print_exception(*args), sys.exit(1))
|
||||
+
|
||||
def load_image(img):
|
||||
png = cairo.ImageSurface.create_from_png(img)
|
||||
|
||||
-149
@@ -1,149 +0,0 @@
|
||||
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
|
||||
Date: Sun, 17 Jul 2022 17:13:07 +0200
|
||||
Subject: tod: Add wrapper for goodix-tod not handling identification with no
|
||||
prints
|
||||
|
||||
Newer fprintd supports duplicate-detection, this implies sending to the
|
||||
device an empty prints gallery, expecting the device to give us a
|
||||
matched print against its storage.
|
||||
|
||||
In case the device has no storage we're doing this anyway, but goodix
|
||||
doesn't handle this properly, so let's just ignore the case if no prints
|
||||
are passed.
|
||||
|
||||
LP: #1966911
|
||||
---
|
||||
libfprint/tod/meson.build | 1 +
|
||||
libfprint/tod/tod-goodix-wrapper.c | 56 ++++++++++++++++++++++++++++++++++++++
|
||||
libfprint/tod/tod-goodix-wrapper.h | 24 ++++++++++++++++
|
||||
libfprint/tod/tod-shared-loader.c | 4 +++
|
||||
4 files changed, 85 insertions(+)
|
||||
create mode 100644 libfprint/tod/tod-goodix-wrapper.c
|
||||
create mode 100644 libfprint/tod/tod-goodix-wrapper.h
|
||||
|
||||
diff --git a/libfprint/tod/meson.build b/libfprint/tod/meson.build
|
||||
index 10c49e4..f3ca0cf 100644
|
||||
--- a/libfprint/tod/meson.build
|
||||
+++ b/libfprint/tod/meson.build
|
||||
@@ -19,6 +19,7 @@ mapfile = configure_file(input: 'libfprint-tod.ver.in',
|
||||
libfprint_tod_private = static_library('fprint-tod-private',
|
||||
sources: [
|
||||
'tod-shared-loader.c',
|
||||
+ 'tod-goodix-wrapper.c',
|
||||
],
|
||||
include_directories: include_directories('..'),
|
||||
link_with: libfprint_private,
|
||||
diff --git a/libfprint/tod/tod-goodix-wrapper.c b/libfprint/tod/tod-goodix-wrapper.c
|
||||
new file mode 100644
|
||||
index 0000000..45a58cf
|
||||
--- /dev/null
|
||||
+++ b/libfprint/tod/tod-goodix-wrapper.c
|
||||
@@ -0,0 +1,56 @@
|
||||
+/*
|
||||
+ * Shared library loader for libfprint
|
||||
+ * Copyright (C) 2022 Marco Trevisan <marco.trevisan@canonical.com>
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ */
|
||||
+
|
||||
+#include "fp-device-private.h"
|
||||
+#include "fpi-device.h"
|
||||
+#define FP_COMPONENT "tod"
|
||||
+
|
||||
+#include "tod-goodix-wrapper.h"
|
||||
+
|
||||
+static void (*goodix_moc_identify) (FpDevice *) = NULL;
|
||||
+
|
||||
+static void
|
||||
+goodix_tod_identify_wrapper (FpDevice *device)
|
||||
+{
|
||||
+ GPtrArray *prints;
|
||||
+
|
||||
+ fpi_device_get_identify_data (device, &prints);
|
||||
+
|
||||
+ if (prints->len)
|
||||
+ return goodix_moc_identify (device);
|
||||
+
|
||||
+ g_warning ("%s does not support identify with empty gallery, let's skip it",
|
||||
+ fp_device_get_name (device));
|
||||
+
|
||||
+ fpi_device_identify_report (device, NULL, NULL, NULL);
|
||||
+ fpi_device_identify_complete (device, NULL);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+goodix_tod_wrapper_init (FpDeviceClass *device_class)
|
||||
+{
|
||||
+ g_assert (g_strcmp0 (device_class->id, "goodix-tod") == 0);
|
||||
+ g_assert (goodix_moc_identify == NULL);
|
||||
+
|
||||
+ g_message ("Creating TOD wrapper for %s (%s) driver",
|
||||
+ device_class->id, device_class->full_name);
|
||||
+
|
||||
+ goodix_moc_identify = device_class->identify;
|
||||
+ device_class->identify = goodix_tod_identify_wrapper;
|
||||
+}
|
||||
diff --git a/libfprint/tod/tod-goodix-wrapper.h b/libfprint/tod/tod-goodix-wrapper.h
|
||||
new file mode 100644
|
||||
index 0000000..802e696
|
||||
--- /dev/null
|
||||
+++ b/libfprint/tod/tod-goodix-wrapper.h
|
||||
@@ -0,0 +1,24 @@
|
||||
+/*
|
||||
+ * Shared library loader for libfprint
|
||||
+ * Copyright (C) 2022 Marco Trevisan <marco.trevisan@canonical.com>
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ */
|
||||
+
|
||||
+#pragma once
|
||||
+
|
||||
+#include "drivers_api.h"
|
||||
+
|
||||
+void goodix_tod_wrapper_init (FpDeviceClass *device_class);
|
||||
diff --git a/libfprint/tod/tod-shared-loader.c b/libfprint/tod/tod-shared-loader.c
|
||||
index d214aeb..fc18b6d 100644
|
||||
--- a/libfprint/tod/tod-shared-loader.c
|
||||
+++ b/libfprint/tod/tod-shared-loader.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <gmodule.h>
|
||||
|
||||
#include "tod-shared-loader.h"
|
||||
+#include "tod-goodix-wrapper.h"
|
||||
#include "fpi-device.h"
|
||||
#include "fpi-log.h"
|
||||
#include "tod-config.h"
|
||||
@@ -131,6 +132,9 @@ fpi_tod_shared_drivers_register (void)
|
||||
{
|
||||
g_debug ("Initializing features for driver %s", cls->id);
|
||||
fpi_device_class_auto_initialize_features (cls);
|
||||
+
|
||||
+ if (g_strcmp0 (cls->id, "goodix-tod") == 0)
|
||||
+ goodix_tod_wrapper_init (cls);
|
||||
}
|
||||
|
||||
shared_modules = g_list_prepend (shared_modules,
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
From: mbv06 <mbv06.dev@gmail.com>
|
||||
Date: Mon, 26 Sep 2022 10:38:17 +0000
|
||||
Subject: upek: add PID 0x2017
|
||||
|
||||
---
|
||||
libfprint/drivers/upektc.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c
|
||||
index 115e6b6..3f7b6a6 100644
|
||||
--- a/libfprint/drivers/upektc.c
|
||||
+++ b/libfprint/drivers/upektc.c
|
||||
@@ -431,6 +431,7 @@ dev_deinit (FpImageDevice *dev)
|
||||
|
||||
static const FpIdEntry id_table[] = {
|
||||
{ .vid = 0x0483, .pid = 0x2015, .driver_data = UPEKTC_2015 },
|
||||
+ { .vid = 0x0483, .pid = 0x2017, .driver_data = UPEKTC_2015 },
|
||||
{ .vid = 0x147e, .pid = 0x3001, .driver_data = UPEKTC_3001 },
|
||||
{ .vid = 0, .pid = 0, .driver_data = 0 },
|
||||
};
|
||||
Reference in New Issue
Block a user