CHG: '-DWITH_EMV' - fixing some compilation errors when compiling with peter fillmore...

[proxmark3-svn] / armsrc / iso14443b.h

diff --git a/armsrc/iso14443b.h b/armsrc/iso14443b.h
index e522c652e91010b2d6a96ebc1595809789413a3d..885d8730cc6b5973794f254694810c697f22de4c 100644 (file)
--- a/armsrc/iso14443b.h
+++ b/armsrc/iso14443b.h
@@ -13,31 +13,43 @@
 #ifndef __ISO14443B_H
 #define __ISO14443B_H
 
 #ifndef __ISO14443B_H
 #define __ISO14443B_H
 

+#ifdef __cplusplus
+extern "C" {
+#endif
+

 #include "proxmark3.h"
 #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 "apps.h"
 #include "util.h"
 #include "string.h"
 #include "iso14443crc.h"

-#include "common.h"
+

 #include "mifare.h"
 #include "protocols.h"
 #include "mifare.h"
 #include "protocols.h"

-#include "mifareutil.h"                // access to global variable: MF_DBGLEVEL
+//#include "mifareutil.h"      

 
 extern void AppendCrc14443b(uint8_t *data, int len);
 
 extern void AppendCrc14443b(uint8_t *data, int len);

-

 void SendRawCommand14443B_Ex(UsbCommand *c);
 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 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);
 

+// testfunctions
+void WaitForFpgaDelayQueueIsEmpty( uint16_t delay );
+void ClearFpgaShiftingRegisters(void);

 
 

-#define SIM_NOFIELD     0
-#define SIM_IDLE        1
-#define SIM_HALTED      2
-#define SIM_SELECTING 3
-#define SIM_HALTING   4
+// 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_ACKNOWLEDGE 5

+#define SIM_WORK               6
+
+#ifdef __cplusplus
+}
+#endif

 
 #endif /* __ISO14443B_H */
 
 #endif /* __ISO14443B_H */