[Pyscard-devel] SF.net SVN: pyscard:[396] trunk/pyscard/src/smartcard

[<jda...@us...>]

Revision: 396
          http://pyscard.svn.sourceforge.net/pyscard/?rev=396&view=rev
Author:   jdaussel
Date:     2010-04-20 15:45:17 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
Moved handling of ScardGetStatusChange() in python layer

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/ChangeLog
    trunk/pyscard/src/smartcard/scard/scard.i

Modified: trunk/pyscard/src/smartcard/ChangeLog
===================================================================
--- trunk/pyscard/src/smartcard/ChangeLog	2010-04-20 15:39:27 UTC (rev 395)
+++ trunk/pyscard/src/smartcard/ChangeLog	2010-04-20 15:45:17 UTC (rev 396)
@@ -9,8 +9,12 @@
         * rename FEATURE_MCT_READERDIRECT in FEATURE_MCT_READER_DIRECT to be conform with PCSC v2 part 10 ch. 2.3 (Ludovic Rousseau)
         * added missing CARD_E_NO_READERS_AVAILABLE (Kjell Tore Fossbakk)
         * added support of x86_64 on Mac OS X Snow Leopard (Jakob Schlyter)
+        * ATR can be passed in input in the reader state list (Benoit Allard)
+        * clear state changed bit in waitforcard/waitforcardevent upon time-out or reader removal (Jean-Daniel Aussel)
+        * removed clearing of states and ATR content upon SCardGetStatusChange() error (Benoit Allard); handling is now moved up in python framework (Jean-Daniel Aussel)
 
 
+
 1.6.8 (July 2009)
 =================
         * fixed SCARD_ERROR types to match correct types on linux and Mac OS X (Ludovic Rousseau)

Modified: trunk/pyscard/src/smartcard/scard/scard.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/scard.i	2010-04-20 15:39:27 UTC (rev 395)
+++ trunk/pyscard/src/smartcard/scard/scard.i	2010-04-20 15:45:17 UTC (rev 396)
@@ -558,21 +558,6 @@
     //    printf( "%.8lx %.8lx ", prsl->ars[i].dwCurrentState, prsl->ars[i].dwEventState );
     //}
 
-    // there was a time-out or we asked for an unexisting reader
-    // in this case, the output values of the READERSTATELIST are meaningless
-    if( SCARD_E_TIMEOUT==hresult || SCARD_E_UNKNOWN_READER==hresult)
-    {
-        // for each state, output event state is input event state, and nuke ATR if no card present
-        for( i=0; i<prsl->cRStates; i++ )
-        {
-            // remove changed bit
-            prsl->ars[i].dwEventState = prsl->ars[i].dwCurrentState;
-
-            // ATR not valid on output
-            prsl->ars[i].cbAtr=0;
-        }
-    }
-
     return hresult;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.