[Pcsclite-cvs-commit] Drivers/ccid/src ccid.h,1.1,1.2 ccid_serial.c,1.6,1.7 ccid_usb.c,1.14,1.15

[rousseau@quantz.debian.org]

Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory quantz:/tmp/cvs-serv15965/src

Modified Files:
	ccid.h ccid_serial.c ccid_usb.c 
Log Message:
add dwMaxIFSD field


Index: ccid.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ccid.h	10 Sep 2003 09:15:51 -0000	1.1
+++ ccid.h	3 Feb 2004 15:43:51 -0000	1.2
@@ -39,6 +39,11 @@
 	int dwMaxCCIDMessageLength;
 
 	/*
+	 * Maximum IFSD
+	 */
+	int dwMaxIFSD;
+
+	/*
 	 * Features supported by the reader (directly from class Descriptor)
 	 */
 	int dwFeatures;
@@ -46,10 +51,11 @@
 } _ccid_descriptor;
 
 #define CCID_CLASS_AUTO_VOLTAGE		0x00000008
-#define CCID_CLASS_EXCHANGE_MASK	0x00070000
+#define CCID_CLASS_AUTO_PPS_CUR		0x00000080
 #define CCID_CLASS_TPDU				0x00010000
 #define CCID_CLASS_SHORT_APDU		0x00020000
 #define CCID_CLASS_EXTENDED_APDU	0x00040000
+#define CCID_CLASS_EXCHANGE_MASK	0x00070000
 
 /* See CCID specs ch. 4.2.1 */
 #define CCID_COMMAND_FAILED			0x40	/* 01 0000 00 */

Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ccid_serial.c	27 Jan 2004 13:32:55 -0000	1.6
+++ ccid_serial.c	3 Feb 2004 15:43:51 -0000	1.7
@@ -535,6 +535,7 @@
 	serialDevice[reader].ccid.bSeq = 0;
 	serialDevice[reader].ccid.readerID = GEMPCTWIN;
 	serialDevice[reader].ccid.dwMaxCCIDMessageLength = 271;
+	serialDevice[reader].ccid.dwMaxIFSD = 254;
 	serialDevice[reader].ccid.dwFeatures = 0x00010230;
 
 	serialDevice[reader].buffer_offset = 0;

Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ccid_usb.c	29 Jan 2004 10:33:52 -0000	1.14
+++ ccid_usb.c	3 Feb 2004 15:43:51 -0000	1.15
@@ -296,6 +296,7 @@
 						dev->descriptor.idProduct;
 					usbDevice[reader].ccid.dwFeatures = dw2i(usb_interface->altsetting->extra, 40);
 					usbDevice[reader].ccid.dwMaxCCIDMessageLength = dw2i(usb_interface->altsetting->extra, 44);
+					usbDevice[reader].ccid.dwMaxIFSD = dw2i(usb_interface->altsetting->extra, 28);
 
 					goto end;
 				}