[Pcsclite-cvs-commit] r5315 - in /trunk/PCSC/src: readerfactory.c winscard.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Oct 13 16:27:33 2010
New Revision: 5315

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5315
Log:
Use the simpler form of IFDPowerICC(..., IFD_POWER_DOWN, ...) introduced
in revision 5314

Modified:
    trunk/PCSC/src/readerfactory.c
    trunk/PCSC/src/winscard.c

Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=5315&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Wed Oct 13 16:27:33 2010
@@ -1019,7 +1019,7 @@
 	 * If the reader is getting uninitialized then it is being unplugged
 	 * so I can't send a IFDPowerICC call to it
 	 *
-	 * IFDPowerICC( rContext, IFD_POWER_DOWN, Atr, &AtrLen );
+	 * IFDPowerICC(rContext, IFD_POWER_DOWN, NULL, NULL);
 	 */
 	(void)IFDCloseIFD(rContext);
 	(void)RFUnBindFunctions(rContext);

Modified: trunk/PCSC/src/winscard.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard.c?rev=5315&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Wed Oct 13 16:27:33 2010
@@ -580,10 +580,7 @@
 				&dwAtrLen);
 		else
 		{
-			rv = IFDPowerICC(rContext, IFD_POWER_DOWN,
-				rContext->readerState->cardAtr,
-				&dwAtrLen);
-			dwAtrLen = sizeof(rContext->readerState->cardAtr);
+			rv = IFDPowerICC(rContext, IFD_POWER_DOWN, NULL, NULL);
 			rv = IFDPowerICC(rContext, IFD_POWER_UP,
 				rContext->readerState->cardAtr,
 				&dwAtrLen);
@@ -852,10 +849,7 @@
 				&dwAtrLen);
 		else
 		{
-			rv = IFDPowerICC(rContext, IFD_POWER_DOWN,
-				rContext->readerState->cardAtr,
-				&dwAtrLen);
-			dwAtrLen = sizeof(rContext->readerState->cardAtr);
+			rv = IFDPowerICC(rContext, IFD_POWER_DOWN, NULL, NULL);
 			rv = IFDPowerICC(rContext, IFD_POWER_UP,
 				rContext->readerState->cardAtr,
 				&dwAtrLen);
@@ -1051,10 +1045,7 @@
 				&dwAtrLen);
 		else
 		{
-			rv = IFDPowerICC(rContext, IFD_POWER_DOWN,
-				rContext->readerState->cardAtr,
-				&dwAtrLen);
-			dwAtrLen = sizeof(rContext->readerState->cardAtr);
+			rv = IFDPowerICC(rContext, IFD_POWER_DOWN, NULL, NULL);
 			rv = IFDPowerICC(rContext, IFD_POWER_UP,
 				rContext->readerState->cardAtr,
 				&dwAtrLen);