elan: Add ID for T-Bao TBook 12 Air reader (04f3:0c16)

Tested by Hans de Goede <hdegoede@redhat.com>

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
 
 
 before_script:
-  - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES && rpm -Uvh --oldpackage https://kojipkgs.fedoraproject.org//packages/meson/0.46.1/2.fc29/noarch/meson-0.46.1-2.fc29.noarch.rpm
+  - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
 
 
 build:

NEWS

@@ -1,17 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.
 
-2018-07-15: v0.8.2 release
-* Drivers:
-  - Add USB ID for TNP Nano USB Fingerprint Reader
-  - Fix UPEKTS enrollment never finishing on some devices
-
-* Library:
-  - Fix fp_get_pollfds() retval type, a small ABI change
-  - Downgrade fatal errors to run-time warnings, as a number of drivers
-    used to throw silent errors and we made them fatal. Those will now
-    be visible warnings, hopefully helping with fixing them.
-
 2018-06-12: v0.8.1 release
 - Brown paperbag release to install the udev rules file in the correct
   directory if the udev pkg-config file doesn't have a trailing slash

libfprint/drivers/elan.c

@@ -604,6 +604,7 @@ static void dev_deactivate(struct fp_img_dev *dev)
 static const struct usb_id id_table[] = {
 	{.vendor = 0x04f3,.product = 0x0907},
 	{.vendor = 0x04f3,.product = 0x0c26},
+	{.vendor = 0x04f3,.product = 0x0c16},
 	{0, 0, 0,},
 };
 

libfprint/drivers/upekts.c

@@ -1018,9 +1018,6 @@ static void e_handle_resp00(struct fp_dev *dev, unsigned char *data,
 	case 0x0c:
 	case 0x0d:
 	case 0x0e:
-	case 0x26:
-	case 0x27:
-	case 0x2e:
 		/* if we previously completed a non-last enrollment stage, we'll
 		 * get this code to indicate successful stage completion */
 		if (upekdev->enroll_passed) {

libfprint/drivers_api.h

@@ -40,16 +40,10 @@
 #define fp_dbg g_debug
 #define fp_info g_debug
 #define fp_warn g_warning
-#define fp_err g_warning
+#define fp_err g_error
 
-#define BUG_ON(condition) G_STMT_START		\
-	if (condition) {			\
-		char *s;			\
-		s = g_strconcat ("BUG: (", #condition, ")", NULL); \
-		g_warning ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
-		g_free (s);			\
-	} G_STMT_END
-#define BUG() BUG_ON(1)
+#define BUG_ON(condition) g_assert(!(condition))
+#define BUG() g_assert_not_reached()
 
 enum fp_dev_state {
 	DEV_STATE_INITIAL = 0,

libfprint/fp_internal.h

@@ -42,16 +42,10 @@
 #define fp_dbg g_debug
 #define fp_info g_debug
 #define fp_warn g_warning
-#define fp_err g_warning
+#define fp_err g_error
 
-#define BUG_ON(condition) G_STMT_START		\
-	if (condition) {			\
-		char *s;			\
-		s = g_strconcat ("BUG: (", #condition, ")", NULL); \
-		g_warning ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
-		g_free (s);			\
-	} G_STMT_END
-#define BUG() BUG_ON(1)
+#define BUG_ON(condition) g_assert(!(condition))
+#define BUG() g_assert_not_reached()
 
 enum fp_dev_state {
 	DEV_STATE_INITIAL = 0,

libfprint/fprint.h

@@ -314,7 +314,7 @@ struct fp_pollfd {
 
 int fp_handle_events_timeout(struct timeval *timeout);
 int fp_handle_events(void);
-ssize_t fp_get_pollfds(struct fp_pollfd **pollfds);
+size_t fp_get_pollfds(struct fp_pollfd **pollfds);
 int fp_get_next_timeout(struct timeval *tv);
 
 /**

libfprint/poll.c

@@ -313,12 +313,12 @@ API_EXPORTED int fp_get_next_timeout(struct timeval *tv)
  *
  * Returns: the number of pollfds in the resultant list, or negative on error.
  */
-API_EXPORTED ssize_t fp_get_pollfds(struct fp_pollfd **pollfds)
+API_EXPORTED size_t fp_get_pollfds(struct fp_pollfd **pollfds)
 {
 	const struct libusb_pollfd **usbfds;
 	const struct libusb_pollfd *usbfd;
 	struct fp_pollfd *ret;
-	ssize_t cnt = 0;
+	size_t cnt = 0;
 	size_t i = 0;
 
 	usbfds = libusb_get_pollfds(fpi_usb_ctx);

meson.build

@@ -1,5 +1,5 @@
 project('libfprint', [ 'c', 'cpp' ],
-        version: '0.8.2',
+        version: '0.8.1',
         license: 'LGPLv2.1+',
         default_options: [
           'buildtype=debugoptimized',