added 'hitag2.ht2' binary example image for emulation

[proxmark3-svn] / armsrc / iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 28184bb9d03ef63521ec1b09a28bd2d106129c36..b8f56c153e96589f5438a8bd9110220ec21d5051 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -13,6 +13,7 @@
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
 #include "common.h"
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
 #include "common.h"

+#include "mifaresniff.h"

 
 // mifare reader                      over DMA buffer (SnoopIso14443a())!!!
 #define MIFARE_BUFF_OFFSET 3560  //              \/   \/   \/
 
 // mifare reader                      over DMA buffer (SnoopIso14443a())!!!
 #define MIFARE_BUFF_OFFSET 3560  //              \/   \/   \/


@@ -23,6 +24,60 @@
 
 typedef struct nestedVector { uint32_t nt, ks1; } nestedVector;
 
 
 typedef struct nestedVector { uint32_t nt, ks1; } nestedVector;
 

+typedef struct {
+       enum {
+               DEMOD_UNSYNCD,
+               DEMOD_START_OF_COMMUNICATION,
+               DEMOD_MANCHESTER_D,
+               DEMOD_MANCHESTER_E,
+               DEMOD_MANCHESTER_F,
+               DEMOD_ERROR_WAIT
+       }       state;
+       int     bitCount;
+       int     posCount;
+       int     syncBit;
+       int     parityBits;
+       uint16_t    shiftReg;
+       int     buffer;
+       int     buff;
+       int     samples;
+       int     len;
+       enum {
+               SUB_NONE,
+               SUB_FIRST_HALF,
+               SUB_SECOND_HALF
+       }               sub;
+       uint8_t   *output;
+} tDemod;
+
+typedef struct {
+       enum {
+               STATE_UNSYNCD,
+               STATE_START_OF_COMMUNICATION,
+               STATE_MILLER_X,
+               STATE_MILLER_Y,
+               STATE_MILLER_Z,
+               STATE_ERROR_WAIT
+               }               state;
+               uint16_t    shiftReg;
+               int     bitCnt;
+               int     byteCnt;
+               int     byteCntMax;
+               int     posCnt;
+               int     syncBit;
+               int     parityBits;
+               int     samples;
+               int     highCnt;
+               int     bitBuffer;
+       enum {
+               DROP_NONE,
+               DROP_FIRST_HALF,
+               DROP_SECOND_HALF
+       }               drop;
+    uint8_t   *output;
+} tUart;
+
+

 extern byte_t oddparity (const byte_t bt);
 extern uint32_t GetParity(const uint8_t * pbtCmd, int iLen);
 extern void AppendCrc14443a(uint8_t* data, int len);
 extern byte_t oddparity (const byte_t bt);
 extern uint32_t GetParity(const uint8_t * pbtCmd, int iLen);
 extern void AppendCrc14443a(uint8_t* data, int len);


@@ -34,11 +89,12 @@ extern int ReaderReceive(uint8_t* receivedAnswer);
 extern int ReaderReceivePar(uint8_t* receivedAnswer, uint32_t * parptr);
 
 extern void iso14443a_setup();
 extern int ReaderReceivePar(uint8_t* receivedAnswer, uint32_t * parptr);
 
 extern void iso14443a_setup();

+extern int iso14_apdu(uint8_t * cmd, size_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 void iso14a_set_trigger(int enable);
 extern int iso14443a_select_card(uint8_t * uid_ptr, iso14a_card_select_t * resp_data, uint32_t * cuid_ptr);
 extern void iso14a_set_trigger(int enable);

+extern void iso14a_set_timeout(uint32_t timeout);

 
 extern void iso14a_clear_tracelen(void);
 extern void iso14a_set_tracing(int enable);
 
 extern void iso14a_clear_tracelen(void);
 extern void iso14a_set_tracing(int enable);

-extern int LogTrace(const uint8_t * btBytes, int iLen, int iSamples, uint32_t dwParity, int bReader);

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