[Pcsclite-cvs-commit] r2754 - in /trunk/Drivers/ccid/src: ccid_usb.c ifdhandler.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jan 22 10:22:09 2008
New Revision: 2754

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2754
Log:
add support for Mac OS X Leopard (10.5.1)

Modified:
    trunk/Drivers/ccid/src/ccid_usb.c
    trunk/Drivers/ccid/src/ifdhandler.c

Modified: trunk/Drivers/ccid/src/ccid_usb.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_usb.c?rev=2754&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Tue Jan 22 10:22:09 2008
@@ -1,6 +1,6 @@
 /*
     ccid_usb.c: USB access routines using the libusb library
-    Copyright (C) 2003-2004   Ludovic Rousseau
+    Copyright (C) 2003-2008   Ludovic Rousseau
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -155,6 +155,7 @@
 
 	DEBUG_COMM3("Reader index: %X, Device: %s", reader_index, device);
 
+#ifndef __APPLE__
 	/* device name specified */
 	if (device)
 	{
@@ -199,6 +200,7 @@
 			}
 		}
 	}
+#endif
 
 	if (busses == NULL)
 		usb_init();
@@ -269,10 +271,16 @@
 		/* go to next supported reader for next round */
 		alias++;
 
+#ifndef __APPLE__
 		/* the device was specified but is not the one we are trying to find */
 		if (device
 			&& (vendorID != device_vendor || productID != device_product))
 			continue;
+#else
+		/* Leopard puts the friendlyname in the device argument */
+		if (device && strcmp(device, keyValue))
+			continue;
+#endif
 
 		/* on any USB buses */
 		for (bus = busses; bus; bus = bus->next)

Modified: trunk/Drivers/ccid/src/ifdhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ifdhandler.c?rev=2754&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c (original)
+++ trunk/Drivers/ccid/src/ifdhandler.c Tue Jan 22 10:22:09 2008
@@ -1,6 +1,6 @@
 /*
     ifdhandler.c: IFDH API
-    Copyright (C) 2003-2005   Ludovic Rousseau
+    Copyright (C) 2003-2008   Ludovic Rousseau
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -300,7 +300,11 @@
 			if (*Length >= 1)
 			{
 				*Length = 1;
+#ifdef __APPLE__
+				*Value = 0; /* Apple pcscd is bogus (rdar://problem/5697388) */
+#else
 				*Value = 1; /* Can talk to multiple readers at the same time */
+#endif
 			}
 			break;
 #endif