[Pcsclite-cvs-commit] r4211 - in /trunk/PCSC/UnitaryTests: BufferOverflow.c Makefile SCardBeginTransaction.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri May 15 15:53:58 2009
New Revision: 4211

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4211
Log:
port to Mac OS X

Modified:
    trunk/PCSC/UnitaryTests/BufferOverflow.c
    trunk/PCSC/UnitaryTests/Makefile
    trunk/PCSC/UnitaryTests/SCardBeginTransaction.c

Modified: trunk/PCSC/UnitaryTests/BufferOverflow.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/BufferOverflow.c?rev=4211&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/BufferOverflow.c (original)
+++ trunk/PCSC/UnitaryTests/BufferOverflow.c Fri May 15 15:53:58 2009
@@ -1,6 +1,14 @@
 #include <stdio.h>
+#ifdef __APPLE__
+#include <PCSC/winscard.h>
+#include <PCSC/wintypes.h>
+#define SCARD_ATTR_VALUE(Class, Tag) ((((ULONG)(Class)) << 16) | ((ULONG)(Tag)))
+#define SCARD_CLASS_ICC_STATE       9   /**< ICC State specific definitions */
+#define SCARD_ATTR_ATR_STRING SCARD_ATTR_VALUE(SCARD_CLASS_ICC_STATE, 0x0303) /**< Answer to reset (ATR) string. */
+#else
 #include <winscard.h>
 #include <reader.h>
+#endif
 
 int main(void)
 {
@@ -10,7 +18,7 @@
 	LONG rv;
 	char mszReaders[1024];
 	DWORD dwReaders = sizeof(mszReaders);
-	unsigned char pbAtr[265];
+	unsigned char pbAtr[265];	/* 264 is OK */
 	DWORD dwAtrLen;
 	int i;
 

Modified: trunk/PCSC/UnitaryTests/Makefile
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/Makefile?rev=4211&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/Makefile (original)
+++ trunk/PCSC/UnitaryTests/Makefile Fri May 15 15:53:58 2009
@@ -1,8 +1,14 @@
-PCSC_CFLAGS ?= $(shell pkg-config libpcsclite --cflags)
-PCSC_LDLIBS ?= $(shell pkg-config libpcsclite --libs)
+OS := $(shell uname -s)
+ifeq ("$(OS)", "Darwin")
+	PCSC_CFLAGS := -framework PCSC
+else
+	PCSC_CFLAGS ?= $(shell pkg-config libpcsclite --cflags)
+	PCSC_LDLIBS ?= $(shell pkg-config libpcsclite --libs)
+endif
 
 CFLAGS := -Wall -O2 -g -DVERSION=\"$(VERSION)\" $(PCSC_CFLAGS)
 LDLIBS := $(PCSC_LDLIBS)
 
 all: SCardBeginTransaction \
-	BufferOverflow
+	BufferOverflow \
+	pcsc_demo

Modified: trunk/PCSC/UnitaryTests/SCardBeginTransaction.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardBeginTransaction.c?rev=4211&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardBeginTransaction.c (original)
+++ trunk/PCSC/UnitaryTests/SCardBeginTransaction.c Fri May 15 15:53:58 2009
@@ -1,6 +1,11 @@
 #include <stdio.h>
 #include <unistd.h>
+#ifdef __APPLE__
+#include <PCSC/winscard.h>
+#include <PCSC/wintypes.h>
+#else
 #include <winscard.h>
+#endif
 
 int main(void)
 {