[Pcsclite-cvs-commit] Drivers/ccid/src ccid_serial.c,1.7,1.8 ccid_usb.c,1.17,1.18

[rousseau@quantz.debian.org]

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

Modified Files:
	ccid_serial.c ccid_usb.c 
Log Message:
fill dwDefaultClock and dwMaxDataRate according to the reader descriptor


Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ccid_serial.c	3 Feb 2004 15:43:51 -0000	1.7
+++ ccid_serial.c	12 Feb 2004 16:09:32 -0000	1.8
@@ -537,6 +537,8 @@
 	serialDevice[reader].ccid.dwMaxCCIDMessageLength = 271;
 	serialDevice[reader].ccid.dwMaxIFSD = 254;
 	serialDevice[reader].ccid.dwFeatures = 0x00010230;
+	serialDevice[reader].ccid.dwDefaultClock = 4000;
+	serialDevice[reader].ccid.dwMaxDataRate = 344086;
 
 	serialDevice[reader].buffer_offset = 0;
 	serialDevice[reader].buffer_offset_last = 0;

Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ccid_usb.c	9 Feb 2004 13:57:14 -0000	1.17
+++ ccid_usb.c	12 Feb 2004 16:09:32 -0000	1.18
@@ -124,8 +124,6 @@
 			DEBUG_CRITICAL2("device name can't be parsed: %s", device);
 			return STATUS_UNSUCCESSFUL;
 		}
-
-	printf("%x %x\n", device_vendor, device_product);
 	}
 
 	if (busses == NULL)
@@ -297,6 +295,8 @@
 					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);
+					usbDevice[reader].ccid.dwDefaultClock = dw2i(usb_interface->altsetting->extra, 10);
+					usbDevice[reader].ccid.dwMaxDataRate = dw2i(usb_interface->altsetting->extra, 23);
 
 					goto end;
 				}