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

[Ludovic Rousseau]

Author: rousseau
Date: 2005-08-13 14:26:22 +0000 (Sat, 13 Aug 2005)
New Revision: 1613

Modified:
   trunk/Drivers/ccid/src/ccid_usb.c
Log:
CloseUSB(): call usb_reset() only if DRIVER_OPTION_RESET_ON_CLOSE is
set.

The problem was that a device reset also disconnects the keyboard on a
keyboard + reader device.


Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c	2005-08-13 14:24:25 UTC (rev 1612)
+++ trunk/Drivers/ccid/src/ccid_usb.c	2005-08-13 14:26:22 UTC (rev 1613)
@@ -522,7 +522,8 @@
 		free(usbDevice[reader_index].ccid.arrayOfSupportedDataRates);
 
 	/* reset so that bSeq starts at 0 again */
-	usb_reset(usbDevice[reader_index].handle);
+	if (DriverOptions & DRIVER_OPTION_RESET_ON_CLOSE)
+		usb_reset(usbDevice[reader_index].handle);
 
 	usb_release_interface(usbDevice[reader_index].handle,
 		usbDevice[reader_index].interface);