X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/108262a145256facb03fef99c4caa9680fa3620c..1b4a446abac18d399b6b30eff6fb2a01407e95f1:/armsrc/iso14443a.h?ds=sidebyside

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index be8775ce..44d5733a 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -12,8 +12,7 @@
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
-#include "../include/common.h"
-#include "../include/mifare.h"
+#include "common.h"
 #include "mifaresniff.h"
 
 typedef struct {
@@ -57,23 +56,20 @@ 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;
 	uint8_t  parityBits;
 	uint8_t  parityLen;
-	uint16_t highCnt;
-	uint16_t twoBits;
+	uint32_t fourBits;
 	uint32_t startTime, endTime;
     uint8_t *output;
 	uint8_t *parity;
 } tUart;
 
 
-
-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);
 
@@ -84,7 +80,7 @@ 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, 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 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);
 
 #endif /* __ISO14443A_H */