[Pcsclite-cvs-commit] r5397 - in /trunk/Drivers/ccid: readers/Athena_IDProtect_Key.txt readers/supported_readers.txt src/ccid_usb.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Nov 12 14:23:31 2010
New Revision: 5397

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5397
Log:
Athena IDProtect Key v1 was bogus. The v2 should work.

Modified:
    trunk/Drivers/ccid/readers/Athena_IDProtect_Key.txt
    trunk/Drivers/ccid/readers/supported_readers.txt
    trunk/Drivers/ccid/src/ccid_usb.c

Modified: trunk/Drivers/ccid/readers/Athena_IDProtect_Key.txt
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/readers/Athena_IDProtect_Key.txt?rev=5397&op=diff
==============================================================================
--- trunk/Drivers/ccid/readers/Athena_IDProtect_Key.txt (original)
+++ trunk/Drivers/ccid/readers/Athena_IDProtect_Key.txt Fri Nov 12 14:23:31 2010
@@ -1,14 +1,14 @@
  idVendor: 0x0DC3
   iManufacturer: Athena
  idProduct: 0x0900
-  iProduct: IDProtect Key
- bcdDevice: 1.00 (firmware release?)
+  iProduct: IDProtect Key v2
+ bcdDevice: 2.00 (firmware release?)
  bLength: 9
  bDescriptorType: 4
  bInterfaceNumber: 0
  bAlternateSetting: 0
- bNumEndpoints: 3
-  bulk-IN, bulk-OUT and Interrupt-IN
+ bNumEndpoints: 2
+  bulk-IN and bulk-OUT
  bInterfaceClass: 0x0B [Chip Card Interface Device Class (CCID)]
  bInterfaceSubClass: 0
  bInterfaceProtocol: 0
@@ -29,11 +29,11 @@
   dwDefaultClock: 4.000 MHz
   dwMaximumClock: 4.000 MHz
   bNumClockSupported: 0 (will use whatever is returned)
-   IFD does not support GET CLOCK FREQUENCIES request: Input/output error
+   IFD does not support GET CLOCK FREQUENCIES request: Operation timed out
   dwDataRate: 10752 bps
   dwMaxDataRate: 10752 bps
   bNumDataRatesSupported: 0 (will use whatever is returned)
-   IFD does not support GET_DATA_RATES request: Input/output error
+   IFD does not support GET_DATA_RATES request: Operation timed out
   dwMaxIFSD: 252
   dwSynchProtocols: 0x00000000
   dwMechanical: 0x00000000

Modified: trunk/Drivers/ccid/readers/supported_readers.txt
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/readers/supported_readers.txt?rev=5397&op=diff
==============================================================================
--- trunk/Drivers/ccid/readers/supported_readers.txt (original)
+++ trunk/Drivers/ccid/readers/supported_readers.txt Fri Nov 12 14:23:31 2010
@@ -108,7 +108,7 @@
 # Athena
 0x0DC3:0x1004:Athena ASE IIIe
 0x0DC3:0x1102:Athena ASEDrive IIIe KB
-#0x0DC3:0x0900:Athena IDProtect Key
+0x0DC3:0x0900:Athena IDProtect Key
 
 # SmartEpad
 0x09BE:0x0002:SmartEpad

Modified: trunk/Drivers/ccid/src/ccid_usb.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_usb.c?rev=5397&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Fri Nov 12 14:23:31 2010
@@ -128,6 +128,7 @@
 	{ 0x08C3, 0x0402, 0x5000 },	/* Precise Biometrics Precise 200 MC */
 	{ 0x08C3, 0x0401, 0x5000 },	/* Precise Biometrics Precise 250 MC */
 	{ 0x0B0C, 0x0050, 0x0101 },	/* Todos Argos Mini II */
+	{ 0x0DC3, 0x0900, 0x0200 }, /* Athena IDProtect Key v2 */
 
 	/* the firmware version is not correct since I do not have received a
 	 * working reader yet */