projects / packages / coolkey.git / blame
| Commit | Line | Data |
|---|---|---|
| a0d20333 JB |
1 | --- coolkey-1.1.0/src/libckyapplet/cky_card.h.orig 2006-06-09 20:44:17.000000000 +0200 |
| 2 | +++ coolkey-1.1.0/src/libckyapplet/cky_card.h 2014-08-22 18:01:19.189088030 +0200 | |
| 3 | @@ -41,23 +41,23 @@ CKYLIST_DECLARE(CKYReaderName, char *) | |
| 4 | CKYLIST_DECLARE(CKYCardConnection, CKYCardConnection *) | |
| 5 | ||
| 6 | CKY_BEGIN_PROTOS | |
| 7 | -void CKYReader_Init(SCARD_READERSTATE_A *reader); | |
| 8 | -void CKYReader_FreeData(SCARD_READERSTATE_A *reader); | |
| 9 | +void CKYReader_Init(SCARD_READERSTATE *reader); | |
| 10 | +void CKYReader_FreeData(SCARD_READERSTATE *reader); | |
| 11 | ||
| 12 | /* | |
| 13 | - * "Accessors": for SCARD_READERSTATE_A structure as a class. | |
| 14 | - * These functions take an SCARD_READERSTATE_A which can also be referenced | |
| 15 | + * "Accessors": for SCARD_READERSTATE structure as a class. | |
| 16 | + * These functions take an SCARD_READERSTATE which can also be referenced | |
| 17 | * directly. | |
| 18 | */ | |
| 19 | -CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE_A *reader, const char *name); | |
| 20 | -const char *CKYReader_GetReaderName(const SCARD_READERSTATE_A *reader); | |
| 21 | -CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE_A *reader, | |
| 22 | +CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE *reader, const char *name); | |
| 23 | +const char *CKYReader_GetReaderName(const SCARD_READERSTATE *reader); | |
| 24 | +CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE *reader, | |
| 25 | unsigned long state); | |
| 26 | -unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE_A *reader); | |
| 27 | -unsigned long CKYReader_GetEventState(const SCARD_READERSTATE_A *reader); | |
| 28 | -CKYStatus CKYReader_GetATR(const SCARD_READERSTATE_A *reader, CKYBuffer *buf); | |
| 29 | +unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE *reader); | |
| 30 | +unsigned long CKYReader_GetEventState(const SCARD_READERSTATE *reader); | |
| 31 | +CKYStatus CKYReader_GetATR(const SCARD_READERSTATE *reader, CKYBuffer *buf); | |
| 32 | /* create an array of READERSTATEs from a LIST of Readers */ | |
| 33 | -SCARD_READERSTATE_A *CKYReader_CreateArray(const CKYReaderNameList readerNames, | |
| 34 | +SCARD_READERSTATE *CKYReader_CreateArray(const CKYReaderNameList readerNames, | |
| 35 | unsigned long *readerCount); | |
| 36 | /* frees the reader, then the full array */ | |
| 37 | void CKYReader_DestroyArray(SCARD_READERSTATE *reader, unsigned long count); | |
| 38 | @@ -88,7 +88,7 @@ CKYStatus CKYCardContext_FindReadersByAT | |
| 39 | const CKYBuffer *targetATR); | |
| 40 | /* return if any of the readers in our array has changed in status */ | |
| 41 | CKYStatus CKYCardContext_WaitForStatusChange(CKYCardContext *context, | |
| 42 | - SCARD_READERSTATE_A *readers, | |
| 43 | + SCARD_READERSTATE *readers, | |
| 44 | unsigned long readerCount, | |
| 45 | unsigned long timeout); | |
| 46 | /* cancel any current operation (such as wait for status change) on this |