[Pcsclite-cvs-commit] r1744 - trunk/PCSC/src

[Ludovic Rousseau]

Author: rousseau
Date: 2005-11-24 15:42:19 +0000 (Thu, 24 Nov 2005)
New Revision: 1744

Modified:
   trunk/PCSC/src/winscard.c
Log:
SCardConnect(): do not print an error ""Active Protocol: unknown 0" when
we are connecting in direct mode. The card is not supposed to be used at
this time.


Modified: trunk/PCSC/src/winscard.c
===================================================================
--- trunk/PCSC/src/winscard.c	2005-11-24 15:32:41 UTC (rev 1743)
+++ trunk/PCSC/src/winscard.c	2005-11-24 15:42:19 UTC (rev 1744)
@@ -313,13 +313,18 @@
 
 	*pdwActiveProtocol = rContext->readerState->cardProtocol;
 
-	if ((*pdwActiveProtocol != SCARD_PROTOCOL_T0)
-		&& (*pdwActiveProtocol != SCARD_PROTOCOL_T1))
-		Log2(PCSC_LOG_ERROR, "Active Protocol: unknown %d",
-			*pdwActiveProtocol);
+	if (dwShareMode != SCARD_SHARE_DIRECT)
+	{
+		if ((*pdwActiveProtocol != SCARD_PROTOCOL_T0)
+			&& (*pdwActiveProtocol != SCARD_PROTOCOL_T1))
+			Log2(PCSC_LOG_ERROR, "Active Protocol: unknown %d",
+				*pdwActiveProtocol);
+		else
+			Log2(PCSC_LOG_DEBUG, "Active Protocol: T=%d",
+				(*pdwActiveProtocol == SCARD_PROTOCOL_T0) ? 0 : 1);
+	}
 	else
-		Log2(PCSC_LOG_DEBUG, "Active Protocol: T=%d",
-			(*pdwActiveProtocol == SCARD_PROTOCOL_T0) ? 0 : 1);
+		Log1(PCSC_LOG_DEBUG, "Direct access: no protocol selected");
 
 	/*
 	 * Prepare the SCARDHANDLE identity