Merge pull request #90 from 4m4rOk/master

[proxmark3-svn] / armsrc / iso14443b.h

diff --git a/armsrc/iso14443b.h b/armsrc/iso14443b.h
index 30d1ac343a26158472278170ca4543f5593f24a7..8fc705d4460d7dcb21cec7177177437a46702347 100644 (file)
--- a/armsrc/iso14443b.h
+++ b/armsrc/iso14443b.h
@@ -13,23 +13,41 @@
 #ifndef __ISO14443B_H
 #define __ISO14443B_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "proxmark3.h"
+#include "common.h"    // access to global variable: MF_DBGLEVEL
 #include "apps.h"
 #include "util.h"
 #include "string.h"
 #include "iso14443crc.h"
-#include "common.h"
 #include "mifare.h"
 #include "protocols.h"
-#include "mifareutil.h"                // access to global variable: MF_DBGLEVEL
 
 extern void AppendCrc14443b(uint8_t *data, int len);
-
-uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response);
+void SendRawCommand14443B_Ex(UsbCommand *c);
 void iso14443b_setup();
+uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response);
 uint8_t iso14443b_select_card(iso14b_card_select_t* card);
 uint8_t iso14443b_select_card_srx(iso14b_card_select_t* card);
 
-void SendRawCommand14443B_Ex(UsbCommand *c);
+// testfunctions
+void WaitForFpgaDelayQueueIsEmpty( uint16_t delay );
+void ClearFpgaShiftingRegisters(void);
+
+// States for 14B SIM command
+#define SIM_NOFIELD            0
+#define SIM_IDLE               1
+#define SIM_HALTED             2
+#define SIM_SELECTING  3
+#define SIM_HALTING            4
+#define SIM_ACKNOWLEDGE 5
+#define SIM_WORK               6
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __ISO14443B_H */