[Pcsclite-cvs-commit] PCSC/src pcsclite.h,1.28,1.29
aet-guest@quantz.debian.org
aet-guest@quantz.debian.org
Sun, 09 Nov 2003 14:33:51 +0100
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv31531/src
Modified Files:
pcsclite.h
Log Message:
- Allow regular pcsclite.h to be used under win32 platform
Index: pcsclite.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/pcsclite.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- pcsclite.h 30 Oct 2003 17:42:21 -0000 1.28
+++ pcsclite.h 9 Nov 2003 13:33:49 -0000 1.29
@@ -24,6 +24,9 @@
{
#endif
+#ifdef WIN32
+#include <winscard.h>
+#else
typedef long SCARDCONTEXT;
typedef SCARDCONTEXT *PSCARDCONTEXT;
typedef SCARDCONTEXT *LPSCARDCONTEXT;
@@ -61,11 +64,6 @@
#define SCARD_PCI_T1 (&g_rgSCardT1Pci)
#define SCARD_PCI_RAW (&g_rgSCardRawPci)
- /*
- * Gets a stringified error response
- */
- char *pcsc_stringify_error(long);
-
#define SCARD_S_SUCCESS 0x00000000
#define SCARD_E_CANCELLED 0x80100002
#define SCARD_E_CANT_DISPOSE 0x8010000E
@@ -96,9 +94,7 @@
#define SCARD_W_UNPOWERED_CARD 0x80100067
#define SCARD_W_RESET_CARD 0x80100068
#define SCARD_W_REMOVED_CARD 0x80100069
-#define SCARD_W_INSERTED_CARD 0x8010006A
-#define SCARD_E_UNSUPPORTED_FEATURE 0x8010001F
#define SCARD_E_PCI_TOO_SMALL 0x80100019
#define SCARD_E_READER_UNSUPPORTED 0x8010001A
#define SCARD_E_DUPLICATE_READER 0x8010001B
@@ -109,12 +105,10 @@
#define SCARD_SCOPE_USER 0x0000 /* Scope in user space */
#define SCARD_SCOPE_TERMINAL 0x0001 /* Scope in terminal */
#define SCARD_SCOPE_SYSTEM 0x0002 /* Scope in system */
-#define SCARD_SCOPE_GLOBAL 0x0003 /* Scope is global */
#define SCARD_PROTOCOL_T0 0x0001 /* T=0 active protocol. */
#define SCARD_PROTOCOL_T1 0x0002 /* T=1 active protocol. */
#define SCARD_PROTOCOL_RAW 0x0004 /* Raw active protocol. */
-#define SCARD_PROTOCOL_ANY 0x1000 /* IFD determines prot. */
#define SCARD_SHARE_EXCLUSIVE 0x0001 /* Exclusive mode only */
#define SCARD_SHARE_SHARED 0x0002 /* Shared mode only */
@@ -144,6 +138,15 @@
#define SCARD_STATE_EXCLUSIVE 0x0080 /* Exclusive Mode */
#define SCARD_STATE_INUSE 0x0100 /* Shared Mode */
#define SCARD_STATE_MUTE 0x0200 /* Unresponsive card */
+#endif
+
+/* PC/SC Lite specific extensions */
+#define SCARD_W_INSERTED_CARD 0x8010006A
+#define SCARD_E_UNSUPPORTED_FEATURE 0x8010001F
+
+#define SCARD_SCOPE_GLOBAL 0x0003 /* Scope is global */
+
+#define SCARD_PROTOCOL_ANY 0x1000 /* IFD determines prot. */
#define SCARD_RESET 0x0001 /* Card was reset */
#define SCARD_INSERTED 0x0002 /* Card was inserted */
@@ -157,18 +160,21 @@
#else
#define PCSCLITE_CONFIG_DIR USE_READER_CONF
#endif
-#define PCSCLITE_READER_CONFIG PCSCLITE_CONFIG_DIR "/reader.conf"
#ifndef USE_IPCDIR
#define PCSCLITE_IPC_DIR "/var/run"
#else
#define PCSCLITE_IPC_DIR USE_IPCDIR
#endif
+
+#define PCSCLITE_READER_CONFIG PCSCLITE_CONFIG_DIR "/reader.conf"
#define PCSCLITE_PUBSHM_FILE PCSCLITE_IPC_DIR "/pcscd.pub"
#define PCSCLITE_CSOCK_NAME PCSCLITE_IPC_DIR "/pcscd.comm"
#define PCSCLITE_SVC_IDENTITY 0x01030000 /* Service ID */
+#ifndef INFINITE
#define INFINITE 0xFFFFFFFF /* Infinite timeout */
+#endif
#define PCSCLITE_INFINITE_TIMEOUT 4320000 /* 50 day infinite t/o */
#define PCSCLITE_VERSION_NUMBER "1.2.0-rc3" /* Current version */
@@ -180,12 +186,12 @@
#define PCSCLITE_MAX_APPLICATIONS 16 /* Maximum applications */
#define PCSCLITE_MAX_APPLICATION_CONTEXTS 16 /* Maximum contexts by application */
-#define PCSCLITE_MAX_APPLICATIONS_CONTEXTS PCSCLITE_MAX_APPLICATIONS * PCSCLITE_MAX_APPLICATION_CONTEXTS
- /* Maximum of applications contexts that PC/SC Ressources Manager can accept */
+#define PCSCLITE_MAX_APPLICATIONS_CONTEXTS \
+ PCSCLITE_MAX_APPLICATIONS * PCSCLITE_MAX_APPLICATION_CONTEXTS
+ /* Maximum of applications contexts that pcscd can accept */
#define PCSCLITE_MAX_READER_CONTEXT_CHANNELS 16 /* Maximum channels on a reader context */
#define PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS 16 /* Maximum channels on an application context */
-
#define PCSCLITE_MAX_READERS_CONTEXTS 16 /* Maximum readers context (a slot is count as a reader) */
#define PCSCLITE_MAX_THREADS 16 /* Stat change threads */
@@ -195,7 +201,9 @@
#define MAX_READERNAME 52 /* 52 char Reader Name */
#define MAX_LIBNAME 100 /* 100 char Lib Name */
+#ifndef SCARD_ATR_LENGTH
#define SCARD_ATR_LENGTH MAX_ATR_SIZE /* Maximum ATR size */
+#endif
/*
* Enhanced messaging has been added to accomodate newer devices which have
@@ -216,6 +224,11 @@
#define MAX_BUFFER_SIZE (1<<15) /* enhanced (32K) Tx/Rx Buffer */
#define PCSCLITE_SERVER_ATTEMPTS 200 /* To allow larger data reads/writes */
#endif
+
+ /*
+ * Gets a stringified error response
+ */
+ char *pcsc_stringify_error(long);
#ifdef __cplusplus
}