X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/75465377b93c9a27450a186342e9cfd2a84b4173..9833360b251571f82749c352f49d712c9c8322ad:/armsrc/iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 3c3993ba..e64c84d0 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -12,15 +12,21 @@
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
-#include "../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
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "cmd.h"
+#include "apps.h"
+#include "util.h"
+#include "string.h"
+#include "iso14443crc.h"
+#include "mifaresniff.h"
+#include "crapto1.h"
+#include "mifareutil.h"
+#include "parity.h"
+#include "random.h"
 
 typedef struct {
 	enum {
@@ -35,12 +41,14 @@ typedef struct {
 	uint16_t bitCount;
 	uint16_t collisionPos;
 	uint16_t syncBit;
-	uint32_t parityBits;
+	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 {
@@ -61,37 +69,47 @@ typedef struct {
 		// DROP_FIRST_HALF,
 		} state;
 	uint16_t shiftReg;
-	uint16_t bitCount;
+	int16_t	 bitCount;
 	uint16_t len;
 	uint16_t byteCntMax;
 	uint16_t posCnt;
 	uint16_t syncBit;
-	uint32_t parityBits;
-	uint16_t highCnt;
-	uint16_t twoBits;
+	uint8_t  parityBits;
+	uint8_t  parityLen;
+	uint32_t fourBits;
 	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 GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 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, 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 iso14443a_setup(uint8_t fpga_minor_mode);
-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, 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, bool anticollision, uint8_t num_cascades);
 extern void iso14a_set_trigger(bool enable);
-extern void iso14a_set_timeout(uint32_t timeout);
 
-extern void iso14a_clear_tracelen();
-extern void iso14a_set_tracing(bool enable);
+int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen, bool correctionNeeded);
+int EmSend4bitEx(uint8_t resp, bool correctionNeeded);
+int EmSend4bit(uint8_t resp);
+int EmSendCmdExPar(uint8_t *resp, uint16_t respLen, bool correctionNeeded, uint8_t *par);
+int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool correctionNeeded);
+extern int EmSendCmd(uint8_t *resp, uint16_t respLen);
+extern int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);
+int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
+bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
+				uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity);
+
+
+#ifdef __cplusplus
+}
+#endif				
 
 #endif /* __ISO14443A_H */