[Pcsclite-cvs-commit] CVS Drivers/ccid/src

CVS User rousseau ludovic.rousseau@free.fr
Mon, 02 May 2005 09:53:25 +0000


Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv26527

Modified Files:
	parse.c 
Log Message:
move the display of supported data rates after printing
bNumDataRatesSupported info


--- /cvsroot/pcsclite/Drivers/ccid/src/parse.c	2005/05/02 08:24:57	1.27
+++ /cvsroot/pcsclite/Drivers/ccid/src/parse.c	2005/05/02 09:53:24	1.28
@@ -18,7 +18,7 @@
 */
 
 /*
- * $Id: parse.c,v 1.27 2005/05/02 08:24:57 rousseau Exp $
+ * $Id: parse.c,v 1.28 2005/05/02 09:53:24 rousseau Exp $
  */
 
 #include <stdio.h>
@@ -205,8 +205,10 @@
 
 	printf("  dwDefaultClock: %.3f MHz\n", dw2i(extra, 10)/1000.0);
 	printf("  dwMaximumClock: %.3f MHz\n", dw2i(extra, 14)/1000.0);
-
 	printf("  bNumClockSupported: 0x%02X\n", extra[18]);
+	printf("  dwDataRate: %d bps\n", dw2i(extra, 19));
+	printf("  dwMaxDataRate: %d bps\n", dw2i(extra, 23));
+	printf("  bNumDataRatesSupported: %d\n", extra[27]);
 	{
 		unsigned char buffer[256*sizeof(int)];  /* maximum is 256 records */
 		int n;
@@ -214,7 +216,7 @@
 		/* See CCID 3.7.3 page 25 */
 		n = usb_control_msg(handle,
 			0xA1, /* request type */
-			0x03, /* GET_DATA_RATES */
+			0x03, /* GET DATA RATES */
 			0x00, /* value */
 			usb_interface->bInterfaceNumber, /* interface */
 			(char *)buffer,
@@ -235,9 +237,6 @@
 					printf("   Support %d bps\n", dw2i(buffer, i));
 			}
 	}
-	printf("  dwDataRate: %d bps\n", dw2i(extra, 19));
-	printf("  dwMaxDataRate: %d bps\n", dw2i(extra, 23));
-	printf("  bNumDataRatesSupported: %d\n", extra[27]);
 	printf("  dwMaxIFSD: %d\n", dw2i(extra, 28));
 	printf("  dwSynchProtocols: 0x%08X\n", dw2i(extra, 32));