[Pcsclite-cvs-commit] r1950 - in trunk/Drivers/ccid: readers src

[Ludovic Rousseau]

Author: rousseau
Date: 2006-03-21 08:48:09 +0000 (Tue, 21 Mar 2006)
New Revision: 1950

Added:
   trunk/Drivers/ccid/readers/SSI010.txt
Modified:
   trunk/Drivers/ccid/readers/supported_readers.txt
   trunk/Drivers/ccid/src/ccid.c
   trunk/Drivers/ccid/src/ccid.h
   trunk/Drivers/ccid/src/ifdhandler.c
Log:
add support for SCM SDI 010 contactless reader

thanks to Oleg Makarenko for the patch


Added: trunk/Drivers/ccid/readers/SSI010.txt
===================================================================
--- trunk/Drivers/ccid/readers/SSI010.txt	2006-03-21 08:30:19 UTC (rev 1949)
+++ trunk/Drivers/ccid/readers/SSI010.txt	2006-03-21 08:48:09 UTC (rev 1950)
@@ -0,0 +1,54 @@
+Trying to open USB bus/device: 003/003
+ idVendor: 0x04E6
+  iManufacturer: SCM Microsystems Inc.
+ idProduct: 0x5121
+  iProduct: SDI010 Smart Card Reader
+ bcdDevice: 6.32 (firmware release?)
+ bLength: 9
+ bDescriptorType: 4
+ bInterfaceNumber: 0
+ bAlternateSetting: 0
+ bNumEndpoints: 3
+ bInterfaceClass: 0xFF
+  NOT A CCID DEVICE
+  Class is 0xFF (proprietary)
+ bInterfaceSubClass: 0
+ bInterfaceProtocol: 0
+ iInterface: 4
+ CCID Class Descriptor
+ bLength: 0x36
+ bDescriptorType: 0x21
+ bcdCCID: 1.00
+ bMaxSlotIndex: 0x01
+ bVoltageSupport: 0x01
+  5.0V
+ dwProtocols: 0x0000 0x0003
+  T=0
+  T=1
+ dwDefaultClock: 4.000 MHz
+ dwMaximumClock: 12.000 MHz
+ bNumClockSupported: 0 (will use whatever is returned)
+  IFD does not support GET CLOCK FREQUENCIES request
+ dwDataRate: 10753 bps
+ dwMaxDataRate: 344105 bps
+ bNumDataRatesSupported: 0 (will use whatever is returned)
+  IFD does not support GET_DATA_RATES request
+ dwMaxIFSD: 252
+ dwSynchProtocols: 0x00000000
+ dwMechanical: 0x00000000
+  No special characteristics
+ dwFeatures: 0x000100BA
+  ....02 Automatic parameter configuration based on ATR data
+  ....08 Automatic ICC voltage selection
+  ....10 Automatic ICC clock frequency change according to parameters
+  ....20 Automatic baud rate change according to frequency and Fi, Di params
+  ....80 Automatic PPS made by the CCID
+  01.... TPDU level exchange
+ dwMaxCCIDMessageLength: 263 bytes
+ bClassGetResponse: 0xFF
+  echoes the APDU class
+ bClassEnveloppe: 0xFF
+  echoes the APDU class
+ wLcdLayout: 0x0000
+ bPINSupport: 0x00
+ bMaxCCIDBusySlots: 1

Modified: trunk/Drivers/ccid/readers/supported_readers.txt
===================================================================
--- trunk/Drivers/ccid/readers/supported_readers.txt	2006-03-21 08:30:19 UTC (rev 1949)
+++ trunk/Drivers/ccid/readers/supported_readers.txt	2006-03-21 08:48:09 UTC (rev 1950)
@@ -24,6 +24,7 @@
 0x04E6:0x511C:Axalto Reflex USB v3
 0x04E6:0x511D:SCM SCR 3311
 0x04E6:0x5120:SCM SCR 331-DI NTTCom
+0x04E6:0x5121:SCM SDI 010
 0x04E6:0xE001:SCM SCR 331
 0x04E6:0x5410:SCM SCR 355
 0x04E6:0xE003:SCM SPR 532

Modified: trunk/Drivers/ccid/src/ccid.c
===================================================================
--- trunk/Drivers/ccid/src/ccid.c	2006-03-21 08:30:19 UTC (rev 1949)
+++ trunk/Drivers/ccid/src/ccid.c	2006-03-21 08:48:09 UTC (rev 1950)
@@ -187,6 +187,8 @@
 
 		/* SCM SCR331-DI contactless */
 		case SCR331DI:
+		/* SCM SDI010 contactless */
+		case SDI010:
 			/* the contactless reader is in the second slot */
 			if (ccid_descriptor->bCurrentSlotIndex > 0)
 			{

Modified: trunk/Drivers/ccid/src/ccid.h
===================================================================
--- trunk/Drivers/ccid/src/ccid.h	2006-03-21 08:30:19 UTC (rev 1949)
+++ trunk/Drivers/ccid/src/ccid.h	2006-03-21 08:48:09 UTC (rev 1950)
@@ -129,6 +129,7 @@
 #define LTC31		0x07830003
 #define SCR331DI	0x04E65111
 #define SCR331DINTTCOM	0x04E65120
+#define SDI010		0x04E65121
 #define CHERRYXX33	0x046A0005
 #define CHERRYST2000	0x046A003E
 #define OZ776		0x0B977762

Modified: trunk/Drivers/ccid/src/ifdhandler.c
===================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c	2006-03-21 08:30:19 UTC (rev 1949)
+++ trunk/Drivers/ccid/src/ifdhandler.c	2006-03-21 08:48:09 UTC (rev 1950)
@@ -1084,6 +1084,7 @@
 
 	/* SCR331-DI contactless reader */
 	if (((SCR331DI == ccid_descriptor->readerID)
+		|| (SDI010 == ccid_descriptor->readerID)
 		|| (SCR331DINTTCOM == ccid_descriptor->readerID))
 		&& (ccid_descriptor->bCurrentSlotIndex > 0))
 	{