From fb63c39750f0cdabb8447761bb8d4a50842927c5 Mon Sep 17 00:00:00 2001
From: Johnny Li <johnny.li@emc.com.tw>
Date: Mon, 25 Jul 2022 14:11:37 +0800
Subject: [PATCH] elanmoc: add PID 0x0c8c & 0x0c8d

---
 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 60f3d0bc..d755744e 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 5bcfce27..77e22f25 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 312a4b42..a948d401 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;