CHG: breaking, forgot some..

[proxmark3-svn] / armsrc / iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index be8775cef7d0f66e83f4514e830a3de1a60a1983..326d8e95c21fe0fa3bf16138abb52ad5958cc463 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -12,9 +12,21 @@
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H

-#include "../include/common.h"
-#include "../include/mifare.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "cmd.h"
+#include "apps.h"
+#include "util.h"
+#include "string.h"
+#include "iso14443crc.h"

 #include "mifaresniff.h"
 #include "mifaresniff.h"

+#include "crapto1.h"
+#include "mifareutil.h"
+#include "parity.h"
+#include "random.h"

 
 typedef struct {
        enum {
 
 typedef struct {
        enum {


@@ -57,23 +69,20 @@ typedef struct {
                // DROP_FIRST_HALF,
                } state;
        uint16_t shiftReg;
                // DROP_FIRST_HALF,
                } state;
        uint16_t shiftReg;

-       uint16_t bitCount;
+       int16_t  bitCount;

        uint16_t len;
        uint16_t byteCntMax;
        uint16_t posCnt;
        uint16_t syncBit;
        uint8_t  parityBits;
        uint8_t  parityLen;
        uint16_t len;
        uint16_t byteCntMax;
        uint16_t posCnt;
        uint16_t syncBit;
        uint8_t  parityBits;
        uint8_t  parityLen;

-       uint16_t highCnt;
-       uint16_t twoBits;
+       uint32_t fourBits;

        uint32_t startTime, endTime;
     uint8_t *output;
        uint8_t *parity;
 } tUart;
 
 
        uint32_t startTime, endTime;
     uint8_t *output;
        uint8_t *parity;
 } tUart;
 
 

-
-extern byte_t oddparity (const byte_t bt);

 extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 extern void AppendCrc14443a(uint8_t *data, int len);
 
 extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 extern void AppendCrc14443a(uint8_t *data, int len);
 


@@ -84,7 +93,21 @@ extern int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
 
 extern void iso14443a_setup(uint8_t fpga_minor_mode);
 extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data);
 
 extern void iso14443a_setup(uint8_t fpga_minor_mode);
 extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data);

-extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr);
+extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades);

 extern void iso14a_set_trigger(bool enable);
 
 extern void iso14a_set_trigger(bool enable);
 

+int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);
+int EmSend4bit(uint8_t resp);
+int EmSendCmdExPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
+extern int EmSendCmd(uint8_t *resp, uint16_t respLen);
+extern int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);
+int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
+bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
+                               uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity);
+
+
+#ifdef __cplusplus
+}
+#endif                         
+

 #endif /* __ISO14443A_H */
 #endif /* __ISO14443A_H */