summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2011-02-03 16:52:01 +0200
committerAlon Levy <alevy@redhat.com>2011-02-03 16:54:27 +0200
commit1aca21369343732afef2f015987b528bd381eeef (patch)
tree26250a63ef9d6b8233bb0f22465148ebc401c235
parent57215b5ab46ebd6a75d5eacd44d882e6692feb06 (diff)
vscard_common: Header comment updated
-rw-r--r--vscard_common.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/vscard_common.h b/vscard_common.h
index 425abf5..5cb6eb5 100644
--- a/vscard_common.h
+++ b/vscard_common.h
@@ -47,10 +47,7 @@
#define VSCARD_VERSION MAKE_VERSION(0,0,2)
-#define VSCARD_UNDEFINED_READER_ID -1
-#define VSCARD_MINIMAL_READER_ID 0
-
-typedef enum {
+typedef enum VSCMsgType {
VSC_Init = 1,
VSC_Error,
VSC_ReaderAdd,
@@ -62,19 +59,15 @@ typedef enum {
VSC_FlushComplete
} VSCMsgType;
-typedef enum {
+typedef enum VSCErrorCode {
VSC_SUCCESS=0,
VSC_GENERAL_ERROR=1,
VSC_CANNOT_ADD_MORE_READERS,
VSC_CARD_ALREAY_INSERTED,
} VSCErrorCode;
-<<<<<<<
-typedef uint32_t reader_id_t;
-=======
#define VSCARD_UNDEFINED_READER_ID 0xffffffff
#define VSCARD_MINIMAL_READER_ID 0
->>>>>>>
#define VSCARD_MAGIC (*(uint32_t*)"VSCD")