diff options
| author | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2010-09-08 20:56:55 +0000 |
|---|---|---|
| committer | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2010-09-08 20:56:55 +0000 |
| commit | 273a416b148af0f935b58878da72755d0eee25cd (patch) | |
| tree | fabc5b31e7b8969602fa74351e890d9b62ec6b15 | |
| parent | 12ab0e4a366c0c6083dac7c4213c9329c118f03d (diff) | |
Remove depricated SCARD_READERSTATE_A definition and only use SCARD_READERSTATE.
git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@89 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
| -rw-r--r-- | src/libckyapplet/cky_card.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/libckyapplet/cky_card.h b/src/libckyapplet/cky_card.h index 75ceb45..5e5e51e 100644 --- a/src/libckyapplet/cky_card.h +++ b/src/libckyapplet/cky_card.h @@ -41,23 +41,23 @@ CKYLIST_DECLARE(CKYReaderName, char *) CKYLIST_DECLARE(CKYCardConnection, CKYCardConnection *) CKY_BEGIN_PROTOS -void CKYReader_Init(SCARD_READERSTATE_A *reader); -void CKYReader_FreeData(SCARD_READERSTATE_A *reader); +void CKYReader_Init(SCARD_READERSTATE *reader); +void CKYReader_FreeData(SCARD_READERSTATE *reader); /* - * "Accessors": for SCARD_READERSTATE_A structure as a class. - * These functions take an SCARD_READERSTATE_A which can also be referenced + * "Accessors": for SCARD_READERSTATE structure as a class. + * These functions take an SCARD_READERSTATE which can also be referenced * directly. */ -CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE_A *reader, const char *name); -const char *CKYReader_GetReaderName(const SCARD_READERSTATE_A *reader); -CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE_A *reader, +CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE *reader, const char *name); +const char *CKYReader_GetReaderName(const SCARD_READERSTATE *reader); +CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE *reader, unsigned long state); -unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE_A *reader); -unsigned long CKYReader_GetEventState(const SCARD_READERSTATE_A *reader); -CKYStatus CKYReader_GetATR(const SCARD_READERSTATE_A *reader, CKYBuffer *buf); +unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE *reader); +unsigned long CKYReader_GetEventState(const SCARD_READERSTATE *reader); +CKYStatus CKYReader_GetATR(const SCARD_READERSTATE *reader, CKYBuffer *buf); /* create an array of READERSTATEs from a LIST of Readers */ -SCARD_READERSTATE_A *CKYReader_CreateArray(const CKYReaderNameList readerNames, +SCARD_READERSTATE *CKYReader_CreateArray(const CKYReaderNameList readerNames, unsigned long *readerCount); /* frees the reader, then the full array */ void CKYReader_DestroyArray(SCARD_READERSTATE *reader, unsigned long count); @@ -88,7 +88,7 @@ CKYStatus CKYCardContext_FindReadersByATR(CKYCardContext *context, const CKYBuffer *targetATR); /* return if any of the readers in our array has changed in status */ CKYStatus CKYCardContext_WaitForStatusChange(CKYCardContext *context, - SCARD_READERSTATE_A *readers, + SCARD_READERSTATE *readers, unsigned long readerCount, unsigned long timeout); /* cancel any current operation (such as wait for status change) on this |