[Pcsclite-cvs-commit] r2613 - trunk/PCSC/src
rousseau at alioth.debian.org
rousseau at alioth.debian.org
Mon Aug 13 07:13:30 UTC 2007
Author: rousseau
Date: 2007-08-13 07:13:30 +0000 (Mon, 13 Aug 2007)
New Revision: 2613
Modified:
trunk/PCSC/src/atrhandler.c
trunk/PCSC/src/eventhandler.c
trunk/PCSC/src/winscard.c
Log:
use SCARD_PROTOCOL_UNDEFINED instead of SCARD_PROTOCOL_UNSET
Modified: trunk/PCSC/src/atrhandler.c
===================================================================
--- trunk/PCSC/src/atrhandler.c 2007-08-13 07:12:35 UTC (rev 2612)
+++ trunk/PCSC/src/atrhandler.c 2007-08-13 07:13:30 UTC (rev 2613)
@@ -65,8 +65,8 @@
/*
* Zero out the bitmasks
*/
- psExtension->CardCapabilities.AvailableProtocols = SCARD_PROTOCOL_UNSET;
- psExtension->CardCapabilities.CurrentProtocol = SCARD_PROTOCOL_UNSET;
+ psExtension->CardCapabilities.AvailableProtocols = SCARD_PROTOCOL_UNDEFINED;
+ psExtension->CardCapabilities.CurrentProtocol = SCARD_PROTOCOL_UNDEFINED;
/*
* Decode the TS byte
@@ -132,7 +132,7 @@
/*
* Set the current protocol TD1 (first TD only)
*/
- if (psExtension->CardCapabilities.CurrentProtocol == SCARD_PROTOCOL_UNSET)
+ if (psExtension->CardCapabilities.CurrentProtocol == SCARD_PROTOCOL_UNDEFINED)
{
switch (T)
{
@@ -229,7 +229,7 @@
/*
* If TDx is not set then the current must be T0
*/
- if (psExtension->CardCapabilities.CurrentProtocol == SCARD_PROTOCOL_UNSET)
+ if (psExtension->CardCapabilities.CurrentProtocol == SCARD_PROTOCOL_UNDEFINED)
{
psExtension->CardCapabilities.CurrentProtocol = SCARD_PROTOCOL_T0;
psExtension->CardCapabilities.AvailableProtocols |= SCARD_PROTOCOL_T0;
Modified: trunk/PCSC/src/eventhandler.c
===================================================================
--- trunk/PCSC/src/eventhandler.c 2007-08-13 07:12:35 UTC (rev 2612)
+++ trunk/PCSC/src/eventhandler.c 2007-08-13 07:13:30 UTC (rev 2613)
@@ -92,7 +92,7 @@
(readerStates[i])->readerState = 0;
(readerStates[i])->readerSharing = 0;
(readerStates[i])->cardAtrLength = 0;
- (readerStates[i])->cardProtocol = SCARD_PROTOCOL_UNSET;
+ (readerStates[i])->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
}
return SCARD_S_SUCCESS;
@@ -140,7 +140,7 @@
rContext->readerState->readerState = 0;
rContext->readerState->readerSharing = 0;
rContext->readerState->cardAtrLength = 0;
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
/* Zero the thread */
rContext->pthThread = 0;
@@ -188,7 +188,7 @@
rContext->readerState->readerState = dwStatus;
rContext->readerState->readerSharing = rContext->dwContexts;
rContext->readerState->cardAtrLength = dwAtrLen;
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
rv = SYS_ThreadCreate(&rContext->pthThread, THREAD_ATTR_DETACHED,
(PCSCLITE_THREAD_FUNCTION( ))EHStatusHandlerThread, (LPVOID) rContext);
@@ -237,7 +237,7 @@
&rContext->readerState->cardAtrLength);
/* the protocol is unset after a power on */
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
if (rv == IFD_SUCCESS)
{
@@ -282,7 +282,7 @@
dwStatus &= ~SCARD_SWALLOWED;
dwStatus &= ~SCARD_UNKNOWN;
rContext->readerState->cardAtrLength = 0;
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
dwCurrentState = SCARD_ABSENT;
}
@@ -320,7 +320,7 @@
rContext->readerState->readerState &= ~SCARD_SWALLOWED;
rContext->readerState->readerState |= SCARD_UNKNOWN;
rContext->readerState->cardAtrLength = 0;
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
dwCurrentState = SCARD_UNKNOWN;
@@ -362,7 +362,7 @@
RFSetReaderEventState(rContext, SCARD_REMOVED);
rContext->readerState->cardAtrLength = 0;
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
rContext->readerState->readerState |= SCARD_ABSENT;
rContext->readerState->readerState &= ~SCARD_UNKNOWN;
rContext->readerState->readerState &= ~SCARD_PRESENT;
@@ -393,7 +393,7 @@
&rContext->readerState->cardAtrLength);
/* the protocol is unset after a power on */
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
if (rv == IFD_SUCCESS)
{
Modified: trunk/PCSC/src/winscard.c
===================================================================
--- trunk/PCSC/src/winscard.c 2007-08-13 07:12:35 UTC (rev 2612)
+++ trunk/PCSC/src/winscard.c 2007-08-13 07:13:30 UTC (rev 2613)
@@ -382,7 +382,7 @@
if (dwShareMode != SCARD_SHARE_DIRECT)
{
/* the protocol is not yet set (no PPS yet) */
- if (SCARD_PROTOCOL_UNSET == rContext->readerState->cardProtocol)
+ if (SCARD_PROTOCOL_UNDEFINED == rContext->readerState->cardProtocol)
{
UCHAR ucAvailable, ucDefault;
int ret;
@@ -402,7 +402,7 @@
ret = PHSetProtocol(rContext, dwPreferredProtocols,
ucAvailable, ucDefault);
- /* keep cardProtocol = SCARD_PROTOCOL_UNSET in case of error */
+ /* keep cardProtocol = SCARD_PROTOCOL_UNDEFINED in case of error */
if (SET_PROTOCOL_PPS_FAILED == ret)
return SCARD_W_UNRESPONSIVE_CARD;
@@ -587,7 +587,7 @@
}
/* the protocol is unset after a power on */
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
/*
* Notify the card has been reset
@@ -697,7 +697,7 @@
if (dwShareMode != SCARD_SHARE_DIRECT)
{
/* the protocol is not yet set (no PPS yet) */
- if (SCARD_PROTOCOL_UNSET == rContext->readerState->cardProtocol)
+ if (SCARD_PROTOCOL_UNDEFINED == rContext->readerState->cardProtocol)
{
UCHAR ucAvailable, ucDefault;
int ret;
@@ -715,7 +715,7 @@
ret = PHSetProtocol(rContext, dwPreferredProtocols,
ucAvailable, ucDefault);
- /* keep cardProtocol = SCARD_PROTOCOL_UNSET in case of error */
+ /* keep cardProtocol = SCARD_PROTOCOL_UNDEFINED in case of error */
if (SET_PROTOCOL_PPS_FAILED == ret)
return SCARD_W_UNRESPONSIVE_CARD;
@@ -868,7 +868,7 @@
}
/* the protocol is unset after a power on */
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
/*
* Notify the card has been reset
@@ -1081,7 +1081,7 @@
}
/* the protocol is unset after a power on */
- rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
+ rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
/*
* Notify the card has been reset
More information about the Pcsclite-cvs-commit
mailing list