X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/aea4d76687f3aa3d5dcd0fc5cf3d36f8f753994c..b1231445c7e56f11d77c81c2e027e5fb85631ca0:/armsrc/iso14443a.h?ds=inline diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h index 2510a117..4c3c6674 100644 --- a/armsrc/iso14443a.h +++ b/armsrc/iso14443a.h @@ -13,13 +13,8 @@ #ifndef __ISO14443A_H #define __ISO14443A_H #include "common.h" +#include "mifaresniff.h" -// BIG CHANGE - UNDERSTAND THIS BEFORE WE COMMIT -#define RECV_CMD_OFFSET 3032 -#define RECV_RES_OFFSET 3096 -#define DMA_BUFFER_OFFSET 3160 -#define DMA_BUFFER_SIZE 4096 -#define TRACE_LENGTH 3000 // mifare reader over DMA buffer (SnoopIso14443a())!!! #define MIFARE_BUFF_OFFSET 3560 // \/ \/ \/ // card emulator memory @@ -29,22 +24,77 @@ 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 void ReaderTransmitShort(const uint8_t* bt); -extern void ReaderTransmit(uint8_t* frame, int len); -extern void ReaderTransmitPar(uint8_t* frame, int len, uint32_t par); +extern void ReaderTransmit(uint8_t* frame, int len, uint32_t *timing); +extern void ReaderTransmitBitsPar(uint8_t* frame, int bits, uint32_t par, uint32_t *timing); +extern void ReaderTransmitPar(uint8_t* frame, int len, uint32_t par, uint32_t *timing); extern int ReaderReceive(uint8_t* receivedAnswer); 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 void iso14a_set_trigger(bool enable); +extern void iso14a_set_timeout(uint32_t timeout); -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); +extern void iso14a_clear_tracelen(); +extern void iso14a_set_tracing(bool enable); #endif /* __ISO14443A_H */