[Pcsclite-cvs-commit] r5322 - in /trunk/PCSC/src: eventhandler.h winscard.c winscard_clnt.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Fri Oct 15 13:16:10 UTC 2010
Author: rousseau
Date: Fri Oct 15 13:16:07 2010
New Revision: 5322
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5322
Log:
Rename the sharing states unsing the PCSCLITE_SHARING_ prefix
Doxygen: document the READER_STATE structure
Modified:
trunk/PCSC/src/eventhandler.h
trunk/PCSC/src/winscard.c
trunk/PCSC/src/winscard_clnt.c
Modified: trunk/PCSC/src/eventhandler.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/eventhandler.h?rev=5322&op=diff
==============================================================================
--- trunk/PCSC/src/eventhandler.h (original)
+++ trunk/PCSC/src/eventhandler.h Fri Oct 15 13:16:07 2010
@@ -31,14 +31,14 @@
*/
typedef struct pubReaderStatesList
{
- char readerName[MAX_READERNAME];
- uint32_t eventCounter;
- uint32_t readerState;
- int32_t readerSharing;
+ char readerName[MAX_READERNAME]; /**< reader name */
+ uint32_t eventCounter; /**< number of card events */
+ uint32_t readerState; /**< SCARD_* bit field */
+ int32_t readerSharing; /**< PCSCLITE_SHARING_* sharing status */
- UCHAR cardAtr[MAX_ATR_SIZE];
- uint32_t cardAtrLength;
- uint32_t cardProtocol;
+ UCHAR cardAtr[MAX_ATR_SIZE]; /**< ATR */
+ uint32_t cardAtrLength; /**< ATR length */
+ uint32_t cardProtocol; /**< SCARD_PROTOCOL_* value */
}
READER_STATE;
@@ -51,12 +51,12 @@
/*@null@*/ RESPONSECODE (*)(DWORD));
LONG EHDestroyEventHandler(READER_CONTEXT *);
-/** Some defines for context stack. */
-#define SCARD_LAST_CONTEXT 1
-/** Some defines for context stack. */
-#define SCARD_NO_CONTEXT 0
-/** Some defines for context stack. */
-#define SCARD_EXCLUSIVE_CONTEXT -1
+/** One application is using the reader */
+#define PCSCLITE_SHARING_LAST_CONTEXT 1
+/** No application is using the reader */
+#define PCSCLITE_SHARING_NO_CONTEXT 0
+/** Reader used in exclusive mode */
+#define PCSCLITE_SHARING_EXCLUSIVE_CONTEXT -1
/** Special value to indicate that power up has not yet happen
* This is used to auto start mode to wait until the reader is
Modified: trunk/PCSC/src/winscard.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard.c?rev=5322&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Fri Oct 15 13:16:07 2010
@@ -302,7 +302,7 @@
/*
* Connect if not exclusive mode
*/
- if (rContext->contexts == SCARD_EXCLUSIVE_CONTEXT)
+ if (rContext->contexts == PCSCLITE_SHARING_EXCLUSIVE_CONTEXT)
{
Log1(PCSC_LOG_ERROR, "Error Reader Exclusive");
return SCARD_E_SHARING_VIOLATION;
@@ -448,9 +448,9 @@
if (dwShareMode == SCARD_SHARE_EXCLUSIVE)
{
- if (rContext->contexts == SCARD_NO_CONTEXT)
- {
- rContext->contexts = SCARD_EXCLUSIVE_CONTEXT;
+ if (rContext->contexts == PCSCLITE_SHARING_NO_CONTEXT)
+ {
+ rContext->contexts = PCSCLITE_SHARING_EXCLUSIVE_CONTEXT;
(void)RFLockSharing(*phCard, rContext);
}
else
@@ -479,10 +479,10 @@
* Clean up - there is no more room
*/
(void)RFDestroyReaderHandle(*phCard);
- if (rContext->contexts == SCARD_EXCLUSIVE_CONTEXT)
- rContext->contexts = SCARD_NO_CONTEXT;
+ if (rContext->contexts == PCSCLITE_SHARING_EXCLUSIVE_CONTEXT)
+ rContext->contexts = PCSCLITE_SHARING_NO_CONTEXT;
else
- if (rContext->contexts > SCARD_NO_CONTEXT)
+ if (rContext->contexts > PCSCLITE_SHARING_NO_CONTEXT)
rContext->contexts -= 1;
*phCard = 0;
@@ -722,16 +722,16 @@
if (dwShareMode == SCARD_SHARE_EXCLUSIVE)
{
- if (rContext->contexts == SCARD_EXCLUSIVE_CONTEXT)
+ if (rContext->contexts == PCSCLITE_SHARING_EXCLUSIVE_CONTEXT)
{
/*
* Do nothing - we are already exclusive
*/
} else
{
- if (rContext->contexts == SCARD_LAST_CONTEXT)
+ if (rContext->contexts == PCSCLITE_SHARING_LAST_CONTEXT)
{
- rContext->contexts = SCARD_EXCLUSIVE_CONTEXT;
+ rContext->contexts = PCSCLITE_SHARING_EXCLUSIVE_CONTEXT;
(void)RFLockSharing(hCard, rContext);
} else
{
@@ -740,7 +740,7 @@
}
} else if (dwShareMode == SCARD_SHARE_SHARED)
{
- if (rContext->contexts != SCARD_EXCLUSIVE_CONTEXT)
+ if (rContext->contexts != PCSCLITE_SHARING_EXCLUSIVE_CONTEXT)
{
/*
* Do nothing - in sharing mode already
@@ -751,11 +751,11 @@
* We are in exclusive mode but want to share now
*/
(void)RFUnlockSharing(hCard, rContext);
- rContext->contexts = SCARD_LAST_CONTEXT;
+ rContext->contexts = PCSCLITE_SHARING_LAST_CONTEXT;
}
} else if (dwShareMode == SCARD_SHARE_DIRECT)
{
- if (rContext->contexts != SCARD_EXCLUSIVE_CONTEXT)
+ if (rContext->contexts != PCSCLITE_SHARING_EXCLUSIVE_CONTEXT)
{
/*
* Do nothing - in sharing mode already
@@ -766,7 +766,7 @@
* We are in exclusive mode but want to share now
*/
(void)RFUnlockSharing(hCard, rContext);
- rContext->contexts = SCARD_LAST_CONTEXT;
+ rContext->contexts = PCSCLITE_SHARING_LAST_CONTEXT;
}
} else
return SCARD_E_INVALID_VALUE;
@@ -930,8 +930,8 @@
/*
* For exclusive connection reset it to no connections
*/
- if (rContext->contexts == SCARD_EXCLUSIVE_CONTEXT)
- rContext->contexts = SCARD_NO_CONTEXT;
+ if (rContext->contexts == PCSCLITE_SHARING_EXCLUSIVE_CONTEXT)
+ rContext->contexts = PCSCLITE_SHARING_NO_CONTEXT;
else
{
/*
Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=5322&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Oct 15 13:16:07 2010
@@ -2144,7 +2144,7 @@
}
/* Now figure out sharing modes */
- if (rContext->readerSharing == SCARD_EXCLUSIVE_CONTEXT)
+ if (rContext->readerSharing == PCSCLITE_SHARING_EXCLUSIVE_CONTEXT)
{
currReader->dwEventState |= SCARD_STATE_EXCLUSIVE;
currReader->dwEventState &= ~SCARD_STATE_INUSE;
@@ -2155,7 +2155,7 @@
dwBreakFlag = 1;
}
}
- else if (rContext->readerSharing >= SCARD_LAST_CONTEXT)
+ else if (rContext->readerSharing >= PCSCLITE_SHARING_LAST_CONTEXT)
{
/* A card must be inserted for it to be INUSE */
if (readerState & SCARD_PRESENT)
@@ -2170,7 +2170,7 @@
}
}
}
- else if (rContext->readerSharing == SCARD_NO_CONTEXT)
+ else if (rContext->readerSharing == PCSCLITE_SHARING_NO_CONTEXT)
{
currReader->dwEventState &= ~SCARD_STATE_INUSE;
currReader->dwEventState &= ~SCARD_STATE_EXCLUSIVE;
More information about the Pcsclite-cvs-commit
mailing list