Merge pull request #264 from qweenwasabi/master

[proxmark3-svn] / armsrc / iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 9ee20c8e36f7f615c78a302bb5b7a54dbeaea308..658216e72461b44a8dfea9d08434dc203658100a 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -12,36 +12,21 @@
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
-#include "common.h"
 
-// BIG CHANGE - UNDERSTAND THIS BEFORE WE COMMIT
-#define RECV_CMD_OFFSET    3032
-#define RECV_RES_OFFSET    3096
-#define DMA_BUFFER_OFFSET  3160
-#define DMA_BUFFER_SIZE    4096
-#define TRACE_LENGTH       3000
-// 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    1024
+#include <stdint.h>
+#include <stdbool.h>
+#include "mifare.h"
 
+extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
+extern void AppendCrc14443a(uint8_t *data, int len);
 
-typedef struct nestedVector { uint32_t nt, ks1; } nestedVector;
-
-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 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 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, 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);
 #endif /* __ISO14443A_H */