[Pcsclite-cvs-commit] PCSC/src ifdwrapper.c,1.7,1.8
sauveron-guest@quantz.debian.org
sauveron-guest@quantz.debian.org
Tue, 13 Jan 2004 18:53:44 +0100
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv6474/src
Modified Files:
ifdwrapper.c
Log Message:
Modify tests in order to be homogeneous with those for next IFDHandlers versions
Index: ifdwrapper.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/ifdwrapper.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ifdwrapper.c 18 Oct 2003 17:19:36 -0000 1.7
+++ ifdwrapper.c 13 Jan 2004 17:53:41 -0000 1.8
@@ -58,7 +58,7 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
IFD_set_protocol_parameters = (RESPONSECODE(*)(DWORD, UCHAR,
UCHAR, UCHAR,
@@ -80,7 +80,7 @@
ucValue[0] = rContext->dwSlot;
#ifndef PCSCLITE_STATIC_DRIVER
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
ucValue[0] = rContext->dwSlot;
IFDSetCapabilities(rContext, TAG_IFD_SLOTNUM, 1, ucValue);
@@ -94,7 +94,7 @@
ucPTS2, ucPTS3);
}
#else
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
ucValue[0] = rContext->dwSlot;
IFDSetCapabilities(rContext, TAG_IFD_SLOTNUM, 1, ucValue);
@@ -148,7 +148,7 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
IO_create_channel = (RESPONSECODE(*)(DWORD)) vFunction;
} else
@@ -163,7 +163,7 @@
SYS_MutexLock(rContext->mMutex);
#ifndef PCSCLITE_STATIC_DRIVER
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
rv = (*IO_create_channel) (dwChannelId);
} else
@@ -171,7 +171,7 @@
rv = (*IFDH_create_channel) (rContext->dwSlot, dwChannelId);
}
#else
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
rv = IO_Create_Channel(dwChannelId);
} else
@@ -221,7 +221,7 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
IO_close_channel = (RESPONSECODE(*)())vFunction;
} else
@@ -236,7 +236,7 @@
SYS_MutexLock(rContext->mMutex);
#ifndef PCSCLITE_STATIC_DRIVER
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
rv = (*IO_close_channel) ();
} else
@@ -244,7 +244,7 @@
rv = (*IFDH_close_channel) (rContext->dwSlot);
}
#else
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
rv = IO_Close_Channel();
} else
@@ -296,7 +296,7 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
IFD_set_capabilities = (RESPONSECODE(*)(DWORD, PUCHAR))
vFunction;
@@ -313,7 +313,7 @@
*/
#ifndef PCSCLITE_STATIC_DRIVER
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
rv = (*IFD_set_capabilities) (dwTag, pucValue);
} else
@@ -322,7 +322,7 @@
dwLength, pucValue);
}
#else
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
rv = IFD_Set_Capabilities(dwTag, pucValue);
} else
@@ -371,7 +371,7 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
IFD_get_capabilities = (RESPONSECODE(*)(DWORD, PUCHAR))
vFunction;
@@ -389,7 +389,7 @@
SYS_MutexLock(rContext->mMutex);
#ifndef PCSCLITE_STATIC_DRIVER
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
rv = (*IFD_get_capabilities) (dwTag, pucValue);
} else
@@ -398,7 +398,7 @@
pdwLength, pucValue);
}
#else
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
rv = IFD_Get_Capabilities(dwTag, pucValue);
} else
@@ -466,7 +466,7 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
IFD_power_icc = (RESPONSECODE(*)(DWORD)) vFunction;
} else
@@ -483,7 +483,7 @@
SYS_MutexLock(rContext->mMutex);
#ifndef PCSCLITE_STATIC_DRIVER
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
ucValue[0] = rContext->dwSlot;
IFDSetCapabilities(rContext, TAG_IFD_SLOTNUM, 1, ucValue);
@@ -496,7 +496,7 @@
ret = ATRDecodeAtr(&sSmartCard, pucAtr, *pdwAtrLen);
}
#else
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
ucValue[0] = rContext->dwSlot;
IFDSetCapabilities(rContext, TAG_IFD_SLOTNUM, 1, ucValue);
@@ -515,7 +515,7 @@
/*
* Get the ATR and it's length
*/
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
IFDStatusICC(rContext, &dwStatus, &dwProtocol, pucAtr, pdwAtrLen);
}
@@ -568,12 +568,12 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
- if (vFunctionB == 0 && rContext->dwVersion & IFD_HVERSION_1_0)
+ if ((vFunctionB == 0) && (rContext->dwVersion == IFD_HVERSION_1_0))
{
return SCARD_E_UNSUPPORTED_FEATURE;
}
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
IFD_is_icc_present = (RESPONSECODE(*)())vFunctionA;
IFD_get_capabilities = (RESPONSECODE(*)(DWORD, PUCHAR))
@@ -591,7 +591,7 @@
SYS_MutexLock(rContext->mMutex);
#ifndef PCSCLITE_STATIC_DRIVER
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
ucValue[0] = rContext->dwSlot;
IFDSetCapabilities(rContext, TAG_IFD_SLOTNUM, 1, ucValue);
@@ -601,7 +601,7 @@
rv = (*IFDH_icc_presence) (rContext->dwSlot);
}
#else
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
ucValue[0] = rContext->dwSlot;
IFDSetCapabilities(rContext, TAG_IFD_SLOTNUM, 1, ucValue);
@@ -634,7 +634,7 @@
* to conserve resources
*/
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
if (rv == IFD_SUCCESS || rv == IFD_ICC_PRESENT)
{
@@ -742,7 +742,7 @@
SYS_MutexLock(rContext->mMutex);
#ifndef PCSCLITE_STATIC_DRIVER
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
return SCARD_E_UNSUPPORTED_FEATURE;
} else
@@ -751,7 +751,7 @@
RxBuffer, RxLength);
}
#else
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
rv = SCARD_E_UNSUPPORTED_FEATURE;
} else
@@ -817,7 +817,7 @@
return SCARD_E_UNSUPPORTED_FEATURE;
}
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
IFD_transmit_to_icc = (RESPONSECODE(*)(SCARD_IO_HEADER, PUCHAR,
DWORD, PUCHAR, DWORD *,
@@ -840,7 +840,7 @@
#ifndef PCSCLITE_STATIC_DRIVER
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
ucValue[0] = rContext->dwSlot;
IFDSetCapabilities(rContext, TAG_IFD_SLOTNUM, 1, ucValue);
@@ -853,7 +853,7 @@
pucRxBuffer, pdwRxLength, pioRxPci);
}
#else
- if (rContext->dwVersion & IFD_HVERSION_1_0)
+ if (rContext->dwVersion == IFD_HVERSION_1_0)
{
ucValue[0] = rContext->dwSlot;
IFDSetCapabilities(rContext, TAG_IFD_SLOTNUM, 1, ucValue);