lib: Use GLib and libusb directly for debug output

Use GLib internally to output debug information, and tell about
libusb's LIBUSB_DEBUG envvar for libusb debug.

fp_set_debug() is now a no-op.

https://bugs.freedesktop.org/show_bug.cgi?id=106552

libfprint/drivers/aes1610.c

@@ -25,6 +25,8 @@
 
 #define FP_COMPONENT "aes1610"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
 
@@ -32,7 +34,6 @@
 
 #include <assembling.h>
 #include <aeslib.h>
-#include <fp_internal.h>
 
 #include "driver_ids.h"
 

libfprint/drivers/aes1660.c

@@ -19,6 +19,8 @@
 
 #define FP_COMPONENT "aes1660"
 
+#include "fp_internal.h"
+
 #include <stdio.h>
 
 #include <errno.h>
@@ -26,7 +28,6 @@
 
 #include <libusb.h>
 
-#include <fp_internal.h>
 
 #include <assembling.h>
 #include <aeslib.h>

libfprint/drivers/aes2501.c

@@ -23,6 +23,8 @@
 
 #define FP_COMPONENT "aes2501"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
 
@@ -30,7 +32,6 @@
 
 #include <assembling.h>
 #include <aeslib.h>
-#include <fp_internal.h>
 
 #include "aes2501.h"
 #include "driver_ids.h"

libfprint/drivers/aes2550.c

@@ -23,6 +23,8 @@
 
 #define FP_COMPONENT "aes2550"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
 
@@ -30,7 +32,6 @@
 
 #include <assembling.h>
 #include <aeslib.h>
-#include <fp_internal.h>
 
 #include "aes2550.h"
 #include "driver_ids.h"

libfprint/drivers/aes2660.c

@@ -19,6 +19,8 @@
 
 #define FP_COMPONENT "aes2660"
 
+#include "fp_internal.h"
+
 #include <stdio.h>
 
 #include <errno.h>
@@ -26,8 +28,6 @@
 
 #include <libusb.h>
 
-#include <fp_internal.h>
-
 #include <assembling.h>
 #include <aeslib.h>
 

libfprint/drivers/aes3500.c

@@ -29,13 +29,14 @@
 
 #define FP_COMPONENT "aes3500"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 
 #include <glib.h>
 #include <libusb.h>
 
 #include <aeslib.h>
-#include <fp_internal.h>
 
 #include "aes3k.h"
 #include "driver_ids.h"

libfprint/drivers/aes3k.c

@@ -36,13 +36,14 @@
 
 #define FP_COMPONENT "aes3k"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 
 #include <glib.h>
 #include <libusb.h>
 
 #include <aeslib.h>
-#include <fp_internal.h>
 
 #include "aes3k.h"
 

libfprint/drivers/aes4000.c

@@ -26,13 +26,14 @@
 
 #define FP_COMPONENT "aes4000"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 
 #include <glib.h>
 #include <libusb.h>
 
 #include <aeslib.h>
-#include <fp_internal.h>
 
 #include "aes3k.h"
 #include "driver_ids.h"

libfprint/drivers/aesx660.c

@@ -23,6 +23,8 @@
 
 #define FP_COMPONENT "aesX660"
 
+#include "fp_internal.h"
+
 #include <stdio.h>
 
 #include <errno.h>
@@ -32,7 +34,6 @@
 
 #include <assembling.h>
 #include <aeslib.h>
-#include <fp_internal.h>
 
 #include "aesx660.h"
 

libfprint/drivers/elan.c

@@ -20,10 +20,11 @@
 
 #define FP_COMPONENT "elan"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <libusb.h>
 #include <assembling.h>
-#include <fp_internal.h>
 #include <fprint.h>
 
 #include "elan.h"

libfprint/drivers/etes603.c

@@ -33,6 +33,10 @@
  *
  */
 
+#define FP_COMPONENT "etes603"
+
+#include "fp_internal.h"
+
 #include <string.h>
 #include <stdint.h>
 #include <stdarg.h>
@@ -41,8 +45,6 @@
 #include <libusb.h>
 #include <glib.h>
 
-#define FP_COMPONENT "etes603"
-#include <fp_internal.h>
 #include "driver_ids.h"
 
 /* libusb defines */

libfprint/drivers/fdu2000.c

@@ -17,15 +17,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define FP_COMPONENT "fdu2000"
+
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <libusb.h>
 
-#define FP_COMPONENT "fdu2000"
-#include <fp_internal.h>
-
 #include "driver_ids.h"
 
 #ifndef HAVE_MEMMEM

libfprint/drivers/upeksonly.c

@@ -25,14 +25,14 @@
 
 #define FP_COMPONENT "upeksonly"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
 
 #include <glib.h>
 #include <libusb.h>
 
-#include <fp_internal.h>
-
 #include <assembling.h>
 
 #include "upeksonly.h"

libfprint/drivers/upektc.c

@@ -20,10 +20,11 @@
 
 #define FP_COMPONENT "upektc"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
 #include <libusb.h>
-#include <fp_internal.h>
 
 #include "upektc.h"
 #include "driver_ids.h"

libfprint/drivers/upektc_img.c

@@ -19,13 +19,14 @@
 
 #define FP_COMPONENT "upektc_img"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
 
 #include <libusb.h>
 
 #include <aeslib.h>
-#include <fp_internal.h>
 
 #include "upektc_img.h"
 #include "driver_ids.h"

libfprint/drivers/upekts.c

@@ -27,14 +27,14 @@
 
 #define FP_COMPONENT "upekts"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
 
 #include <glib.h>
 #include <libusb.h>
 
-#include <fp_internal.h>
-
 #include "driver_ids.h"
 
 #define EP_IN (1 | LIBUSB_ENDPOINT_IN)

libfprint/drivers/uru4000.c

@@ -20,6 +20,8 @@
 
 #define FP_COMPONENT "uru4000"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -28,8 +30,6 @@
 #include <pk11pub.h>
 #include <libusb.h>
 
-#include <fp_internal.h>
-
 #include "driver_ids.h"
 
 #define EP_INTR			(1 | LIBUSB_ENDPOINT_IN)

libfprint/drivers/vcom5s.c

@@ -19,6 +19,8 @@
 
 #define FP_COMPONENT "vcom5s"
 
+#include "fp_internal.h"
+
 /* TODO:
  * calibration?
  * image size: windows gets 300x300 through vpas enrollment util?
@@ -32,8 +34,6 @@
 #include <glib.h>
 #include <libusb.h>
 
-#include <fp_internal.h>
-
 #include "driver_ids.h"
 
 #define CTRL_IN 0xc0

libfprint/drivers/vfs0050.c

@@ -19,9 +19,10 @@
 
 #define FP_COMPONENT "vfs0050"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <string.h>
-#include <fp_internal.h>
 #include <assembling.h>
 #include "driver_ids.h"
 

libfprint/drivers/vfs101.c

@@ -17,14 +17,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define FP_COMPONENT "vfs101"
+
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define FP_COMPONENT "vfs101"
-
-#include <fp_internal.h>
-
 #include "driver_ids.h"
 
 /* Input-Output usb endpoint */

libfprint/drivers/vfs301.c

@@ -21,6 +21,8 @@
 
 #define FP_COMPONENT "vfs301"
 
+#include "fp_internal.h"
+
 #include <errno.h>
 #include <signal.h>
 #include <string.h>
@@ -32,8 +34,6 @@
 #include "vfs301_proto.h"
 #include <unistd.h>
 
-#include <fp_internal.h>
-
 #include "driver_ids.h"
 
 /************************** GENERIC STUFF *************************************/