Changeset 990 for trunk

Timestamp:

08/21/07 07:01:04 (17 months ago)

Author:

aj

Message:

disable wbeiuu driver - not working yet, but kernel alternative works
with phoenix driver.

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• etc/openct.conf.in (modified) (1 diff)
• etc/openct.udev (modified) (1 diff)
• etc/openct.udev.modalias (modified) (1 diff)
• etc/openct.usermap (modified) (1 diff)
• src/ifd/Makefile.am (modified) (2 diffs)
• src/ifd/init.c (modified) (1 diff)
• src/ifd/internal.h (modified) (1 diff)

trunk/NEWS

@@ -1 +1 @@
 NEWS for OpenCT -- History of user visible changes
+
+New in 0.6.13; 2007-08-??; Andreas Jellinghaus
+* fix missing "*" in etc/openct.udev.modalias
+* comment out wbeiuu driver - use kernel driver plus phoenix driver instead
 
 New in 0.6.12; 2007-07-11; Andreas Jellinghaus

trunk/etc/openct.conf.in

@@ -127 +127 @@
         };
 };
-driver wbeiuu {
-        ids = {
-                usb:104f/0004,
-        };
-};
+#driver wbeiuu {        #       driver not working yet
+#       ids = {
+#               usb:104f/0004,
+#       };
+#};

trunk/etc/openct.udev

@@ -52 +52 @@
 SYSFS{idVendor}=="072f", SYSFS{idProduct}=="9000", RUN+="/lib/udev/openct_usb"
 SYSFS{idVendor}=="072f", SYSFS{idProduct}=="90d0", RUN+="/lib/udev/openct_usb"
-# wbeiuu
-SYSFS{idVendor}=="104f", SYSFS{idProduct}=="0004", RUN+="/lib/udev/openct_usb"
+# wbeiuu        - driver not working yet.
+#SYSFS{idVendor}=="104f", SYSFS{idProduct}=="0004", RUN+="/lib/udev/openct_usb"
 
 LABEL="openct_usb_rules_end"

trunk/etc/openct.udev.modalias

@@ -46 +46 @@
 ENV{MODALIAS}=="usb:v072Fp9000*", RUN+="/lib/udev/openct_usb"
 ENV{MODALIAS}=="usb:v072Fp90D0*", RUN+="/lib/udev/openct_usb"
-# wbeiuu
-ENV{MODALIAS}=="usb:v104Fp0004*", RUN+="/lib/udev/openct_usb"
+# wbeiuu - driver not working yet
+#ENV{MODALIAS}=="usb:v104Fp0004*", RUN+="/lib/udev/openct_usb"
 
 LABEL="openct_usb_rules_end"

trunk/etc/openct.usermap

@@ -35 +35 @@
 openct               0x0003      0x072f   0x9000    0x0000       0x0000       0x00         0x00            0x00            0x0b            0x00               0x00               0x00000000
 openct               0x0003      0x072f   0x90d0    0x0000       0x0000       0x00         0x00            0x00            0x0b            0x00               0x00               0x00000000
-# wbeiuu
-openct               0x0003      0x104f   0x0004    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+# wbeiuu - driver not working yet
+#openct               0x0003      0x104f   0x0004    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000

trunk/src/ifd/Makefile.am

@@ -18 +18 @@
         ifd-ikey3k.c ifd-kaan.c ifd-pertosmart1030.c ifd-pertosmart1038.c \
         ifd-smartboard.c ifd-smph.c ifd-starkey.c ifd-towitoko.c cardman.h \
-        ifd-wbeiuu.c \
         \
         proto-gbp.c proto-sync.c proto-t0.c proto-t1.c \
@@ -26 +25 @@
         \
         ria.c
+# new driver not working yet: ifd-wbeiuu.c
 libifd_la_LIBADD = ../ct/libopenct.la $(LTLIBLTDL) $(LIBUSB_LIBS)
 

trunk/src/ifd/init.c

@@ -41 +41 @@
         ifd_starkey_register();
         ifd_towitoko_register();
-        ifd_wbeiuu_register();
+        /* ifd_wbeiuu_register();       driver not working yet */
         /* ccid last */
         ifd_ccid_register();

trunk/src/ifd/internal.h

@@ -134 +134 @@
 extern void ifd_starkey_register(void);
 extern void ifd_towitoko_register(void);
-extern void ifd_wbeiuu_register(void);
+/* extern void ifd_wbeiuu_register(void); driver not working yet */
 
 /* reader.c */