[Pcsclite-cvs-commit] Drivers/ccid/src ccid_serial.c,1.4,1.5 ccid_usb.c,1.9,1.10 ifdhandler.c,1.9,1.10

[rousseau@quantz.debian.org]

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

Modified Files:
	ccid_serial.c ccid_usb.c ifdhandler.c 
Log Message:
call ccid_open_hack() in IFDHCreateChannel() instead of in each OpenPort()


Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ccid_serial.c	15 Jan 2004 08:30:31 -0000	1.4
+++ ccid_serial.c	15 Jan 2004 13:45:37 -0000	1.5
@@ -526,8 +526,6 @@
 	serialDevice[reader].buffer_offset = 0;
 	serialDevice[reader].buffer_offset_last = 0;
 
-	ccid_open_hack(lun);
-
 	return STATUS_SUCCESS;
 } /* OpenSerial */
 

Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ccid_usb.c	15 Jan 2004 08:30:31 -0000	1.9
+++ ccid_usb.c	15 Jan 2004 13:45:37 -0000	1.10
@@ -251,10 +251,6 @@
 							usbDevice[reader].ccid.dwFeatures = dw2i(dev->config->interface->altsetting->extra, 40);
 							usbDevice[reader].ccid.dwMaxCCIDMessageLength = dw2i(dev->config->interface->altsetting->extra, 44);
 
-							/* Maybe we have a special treatment
-							 * for this reader */
-							ccid_open_hack(lun);
-
 							goto end;
 						}
 						else

Index: ifdhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ifdhandler.c	15 Jan 2004 13:41:01 -0000	1.9
+++ ifdhandler.c	15 Jan 2004 13:45:37 -0000	1.10
@@ -100,6 +100,9 @@
 		return_value = IFD_COMMUNICATION_ERROR;
 	}
 
+	/* Maybe we have a special treatment for this reader */
+	ccid_open_hack(Lun);
+
 #ifdef HAVE_PTHREAD
 	pthread_mutex_unlock(&ifdh_context_mutex);
 #endif