[Pcsclite-cvs-commit] PCSC/src readerfactory.c,1.62,1.63 readerfactory.h,1.20,1.21

[rousseau@haydn.debian.org]

Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv5304

Modified Files:
	readerfactory.c readerfactory.h 
Log Message:
remove unused fields in FctMap_V1 structure


Index: readerfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/readerfactory.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- readerfactory.c	13 Aug 2004 20:28:35 -0000	1.62
+++ readerfactory.c	13 Aug 2004 20:31:46 -0000	1.63
@@ -872,11 +872,7 @@
 		GET_ADDRESSv1(TransmitToICC, Transmit_to_ICC)
 		GET_ADDRESSv1(ICCPresence, Is_ICC_Present)
 
-		GET_ADDRESS_OPTIONALv1(SwallowICC, Swallow_ICC, )
-		GET_ADDRESS_OPTIONALv1(EjectICC, Eject_ICC, )
-		GET_ADDRESS_OPTIONALv1(ConfiscateICC, Confiscate_ICC, )
 		GET_ADDRESS_OPTIONALv1(SetProtocolParameters, Set_Protocol_Parameters, )
-		GET_ADDRESS_OPTIONALv1(ICCAbsent, Is_ICC_Absent, )
 	}
 	else if (rContext->dwVersion == IFD_HVERSION_2_0)
 	{

Index: readerfactory.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/readerfactory.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- readerfactory.h	13 Aug 2004 20:27:29 -0000	1.20
+++ readerfactory.h	13 Aug 2004 20:31:46 -0000	1.21
@@ -31,19 +31,16 @@
 		RESPONSECODE (*pvfSetProtocolParameters)(DWORD, UCHAR, UCHAR, UCHAR,
 			UCHAR);
 		RESPONSECODE (*pvfPowerICC)(DWORD);
-		LPVOID pvfSwallowICC;		/* Deprecated in 2.0 */
-		LPVOID pvfEjectICC;		/* Deprecated in 2.0 */
-		LPVOID pvfConfiscateICC;	/* Deprecated in 2.0 */
 		RESPONSECODE (*pvfTransmitToICC)(SCARD_IO_HEADER, PUCHAR, DWORD,
 			PUCHAR, PDWORD, PSCARD_IO_HEADER);
 		RESPONSECODE (*pvfICCPresence)(void);
-		LPVOID pvfICCAbsent;		/* Deprecated in 2.0 */
 	};
 
 	typedef struct FctMap_V1 FCT_MAP_V1, *PFCT_MAP_V1;
 
 	struct FctMap_V2
 	{
+		/* shared with API 3.0 */
 		RESPONSECODE (*pvfCreateChannel)(DWORD, DWORD);
 		RESPONSECODE (*pvfCloseChannel)(DWORD);
 		RESPONSECODE (*pvfGetCapabilities)(DWORD, DWORD, PDWORD, PUCHAR);