[Pcsclite-cvs-commit] PCSC/src/PCSC ifdhandler.h,1.12,1.13
rousseau@haydn.debian.org
rousseau@haydn.debian.org
Update of /cvsroot/pcsclite/PCSC/src/PCSC
In directory haydn:/tmp/cvs-serv15064
Modified Files:
ifdhandler.h
Log Message:
it is now possible to compile a IFDHandler v2.0 with this include file.
Just #define IFDHANDLERv2 in your source code before #include <ifdhandler.h>
By default it is setup for for most recent version of the API (V3.0)
Index: ifdhandler.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/PCSC/ifdhandler.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ifdhandler.h 10 Jun 2004 18:05:02 -0000 1.12
+++ ifdhandler.h 6 Jul 2004 06:45:02 -0000 1.13
@@ -139,6 +139,15 @@
#define IFD_ICC_NOT_PRESENT 616
/*
+ * If you want to compile a V2.0 IFDHandler, define IFDHANDLERv2 before you
+ * include this file.
+ *
+ * By default it is setup for for most recent version of the API (V3.0)
+ */
+
+#ifndef IFDHANDLERv2
+
+ /*
* List of Defined Functions Available to IFD_Handler 3.0
*
* All the functions of IFD_Handler 2.0 are available
@@ -149,11 +158,19 @@
RESPONSECODE IFDHCreateChannelByName(DWORD, LPTSTR);
RESPONSECODE IFDHControl(DWORD, DWORD, LPCVOID, DWORD, LPVOID, DWORD,
LPDWORD);
+#else
/*
* List of Defined Functions Available to IFD_Handler 2.0
*/
+ RESPONSECODE IFDHControl(DWORD, PUCHAR, DWORD, PUCHAR, PDWORD);
+
+#endif
+
+ /*
+ * common functions in IFD_Handler 2.0 and 3.0
+ */
RESPONSECODE IFDHCreateChannel(DWORD, DWORD);
RESPONSECODE IFDHCloseChannel(DWORD);
RESPONSECODE IFDHGetCapabilities(DWORD, DWORD, PDWORD, PUCHAR);
@@ -163,7 +180,6 @@
RESPONSECODE IFDHPowerICC(DWORD, DWORD, PUCHAR, PDWORD);
RESPONSECODE IFDHTransmitToICC(DWORD, SCARD_IO_HEADER, PUCHAR,
DWORD, PUCHAR, PDWORD, PSCARD_IO_HEADER);
- RESPONSECODE IFDHControl_v2(DWORD, PUCHAR, DWORD, PUCHAR, PDWORD);
RESPONSECODE IFDHICCPresence(DWORD);
/*