[Pcsclite-cvs-commit] r4360 - /trunk/Drivers/ccid/src/ccid.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Jul 31 14:23:26 2009
New Revision: 4360

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4360
Log:
ccid_open_hack_pre(): do not call InterruptRead() on Mac OS X. The
libusb does not timeout and blocks forever.

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

Modified: trunk/Drivers/ccid/src/ccid.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid.c?rev=4360&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid.c (original)
+++ trunk/Drivers/ccid/src/ccid.c Fri Jul 31 14:23:26 2009
@@ -43,7 +43,6 @@
 int ccid_open_hack_pre(unsigned int reader_index)
 {
 	_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
-	int doInterruptRead = 1;
 
 	switch (ccid_descriptor->readerID)
 	{
@@ -62,19 +61,18 @@
 			(void)sleep(1);
 			ccid_descriptor->readTimeout = 60; /* 60 seconds */
 			break;
-
-		case KOBIL_TRIBANK:
-			/* the InterruptRead does not timeout (on Mac OS X) */
-			doInterruptRead = 0;
-			break;
 	}
 
 	/* CCID */
-	if (doInterruptRead && (0 == ccid_descriptor->bInterfaceProtocol))
+	if (0 == ccid_descriptor->bInterfaceProtocol)
 	{
 #ifndef TWIN_SERIAL
 		/* just wait for 10ms in case a notification is in the pipe */
+#ifndef __APPLE__
+		/* the InterruptRead does NOT timeout (on Mac OS X)
+		 * so we do not do that on Mac OS X */
 		(void)InterruptRead(reader_index, 10);
+#endif
 #endif
 	}