fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part4

[proxmark3-svn] / include / common.h

diff --git a/include/common.h b/include/common.h
index cfce1b9f0347f6a23b3081c088ed33e08f2461bb..ba286377fe356ac33686e4696d0badeb8e6710d0 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -12,27 +12,13 @@
 #ifndef __COMMON_H
 #define __COMMON_H
 
+#include <stddef.h>
 #include <stdint.h>
+#include <stdbool.h>
+#include <at91sam7s512.h>
 typedef unsigned char byte_t;
 
-//-----------------------------------------------------------------------------
-// ISO 14443A
-//-----------------------------------------------------------------------------
-typedef struct {
-       uint8_t atqa[2];
-       uint8_t  sak;
-       uint8_t  ats_len;
-       uint8_t  ats[20]; //FIXME: size?
-} __attribute__((__packed__)) iso14a_card_select_t;
-
-typedef enum ISO14A_COMMAND {
-       ISO14A_CONNECT = 1,
-       ISO14A_NO_DISCONNECT = 2,
-       ISO14A_APDU = 4,
-       ISO14A_RAW = 8,
-       ISO14A_REQUEST_TRIGGER = 0x10,
-       ISO14A_APPEND_CRC = 0x20,
-       ISO14A_SET_TIMEOUT = 0x40
-} iso14a_command_t;
+#define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
 
 #endif