[Pcsclite-cvs-commit] Drivers/ccid/src ccid.h,1.12,1.13 ccid_serial.c,1.27,1.28 ccid_usb.c,1.36,1.37 ifdhandler.c,1.44,1.45

rousseau@haydn.debian.org rousseau@haydn.debian.org


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

Modified Files:
	ccid.h ccid_serial.c ccid_usb.c ifdhandler.c 
Log Message:
remove defaultFeatures management (was used for SCR331-DI hack)


Index: ccid.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ccid.h	28 Jul 2004 08:33:18 -0000	1.12
+++ ccid.h	4 Aug 2004 21:30:13 -0000	1.13
@@ -49,12 +49,6 @@
 	int dwFeatures;
 
 	/*
-	 * default value of dwFeatures
-	 * we need this for the SCR331-DI that has two slots with different Features
-	 */
-	int defaultFeatures;
-
-	/*
 	 * PIN support of the reader (directly from Class Descriptor)
 	 */
 	char bPINSupport;

Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ccid_serial.c	28 Jul 2004 08:33:18 -0000	1.27
+++ ccid_serial.c	4 Aug 2004 21:30:14 -0000	1.28
@@ -561,7 +561,6 @@
 	serialDevice[reader].ccid.dwMaxDataRate = 344086;
 	serialDevice[reader].ccid.bMaxSlotIndex = 0;
 	serialDevice[reader].ccid.bCurrentSlotIndex = 0;
-	serialDevice[reader].ccid.defaultFeatures = serialDevice[reader].ccid.dwFeatures;
 
 	serialDevice[reader].buffer_offset = 0;
 	serialDevice[reader].buffer_offset_last = 0;

Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ccid_usb.c	28 Jul 2004 08:33:18 -0000	1.36
+++ ccid_usb.c	4 Aug 2004 21:30:14 -0000	1.37
@@ -352,7 +352,6 @@
 					usbDevice[reader_index].ccid.dwMaxDataRate = dw2i(usb_interface->altsetting->extra, 23);
 					usbDevice[reader_index].ccid.bMaxSlotIndex = usb_interface->altsetting->extra[4];
 					usbDevice[reader_index].ccid.bCurrentSlotIndex = 0;
-					usbDevice[reader_index].ccid.defaultFeatures = usbDevice[reader_index].ccid.dwFeatures;
 					goto end;
 				}
 			}

Index: ifdhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ifdhandler.c	28 Jul 2004 08:36:57 -0000	1.44
+++ ifdhandler.c	4 Aug 2004 21:30:14 -0000	1.45
@@ -695,14 +695,6 @@
 
 			/* clear T=1 context */
 			t1_release(&(get_ccid_slot(reader_index) -> t1));
-
-			/* reset to default values
-			 * see hack in IFDHICCPresence() for SCR331-DI */
-			{
-				_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
-
-				ccid_descriptor->dwFeatures = ccid_descriptor->defaultFeatures;
-			}
 			break;
 
 		case IFD_POWER_UP: