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

[Ludovic Rousseau]

Author: rousseau
Date: 2005-09-28 08:02:23 +0000 (Wed, 28 Sep 2005)
New Revision: 1679

Modified:
   trunk/PCSC/src/prothandler.c
Log:
PHSetProtocol(): Solaris 10 IFDhandler returns
IFD_PROTOCOL_NOT_SUPPORTED if the protocol is not supported

Thanks to Douglas E. Engert for the patch


Modified: trunk/PCSC/src/prothandler.c
===================================================================
--- trunk/PCSC/src/prothandler.c	2005-09-28 07:49:37 UTC (rev 1678)
+++ trunk/PCSC/src/prothandler.c	2005-09-28 08:02:23 UTC (rev 1679)
@@ -136,16 +136,20 @@
 			Log2(PCSC_LOG_INFO, "PTS not supported by driver, using T=%d",
 				(SCARD_PROTOCOL_T0 == protocol) ? 0 : 1);
 		else
-		{
-			Log3(PCSC_LOG_INFO, "PTS failed (%d), using T=%d", rv,
-				(SCARD_PROTOCOL_T0 == protocol) ? 0 : 1);
+			if (IFD_PROTOCOL_NOT_SUPPORTED == rv)
+				Log2(PCSC_LOG_INFO, "PTS protocol not supported, using T=%d",
+					(SCARD_PROTOCOL_T0 == protocol) ? 0 : 1);
+			else
+			{
+				Log3(PCSC_LOG_INFO, "PTS failed (%d), using T=%d", rv,
+					(SCARD_PROTOCOL_T0 == protocol) ? 0 : 1);
 
- 			/* ISO 7816-3:1997 ch. 7.2 PPS protocol page 14
- 			 * - If the PPS exchange is unsuccessful, then the interface device
- 			 *   shall either reset or reject the card.
- 			 */
- 			return SET_PROTOCOL_PPS_FAILED;
- 		}
+				/* ISO 7816-3:1997 ch. 7.2 PPS protocol page 14
+				 * - If the PPS exchange is unsuccessful, then the interface device
+				 *   shall either reset or reject the card.
+				 */
+				return SET_PROTOCOL_PPS_FAILED;
+			}
 
 	return protocol;
 }