Changeset 3487

Timestamp:

04/22/08 07:31:48 (9 months ago)

Author:

alonbl

Message:

Add SCARD_E_READER_UNAVAILABLE as acceptable

Location:

branches/alonbl/pnp/src/libopensc

Files:

• internal-winscard.h (modified) (1 diff)
• reader-pcsc.c (modified) (1 diff)

branches/alonbl/pnp/src/libopensc/internal-winscard.h

@@ -56 +56 @@
 #define SCARD_E_SHARING_VIOLATION       0x8010000B /**< The smart card cannot be accessed because of other connections outstanding. */
 #define SCARD_E_NOT_TRANSACTED          0x80100016 /**< An attempt was made to end a non-existent transaction. */
+#define SCARD_E_READER_UNAVAILABLE      0x80100017 /**< The specified reader is not currently available for use. */
 #define SCARD_E_NO_READERS_AVAILABLE    0x8010002E /**< Cannot find a smart card reader. */
 #define SCARD_W_UNRESPONSIVE_CARD       0x80100066 /**< The smart card is not responding to a reset. */

branches/alonbl/pnp/src/libopensc/reader-pcsc.c

@@ -645 +645 @@
         rv = priv->gpriv->SCardBeginTransaction(pslot->pcsc_card);
 
-        if ((unsigned int)rv == SCARD_E_INVALID_HANDLE) {
+        if ((unsigned int)rv == SCARD_E_INVALID_HANDLE || (unsigned int)rv == SCARD_E_READER_UNAVAILABLE) {
                 rv = pcsc_connect(reader, slot);
                 if (rv != SCARD_S_SUCCESS) {