[Pcsclite-cvs-commit] r5096 - in /trunk/PCSC: doc/example/pcsc_demo.c src/PCSC/pcsclite.h.in src/PCSC/winscard.h src/testpcsc.c src/utils/formaticc.c src/winscard.c src/winscard_clnt.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Mon Aug 2 14:33:39 UTC 2010
Author: rousseau
Date: Mon Aug 2 14:33:35 2010
New Revision: 5096
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5096
Log:
Use SCARD_READERSTATE instead of SCARD_READERSTATE_A
Remove definitions of SCARD_READERSTATE_A PSCARD_READERSTATE_A and
LPSCARD_READERSTATE_A types
Modified:
trunk/PCSC/doc/example/pcsc_demo.c
trunk/PCSC/src/PCSC/pcsclite.h.in
trunk/PCSC/src/PCSC/winscard.h
trunk/PCSC/src/testpcsc.c
trunk/PCSC/src/utils/formaticc.c
trunk/PCSC/src/winscard.c
trunk/PCSC/src/winscard_clnt.c
Modified: trunk/PCSC/doc/example/pcsc_demo.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/doc/example/pcsc_demo.c?rev=5096&op=diff
==============================================================================
--- trunk/PCSC/doc/example/pcsc_demo.c (original)
+++ trunk/PCSC/doc/example/pcsc_demo.c Mon Aug 2 14:33:35 2010
@@ -232,7 +232,7 @@
/* get card status change */
{
/* check only one reader */
- SCARD_READERSTATE_A rgReaderStates[1];
+ SCARD_READERSTATE rgReaderStates[1];
rgReaderStates[0].szReader = pbReader;
rgReaderStates[0].dwCurrentState = SCARD_STATE_UNAWARE;
Modified: trunk/PCSC/src/PCSC/pcsclite.h.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/PCSC/pcsclite.h.in?rev=5096&op=diff
==============================================================================
--- trunk/PCSC/src/PCSC/pcsclite.h.in (original)
+++ trunk/PCSC/src/PCSC/pcsclite.h.in Mon Aug 2 14:33:35 2010
@@ -46,10 +46,7 @@
unsigned long cbAtr;
unsigned char rgbAtr[MAX_ATR_SIZE];
}
-SCARD_READERSTATE_A;
-
-typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A,
- *LPSCARD_READERSTATE_A;
+SCARD_READERSTATE;
/** Protocol Control Information (PCI) */
typedef struct
Modified: trunk/PCSC/src/PCSC/winscard.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/PCSC/winscard.h?rev=5096&op=diff
==============================================================================
--- trunk/PCSC/src/PCSC/winscard.h (original)
+++ trunk/PCSC/src/PCSC/winscard.h Mon Aug 2 14:33:35 2010
@@ -67,7 +67,7 @@
PCSC_API LONG SCardGetStatusChange(SCARDCONTEXT hContext,
DWORD dwTimeout,
- LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders);
+ SCARD_READERSTATE *rgReaderStates, DWORD cReaders);
PCSC_API LONG SCardControl(SCARDHANDLE hCard, DWORD dwControlCode,
LPCVOID pbSendBuffer, DWORD cbSendLength,
Modified: trunk/PCSC/src/testpcsc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/testpcsc.c?rev=5096&op=diff
==============================================================================
--- trunk/PCSC/src/testpcsc.c (original)
+++ trunk/PCSC/src/testpcsc.c Mon Aug 2 14:33:35 2010
@@ -56,7 +56,7 @@
{
SCARDHANDLE hCard;
SCARDCONTEXT hContext;
- SCARD_READERSTATE_A rgReaderStates[1];
+ SCARD_READERSTATE rgReaderStates[1];
DWORD dwReaderLen, dwState, dwProt, dwAtrLen;
DWORD dwPref, dwReaders = 0;
char *pcReaders = NULL, *mszReaders;
Modified: trunk/PCSC/src/utils/formaticc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/utils/formaticc.c?rev=5096&op=diff
==============================================================================
--- trunk/PCSC/src/utils/formaticc.c (original)
+++ trunk/PCSC/src/utils/formaticc.c Mon Aug 2 14:33:35 2010
@@ -30,7 +30,7 @@
SCARDHANDLE hCard;
SCARDCONTEXT hContext;
SCARD_IO_REQUEST sRecvPci;
- SCARD_READERSTATE_A rgReaderStates[1];
+ SCARD_READERSTATE rgReaderStates[1];
DWORD dwSendLength, dwRecvLength, dwPref, dwReaders;
LPSTR mszReaders;
BYTE s[MAX_BUFFER_SIZE], r[MAX_BUFFER_SIZE];
Modified: trunk/PCSC/src/winscard.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard.c?rev=5096&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Mon Aug 2 14:33:35 2010
@@ -1337,7 +1337,7 @@
LONG SCardGetStatusChange(/*@unused@*/ SCARDCONTEXT hContext,
/*@unused@*/ DWORD dwTimeout,
- /*@unused@*/ LPSCARD_READERSTATE_A rgReaderStates,
+ /*@unused@*/ SCARD_READERSTATE *rgReaderStates,
/*@unused@*/ DWORD cReaders)
{
/*
Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=5096&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Mon Aug 2 14:33:35 2010
@@ -1840,7 +1840,7 @@
*
* @code
* SCARDCONTEXT hContext;
- * SCARD_READERSTATE_A rgReaderStates[2];
+ * SCARD_READERSTATE rgReaderStates[2];
* LONG rv;
* ...
* rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
@@ -1857,9 +1857,9 @@
* @endcode
*/
LONG SCardGetStatusChange(SCARDCONTEXT hContext, DWORD dwTimeout,
- LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders)
-{
- PSCARD_READERSTATE_A currReader;
+ SCARD_READERSTATE *rgReaderStates, DWORD cReaders)
+{
+ SCARD_READERSTATE *currReader;
READER_STATE *rContext;
long dwTime;
DWORD dwState;
More information about the Pcsclite-cvs-commit
mailing list