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

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 4c3c6674..2a2b3403 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -22,32 +22,22 @@
 #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 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 {
@@ -79,18 +69,18 @@ typedef struct {
 
 
 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 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 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 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);