[Pcsclite-git-commit] [CCID] 01/01: Remove support of DRIVER_OPTION_RESET_ON_CLOSE

[Ludovic Rousseau]

This is an automated email from the git hooks/post-receive script.

rousseau pushed a commit to branch master
in repository CCID.

commit dd479b7c62f9a290a5d0994f0cbadd9b3af8d0d5
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Tue Mar 15 09:10:38 2016 +0100

    Remove support of DRIVER_OPTION_RESET_ON_CLOSE
    
    I do not remember a case of use for DRIVER_OPTION_RESET_ON_CLOSE in the
    last 10 years.
    
    The problem DRIVER_OPTION_RESET_ON_CLOSE is trying to solve is already
    solved:
    - Resynchronising the USB toggle bits is already done by the 3 calls to
      CmdGetSlotStatus() in CreateChannelByNameOrChannel().
    - Resetting bSeq to 0 is not needed.
---
 src/Info.plist.src    | 6 +-----
 src/ccid_ifdhandler.h | 1 -
 src/ccid_usb.c        | 4 ----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Info.plist.src b/src/Info.plist.src
index 80dbeeb..e39bb0d 100644
--- a/src/Info.plist.src
+++ b/src/Info.plist.src
@@ -77,11 +77,7 @@
 		- activate this option but you will have problems depending on
 		  the bug
 
-	0x08: DRIVER_OPTION_RESET_ON_CLOSE
-		This option may be required on Linux 2.4 so that the
-		device reset if sequencial (bSeq) counter and can be
-		reused if pcscd restart. Otherwise the reader needs to
-		be unplugged/replugged.
+	0x08: free
 
 	bits 4 & 5: (values 0x00, 0x10, 0x20, 0x30)
 	 0x00: power on the card at 5V (default value)
diff --git a/src/ccid_ifdhandler.h b/src/ccid_ifdhandler.h
index 69063ab..b2e3102 100644
--- a/src/ccid_ifdhandler.h
+++ b/src/ccid_ifdhandler.h
@@ -37,7 +37,6 @@
 #define DRIVER_OPTION_CCID_EXCHANGE_AUTHORIZED 1
 #define DRIVER_OPTION_GEMPC_TWIN_KEY_APDU 2
 #define DRIVER_OPTION_USE_BOGUS_FIRMWARE 4
-#define DRIVER_OPTION_RESET_ON_CLOSE 8
 #define DRIVER_OPTION_DISABLE_PIN_RETRIES (1 << 6)
 
 extern int DriverOptions;
diff --git a/src/ccid_usb.c b/src/ccid_usb.c
index 43bc090..4908a72 100644
--- a/src/ccid_usb.c
+++ b/src/ccid_usb.c
@@ -895,10 +895,6 @@ status_t CloseUSB(unsigned int reader_index)
 		if (usbDevice[reader_index].ccid.sIFD_iManufacturer)
 			free(usbDevice[reader_index].ccid.sIFD_iManufacturer);
 
-		/* reset so that bSeq starts at 0 again */
-		if (DriverOptions & DRIVER_OPTION_RESET_ON_CLOSE)
-			(void)libusb_reset_device(usbDevice[reader_index].dev_handle);
-
 		if (usbDevice[reader_index].ccid.arrayOfSupportedDataRates)
 			free(usbDevice[reader_index].ccid.arrayOfSupportedDataRates);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/CCID.git