Changeset 412292e in OpenSC

Timestamp:

02/24/02 20:16:07 (10 years ago)

Author:

aet <aet@…>

Branches:

master, staging

Children:

e605e6f

Parents:

3fa1b27

git-author:

aet <aet@…> (02/24/02 20:16:07)

git-committer:

aet <aet@…> (02/24/02 20:16:07)

Message:

Add missing SC_STATUS_TIMEOUT that was removed from sc-internal.h

git-svn-id:  https://www.opensc-project.org/svnp/opensc/trunk@223 c6295689-39f2-0310-b995-f0e70906c6a9

File:

• src/libopensc/reader-pcsc.c (modified) (3 diffs)

src/libopensc/reader-pcsc.c

@@ -25 +25 @@
 #include <string.h>
 #include <winscard.h>
+
+/* Default timeout value for SCardGetStatusChange
+ * Needs to be increased for some broken PC/SC
+ * Lite implementations.
+ */
+#ifndef SC_CUSTOM_STATUS_TIMEOUT
+#define SC_STATUS_TIMEOUT 0
+#else
+#define SC_STATUS_TIMEOUT SC_CUSTOM_STATUS_TIMEOUT
+#endif
 
 #define GET_SLOT_PTR(s, i) (&(s)->slot[(i)])
@@ -143 +153 @@
         rgReaderStates[0].dwCurrentState = SCARD_STATE_UNAWARE;
         rgReaderStates[0].dwEventState = SCARD_STATE_UNAWARE;
-        ret = SCardGetStatusChange(priv->pcsc_ctx, 0, rgReaderStates, 1);
+        ret = SCardGetStatusChange(priv->pcsc_ctx, SC_STATUS_TIMEOUT, rgReaderStates, 1);
         if (ret != 0) {
                 error(reader->ctx, "SCardGetStatusChange failed: %s\n", pcsc_stringify_error(ret));
@@ -165 +175 @@
         rgReaderStates[0].dwCurrentState = SCARD_STATE_UNAWARE;
         rgReaderStates[0].dwEventState = SCARD_STATE_UNAWARE;
-        ret = SCardGetStatusChange(priv->pcsc_ctx, 0, rgReaderStates, 1);
+        ret = SCardGetStatusChange(priv->pcsc_ctx, SC_STATUS_TIMEOUT, rgReaderStates, 1);
         if (ret != 0) {
                 error(reader->ctx, "SCardGetStatusChange failed: %s\n", pcsc_stringify_error(ret));