[Pcsclite-cvs-commit] r2424 - trunk/Drivers/ccid/src

[Ludovic Rousseau]

Author: rousseau
Date: 2007-02-23 17:40:08 +0100 (Fri, 23 Feb 2007)
New Revision: 2424

Modified:
   trunk/Drivers/ccid/src/ccid_usb.c
Log:
get_data_rates(): use ControlUSB() instead of usb_control_msg()


Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c	2007-02-23 16:37:09 UTC (rev 2423)
+++ trunk/Drivers/ccid/src/ccid_usb.c	2007-02-23 16:40:08 UTC (rev 2424)
@@ -727,14 +727,11 @@
 	unsigned int *int_array;
 
 	/* See CCID 3.7.3 page 25 */
-	n = usb_control_msg(usbDevice[reader_index].handle,
+	n = ControlUSB(reader_index,
 		0xA1, /* request type */
 		0x03, /* GET_DATA_RATES */
 		0x00, /* value */
-		usbDevice[reader_index].interface, /* interface */
-		(char *)buffer,
-		sizeof(buffer),
-		usbDevice[reader_index].ccid.readTimeout * 1000);
+		buffer, sizeof(buffer));
 
 	/* we got an error? */
 	if (n <= 0)