param parsing convert to procedures

[proxmark3-svn] / armsrc / iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 9ee20c8e36f7f615c78a302bb5b7a54dbeaea308..8bd80510ad2557ec73e45049cc3c1e3fd84e7741 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -12,36 +12,45 @@
 
 #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
-
-
-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);
 
+#include <stdint.h>
+#include <stdbool.h>
+#include "usb_cmd.h"
+#include "mifare.h"
+
+typedef struct {
+  uint8_t* response;
+  uint8_t* modulation;
+  uint16_t response_n;
+  uint16_t modulation_n;
+  uint32_t ProxToAirDuration;
+  uint8_t  par; // enough for precalculated parity of 8 Byte responses
+} tag_response_info_t;
+
+extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
+extern void AppendCrc14443a(uint8_t *data, int len);
+
+extern void RAMFUNC SnoopIso14443a(uint8_t param);
+extern void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t *data);
+extern void ReaderIso14443a(UsbCommand *c);
+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 ReaderMifare(bool first_try);
+
+extern int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);
+extern int EmSendCmd(uint8_t *resp, uint16_t respLen);
+extern int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool correctionNeeded);
+extern int EmSend4bit(uint8_t resp);
+extern int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
+extern int EmSendPrecompiledCmd(tag_response_info_t *response_info, bool correctionNeeded);
+
+extern bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *buffer_size);
+
+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, bool no_rats);
+extern void iso14a_set_trigger(bool enable);
+extern void iso14a_set_timeout(uint32_t timeout);
 #endif /* __ISO14443A_H */