[Pcsclite-cvs-commit] CVS Drivers/ccid/src

[CVS User rousseau]

Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv16976

Modified Files:
	ifdhandler.c 
Log Message:
extra_egt(): change two if() in one


--- /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c	2005/04/26 12:06:13	1.63
+++ /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c	2005/04/26 12:07:44	1.64
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
 
-/* $Id: ifdhandler.c,v 1.63 2005/04/26 12:06:13 rousseau Exp $ */
+/* $Id: ifdhandler.c,v 1.64 2005/04/26 12:07:44 rousseau Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -1050,14 +1050,14 @@
 	/* Current EGT = 0 or FF? */
 	if (atr->ib[0][ATR_INTERFACE_BYTE_TC].present &&
 		((0x00 == atr->ib[0][ATR_INTERFACE_BYTE_TC].value) ||
-			(0xFF == atr->ib[0][ATR_INTERFACE_BYTE_TC].value)))
+		(0xFF == atr->ib[0][ATR_INTERFACE_BYTE_TC].value)))
 	{
 		if (SCARD_PROTOCOL_T0 == Protocol)
 		{
 			/* Init TC1 */
 			atr->ib[0][ATR_INTERFACE_BYTE_TC].present = TRUE;
 			atr->ib[0][ATR_INTERFACE_BYTE_TC].value = 2;
-			DEBUG_INFO("Extra EGT patch applied for T=0");
+			DEBUG_INFO("Extra EGT patch applied");
 		}
 
 		if (SCARD_PROTOCOL_T1 == Protocol)
@@ -1065,16 +1065,14 @@
 			/* TBi (i>2) present? BWI/CWI */
 			for (i=2; i<ATR_MAX_PROTOCOLS; i++)
 			{
-				if (atr->ib[i][ATR_INTERFACE_BYTE_TB].present)
+				/* CWI >= 2 ? */
+				if (atr->ib[i][ATR_INTERFACE_BYTE_TB].present && 
+					((atr->ib[i][ATR_INTERFACE_BYTE_TB].value & 0x0F) >= 2))
 				{
-					/* CWI >= 2 ? */
-					if ((atr->ib[i][ATR_INTERFACE_BYTE_TB].value & 0x0F) >= 2)
-					{
-						/* Init TC1 */
-						atr->ib[0][ATR_INTERFACE_BYTE_TC].present = TRUE;
-						atr->ib[0][ATR_INTERFACE_BYTE_TC].value = 2;
-						DEBUG_INFO("Extra EGT patch applied for T=1");
-					}
+					/* Init TC1 */
+					atr->ib[0][ATR_INTERFACE_BYTE_TC].present = TRUE;
+					atr->ib[0][ATR_INTERFACE_BYTE_TC].value = 2;
+					DEBUG_INFO("Extra EGT patch applied");
 
 					/* only the first TBi (i>2) must be used */
 					break;