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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Oct  2 11:43:18 2009
New Revision: 4414

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4414
Log:
IFDHSetProtocolParameters(): with a T=1 card, do not try to negociate
IFSD if the reader works in APDU mode

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

Modified: trunk/Drivers/ccid/src/ifdhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ifdhandler.c?rev=4414&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c (original)
+++ trunk/Drivers/ccid/src/ifdhandler.c Fri Oct  2 11:43:18 2009
@@ -967,7 +967,10 @@
 			}
 
 		/* IFSD not negociated by the reader? */
-		if (! (ccid_desc->dwFeatures & CCID_CLASS_AUTO_IFSD))
+		if (! (ccid_desc->dwFeatures & CCID_CLASS_AUTO_IFSD)
+			/* and reader is in Character or TPDU mode? */
+			&& (((ccid_desc->dwFeatures & CCID_CLASS_EXCHANGE_MASK) == CCID_CLASS_CHARACTER)
+			|| ((ccid_desc->dwFeatures & CCID_CLASS_EXCHANGE_MASK) == CCID_CLASS_TPDU)))
 		{
 			DEBUG_COMM2("Negociate IFSD at %d", ccid_desc -> dwMaxIFSD);
 			if (t1_negotiate_ifsd(t1, 0, ccid_desc -> dwMaxIFSD) < 0)