Add EgisTec ES603 driver

This driver handles EgisTec ES603 device, ID 1c7a:0603

configure.ac

@@ -23,7 +23,7 @@ AC_SUBST(lt_major)
 AC_SUBST(lt_revision)
 AC_SUBST(lt_age)
 
-all_drivers="upekts upektc upeksonly vcom5s uru4000 fdu2000 aes1610 aes1660 aes2501 aes2550 aes2660 aes3500 aes4000 vfs101 vfs301 upektc_img"
+all_drivers="upekts upektc upeksonly vcom5s uru4000 fdu2000 aes1610 aes1660 aes2501 aes2550 aes2660 aes3500 aes4000 vfs101 vfs301 upektc_img etes603"
 
 require_imaging='no'
 require_aeslib='no'
@@ -46,6 +46,7 @@ enable_aes4000='no'
 enable_vfs101='no'
 enable_vfs301='no'
 enable_upektc_img='no'
+enable_etes603='no'
 
 AC_ARG_WITH([drivers],[AS_HELP_STRING([--with-drivers],
 	[List of drivers to enable])],
@@ -140,6 +141,10 @@ for driver in `echo ${drivers} | sed -e 's/,/ /g' -e 's/,$//g'`; do
 			AC_DEFINE([ENABLE_UPEKTC_IMG], [], [Build Upek TouchChip Fingerprint Coprocessor driver])
 			enable_upektc_img="yes"
 		;;
+		etes603)
+			AC_DEFINE([ENABLE_ETES603], [], [Build EgisTec ES603 driver])
+			enable_etes603="yes"
+		;;
 	esac
 done
 
@@ -163,6 +168,7 @@ AM_CONDITIONAL([REQUIRE_AES3K], [test "$require_aes3k" = "yes"])
 AM_CONDITIONAL([ENABLE_VFS101], [test "$enable_vfs101" = "yes"])
 AM_CONDITIONAL([ENABLE_VFS301], [test "$enable_vfs301" = "yes"])
 AM_CONDITIONAL([ENABLE_UPEKTC_IMG], [test "$enable_upektc_img" = "yes"])
+AM_CONDITIONAL([ENABLE_ETES603], [test "$enable_etes603" = "yes"])
 
 
 PKG_CHECK_MODULES(LIBUSB, [libusb-1.0 >= 0.9.1])
@@ -384,6 +390,11 @@ if test x$enable_upektc_img != xno ; then
 else
 	AC_MSG_NOTICE([   upektc_img driver disabled])
 fi
+if test x$enable_etes603 != xno ; then
+	AC_MSG_NOTICE([** etes603 driver enabled])
+else
+	AC_MSG_NOTICE([   etes603 driver disabled])
+fi
 if test x$require_aeslib != xno ; then
 	AC_MSG_NOTICE([** aeslib helper functions enabled])
 else

libfprint/Makefile.am

@@ -19,6 +19,7 @@ VCOM5S_SRC = drivers/vcom5s.c
 VFS101_SRC = drivers/vfs101.c
 VFS301_SRC = drivers/vfs301.c drivers/vfs301_proto.c  drivers/vfs301_proto.h drivers/vfs301_proto_fragments.h
 UPEKTC_IMG_SRC = drivers/upektc_img.c drivers/upektc_img.h
+ETES603_SRC = drivers/etes603.c
 
 EXTRA_DIST = \
 	$(UPEKE2_SRC)		\
@@ -38,6 +39,7 @@ EXTRA_DIST = \
 	$(VFS101_SRC)		\
 	$(VFS301_SRC)		\
 	$(UPEKTC_IMG_SRC)	\
+	$(ETES603_SRC)		\
 	drivers/aesx660.c	\
 	drivers/aesx660.h	\
 	drivers/aes3k.c 	\
@@ -171,6 +173,10 @@ if ENABLE_UPEKTC_IMG
 DRIVER_SRC += $(UPEKTC_IMG_SRC)
 endif
 
+if ENABLE_ETES603
+DRIVER_SRC += $(ETES603_SRC)
+endif
+
 if REQUIRE_IMAGEMAGICK
 OTHER_SRC += imagemagick.c
 libfprint_la_CFLAGS += $(IMAGING_CFLAGS)

libfprint/core.c

@@ -392,6 +392,9 @@ static struct fp_img_driver * const img_drivers[] = {
 #ifdef ENABLE_UPEKTC_IMG
 	&upektc_img_driver,
 #endif
+#ifdef ENABLE_ETES603
+	&etes603_driver,
+#endif
 /*#ifdef ENABLE_FDU2000
 	&fdu2000_driver,
 #endif

libfprint/drivers/driver_ids.h

@@ -38,6 +38,7 @@ enum {
 	AES2660_ID	= 15,
 	AES3500_ID	= 16,
 	UPEKTC_IMG_ID	= 17,
+	ETES603_ID	= 18,
 };
 
 #endif

libfprint/fp_internal.h

@@ -299,6 +299,9 @@ extern struct fp_img_driver vfs301_driver;
 #ifdef ENABLE_UPEKTC_IMG
 extern struct fp_img_driver upektc_img_driver;
 #endif
+#ifdef ENABLE_ETES603
+extern struct fp_img_driver etes603_driver;
+#endif
 
 extern libusb_context *fpi_usb_ctx;
 extern GSList *opened_devices;