X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b0127e65f1bef754e0ac72893e2ba99f9ca7f106..799b2e2e9da62c96a30e9a04da911ff3cbe8cbd9:/armsrc/iso14443a.h?ds=sidebyside

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index b8f56c15..1e978e88 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -15,41 +15,36 @@
 #include "common.h"
 #include "mifaresniff.h"
 
-// mifare reader                      over DMA buffer (SnoopIso14443a())!!!
-#define MIFARE_BUFF_OFFSET 3560  //              \/   \/   \/
-// card emulator memory
-#define EML_RESPONSES      4000
-#define CARD_MEMORY        6000
-#define CARD_MEMORY_LEN    4096
-
-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;
+		// DEMOD_HALF_SYNCD,
+		// DEMOD_MOD_FIRST_HALF,
+		// DEMOD_NOMOD_FIRST_HALF,
+		DEMOD_MANCHESTER_DATA
+	} state;
+	uint16_t twoBits;
+	uint16_t highCnt;
+	uint16_t bitCount;
+	uint16_t collisionPos;
+	uint16_t syncBit;
+	uint8_t  parityBits;
+	uint8_t  parityLen;
+	uint16_t shiftReg;
+	uint16_t samples;
+	uint16_t len;
+	uint32_t startTime, endTime;
+	uint8_t  *output;
+	uint8_t  *parity;
 } tDemod;
 
+typedef enum {
+	MOD_NOMOD = 0,
+	MOD_SECOND_HALF,
+	MOD_FIRST_HALF,
+	MOD_BOTH_HALVES
+	} Modulation_t;
+
 typedef struct {
 	enum {
 		STATE_UNSYNCD,
@@ -57,44 +52,38 @@ typedef struct {
 		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;
+		// DROP_NONE,
+		// DROP_FIRST_HALF,
+		} state;
+	uint16_t shiftReg;
+	uint16_t bitCount;
+	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 startTime, endTime;
+    uint8_t *output;
+	uint8_t *parity;
 } 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 int ReaderReceive(uint8_t* receivedAnswer);
-extern int ReaderReceivePar(uint8_t* receivedAnswer, uint32_t * parptr);
+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 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_timeout(uint32_t timeout);
+extern void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing);
+extern void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing);
+extern void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing);
+extern int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
 
-extern void iso14a_clear_tracelen(void);
-extern void iso14a_set_tracing(int enable);
+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 void iso14a_set_trigger(bool enable);
 
 #endif /* __ISO14443A_H */