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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Jun 17 13:28:24 2010
New Revision: 5014

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5014
Log:
use PROTOCOL_CCID instead of 0 when checking bInterfaceProtocol

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

Modified: trunk/Drivers/ccid/src/ccid.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid.c?rev=5014&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid.c (original)
+++ trunk/Drivers/ccid/src/ccid.c Thu Jun 17 13:28:24 2010
@@ -68,7 +68,7 @@
 	}
 
 	/* CCID */
-	if (0 == ccid_descriptor->bInterfaceProtocol)
+	if (PROTOCOL_CCID == ccid_descriptor->bInterfaceProtocol)
 	{
 #ifndef TWIN_SERIAL
 		/* just wait for 10ms in case a notification is in the pipe */

Modified: trunk/Drivers/ccid/src/ifdhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ifdhandler.c?rev=5014&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c (original)
+++ trunk/Drivers/ccid/src/ifdhandler.c Thu Jun 17 13:28:24 2010
@@ -533,7 +533,7 @@
 
 				ccid_desc = get_ccid_descriptor(reader_index);
 				/* CCID and not ICCD */
-				if ((0 == ccid_desc -> bInterfaceProtocol)
+				if ((PROTOCOL_CCID == ccid_desc -> bInterfaceProtocol)
 					/* 3 end points */
 					&& (3 == ccid_desc -> bNumEndpoints))
 				{