Add (disabled) UPEK EikonII (TCRD4C) driver

The device driver is always disabled as it uses the same Device ID
as another working reader:
https://bugzilla.redhat.com/show_bug.cgi?id=504399#c38
This commit is contained in:
Jorge Suarez de Lis 2010-08-17 19:36:56 +01:00 committed by Bastien Nocera
parent 7c7402a697
commit 5a1926bb41
5 changed files with 1480 additions and 1 deletions

View file

@ -19,10 +19,11 @@ AC_SUBST(lt_major)
AC_SUBST(lt_revision) AC_SUBST(lt_revision)
AC_SUBST(lt_age) AC_SUBST(lt_age)
all_drivers="upekts upektc upeksonly vcom5s uru4000 fdu2000 aes1610 aes2501 aes4000" all_drivers="upeke2 upekts upektc upeksonly vcom5s uru4000 fdu2000 aes1610 aes2501 aes4000"
require_imaging='no' require_imaging='no'
require_aeslib='no' require_aeslib='no'
enable_upeke2='no'
enable_upekts='no' enable_upekts='no'
enable_upektc='no' enable_upektc='no'
enable_upeksonly='no' enable_upeksonly='no'
@ -44,6 +45,10 @@ for driver in `echo ${drivers} | sed -e 's/,/ /g' -e 's/,$//g'`; do
AC_DEFINE([ENABLE_UPEKTS], [], [Build UPEK TouchStrip driver]) AC_DEFINE([ENABLE_UPEKTS], [], [Build UPEK TouchStrip driver])
enable_upekts="yes" enable_upekts="yes"
;; ;;
upeke2)
AC_DEFINE([ENABLE_UPEKE2], [], [Build UPEK Eikon 2])
enable_upeke2="yes"
;;
upektc) upektc)
AC_DEFINE([ENABLE_UPEKTC], [], [Build UPEK TouchChip driver]) AC_DEFINE([ENABLE_UPEKTC], [], [Build UPEK TouchChip driver])
enable_upektc="yes" enable_upektc="yes"
@ -84,6 +89,7 @@ for driver in `echo ${drivers} | sed -e 's/,/ /g' -e 's/,$//g'`; do
done done
AM_CONDITIONAL([ENABLE_UPEKTS], [test "$enable_upekts" != "no"]) AM_CONDITIONAL([ENABLE_UPEKTS], [test "$enable_upekts" != "no"])
AM_CONDITIONAL([ENABLE_UPEKE2], [test "$enable_upeke2" != "no"])
#AM_CONDITIONAL([ENABLE_UPEKTC], [test "$enable_upektc" != "no"]) #AM_CONDITIONAL([ENABLE_UPEKTC], [test "$enable_upektc" != "no"])
AM_CONDITIONAL([ENABLE_UPEKSONLY], [test "$enable_upeksonly" != "no"]) AM_CONDITIONAL([ENABLE_UPEKSONLY], [test "$enable_upeksonly" != "no"])
AM_CONDITIONAL([ENABLE_VCOM5S], [test "$enable_vcom5s" != "no"]) AM_CONDITIONAL([ENABLE_VCOM5S], [test "$enable_vcom5s" != "no"])

View file

@ -2,6 +2,7 @@ lib_LTLIBRARIES = libfprint.la
noinst_PROGRAMS = fprint-list-hal-info fprint-list-udev-rules noinst_PROGRAMS = fprint-list-hal-info fprint-list-udev-rules
MOSTLYCLEANFILES = $(hal_fdi_DATA) $(udev_rules_DATA) MOSTLYCLEANFILES = $(hal_fdi_DATA) $(udev_rules_DATA)
UPEKE2_SRC = drivers/upeke2.c
UPEKTS_SRC = drivers/upekts.c UPEKTS_SRC = drivers/upekts.c
UPEKTC_SRC = drivers/upektc.c UPEKTC_SRC = drivers/upektc.c
UPEKSONLY_SRC = drivers/upeksonly.c UPEKSONLY_SRC = drivers/upeksonly.c
@ -76,6 +77,10 @@ udev_rulesdir = $(sysconfdir)/udev/rules.d/
$(udev_rules_DATA): fprint-list-udev-rules $(udev_rules_DATA): fprint-list-udev-rules
$(builddir)/fprint-list-udev-rules > $@ $(builddir)/fprint-list-udev-rules > $@
if ENABLE_UPEKE2
DRIVER_SRC += $(UPEKE2_SRC)
endif
if ENABLE_UPEKTS if ENABLE_UPEKTS
DRIVER_SRC += $(UPEKTS_SRC) DRIVER_SRC += $(UPEKTS_SRC)
endif endif

View file

@ -343,6 +343,9 @@ static struct fp_driver * const primitive_drivers[] = {
#ifdef ENABLE_UPEKTS #ifdef ENABLE_UPEKTS
&upekts_driver, &upekts_driver,
#endif #endif
#ifdef ENABLE_UPEKE2
&upeke2_driver,
#endif
}; };
static struct fp_img_driver * const img_drivers[] = { static struct fp_img_driver * const img_drivers[] = {

1462
libfprint/drivers/upeke2.c Normal file

File diff suppressed because it is too large Load diff

View file

@ -238,6 +238,9 @@ struct fp_img_driver {
#ifdef ENABLE_UPEKTS #ifdef ENABLE_UPEKTS
extern struct fp_driver upekts_driver; extern struct fp_driver upekts_driver;
#endif #endif
#ifdef ENABLE_UPEKE2
extern struct fp_driver upeke2_driver;
#endif
#ifdef ENABLE_UPEKTC #ifdef ENABLE_UPEKTC
extern struct fp_img_driver upektc_driver; extern struct fp_img_driver upektc_driver;
#endif #endif