X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/81cd0474cb4dc85fcc78f70ad238cb684851f75f..e691fc45bcaf0ec02c0da0b472d06580046e918f:/armsrc/iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 28184bb9..2a2b3403 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -13,6 +13,7 @@
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
 #include "common.h"
+#include "mifaresniff.h"
 
 // mifare reader                      over DMA buffer (SnoopIso14443a())!!!
 #define MIFARE_BUFF_OFFSET 3560  //              \/   \/   \/
@@ -21,24 +22,69 @@
 #define CARD_MEMORY        6000
 #define CARD_MEMORY_LEN    4096
 
-typedef struct nestedVector { uint32_t nt, ks1; } nestedVector;
+typedef struct {
+	enum {
+		DEMOD_UNSYNCD,
+		DEMOD_HALF_SYNCD,
+		DEMOD_MOD_FIRST_HALF,
+		DEMOD_NOMOD_FIRST_HALF,
+		DEMOD_MANCHESTER_DATA
+	} state;
+	uint16_t bitCount;
+	uint16_t collisionPos;
+	uint16_t syncBit;
+	uint16_t parityBits;
+	uint16_t shiftReg;
+	uint16_t samples;
+	uint16_t len;
+	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 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 int ReaderReceive(uint8_t* receivedAnswer);
-extern int ReaderReceivePar(uint8_t* receivedAnswer, uint32_t * parptr);
+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 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 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(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 */