projects / packages / opensc.git / blame
| Commit | Line | Data |
|---|---|---|
| c9f4880d JB |
1 | --- opensc-0.11.13/src/libopensc/reader-pcsc.c.orig 2010-02-16 10:03:28.000000000 +0100 |
| 2 | +++ opensc-0.11.13/src/libopensc/reader-pcsc.c 2010-08-09 08:30:20.494823295 +0200 | |
| 3 | @@ -80,7 +80,7 @@ struct pcsc_private_data { | |
| 4 | ||
| 5 | struct pcsc_slot_data { | |
| 6 | SCARDHANDLE pcsc_card; | |
| 7 | - SCARD_READERSTATE_A reader_state; | |
| 8 | + SCARD_READERSTATE reader_state; | |
| 9 | DWORD verify_ioctl; | |
| 10 | DWORD verify_ioctl_start; | |
| 11 | DWORD verify_ioctl_finish; | |
| 12 | @@ -353,7 +353,7 @@ static int pcsc_wait_for_event(sc_reader | |
| 13 | sc_context_t *ctx; | |
| 14 | SCARDCONTEXT pcsc_ctx; | |
| 15 | LONG ret; | |
| 16 | - SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS]; | |
| 17 | + SCARD_READERSTATE rgReaderStates[SC_MAX_READERS]; | |
| 18 | unsigned long on_bits, off_bits; | |
| 19 | time_t end_time, now, delta; | |
| 20 | size_t i; | |
| 21 | @@ -401,7 +401,7 @@ static int pcsc_wait_for_event(sc_reader | |
| 22 | /* Wait for a status change and return if it's a card insert/removal | |
| 23 | */ | |
| 24 | for( ; ; ) { | |
| 25 | - SCARD_READERSTATE_A *rsp; | |
| 26 | + SCARD_READERSTATE *rsp; | |
| 27 | ||
| 28 | /* Scan the current state of all readers to see if they | |
| 29 | * match any of the events we're polling for */ | |
| 30 | --- opensc-0.11.13/src/libopensc/internal-winscard.h.orig 2010-02-16 10:03:28.000000000 +0100 | |
| 31 | +++ opensc-0.11.13/src/libopensc/internal-winscard.h 2010-08-09 08:32:13.282823295 +0200 | |
| 32 | @@ -77,7 +77,7 @@ typedef struct | |
| 33 | unsigned long cbAtr; | |
| 34 | unsigned char rgbAtr[MAX_ATR_SIZE]; | |
| 35 | } | |
| 36 | -SCARD_READERSTATE_A; | |
| 37 | +SCARD_READERSTATE; | |
| 38 | ||
| 39 | typedef struct _SCARD_IO_REQUEST | |
| 40 | { | |
| 41 | @@ -87,8 +87,8 @@ typedef struct _SCARD_IO_REQUEST | |
| 42 | SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; | |
| 43 | ||
| 44 | typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; | |
| 45 | -typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A, | |
| 46 | - *LPSCARD_READERSTATE_A; | |
| 47 | +typedef SCARD_READERSTATE *PSCARD_READERSTATE, | |
| 48 | + *LPSCARD_READERSTATE; | |
| 49 | ||
| 50 | #endif /* HAVE_SCARD_H */ | |
| 51 | ||
| 52 | @@ -113,7 +113,7 @@ typedef LONG (PCSC_API *SCardEndTransact | |
| 53 | typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen, | |
| 54 | LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen); | |
| 55 | typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout, | |
| 56 | - LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders); | |
| 57 | + SCARD_READERSTATE *rgReaderStates, DWORD cReaders); | |
| 58 | typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength, | |
| 59 | LPVOID pbRecvBuffer, LPDWORD lpBytesReturned); | |
| 60 | typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer, |