git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/armsrc/apps.h b/armsrc/apps.h

index 93760aae32ea0e8eae5dc80e4576cb73211452e9..58a2a62196bd0cb2b96fe2259d7e962c8527ec77 100644 (file)

--- a/armsrc/apps.h

+++ b/armsrc/apps.h

@@ -17,25 +17,10 @@

#include "common.h"

#include "hitag2.h"

#include "mifare.h"

-

-// The large multi-purpose buffer, typically used to hold A/D samples,

-// maybe processed in some way.

-uint32_t BigBuf[10000];

-// BIG CHANGE - UNDERSTAND THIS BEFORE WE COMMIT

-#define TRACE_OFFSET 0

-#define TRACE_SIZE 3000

-#define RECV_CMD_OFFSET 3032

-#define RECV_CMD_SIZE 64

-#define RECV_RES_OFFSET 3096

-#define RECV_RES_SIZE 64

-#define DMA_BUFFER_OFFSET 3160

-#define DMA_BUFFER_SIZE 4096

-#define FREE_BUFFER_OFFSET 7256

-#define FREE_BUFFER_SIZE 2744

+#include "../common/crc32.h"

+#include "BigBuf.h"

extern const uint8_t OddByteParity[256];

-extern uint8_t *trace; // = (uint8_t *) BigBuf;

-extern int traceLen; // = 0;

extern int rsamples; // = 0;

extern int tracing; // = TRUE;

extern uint8_t trigger;

@@ -58,16 +43,14 @@ int AvgAdc(int ch);

void ToSendStuffBit(int b);

void ToSendReset(void);

void ListenReaderField(int limit);

-void AcquireRawAdcSamples125k(int at134khz);

-void DoAcquisition125k(void);

extern int ToSendMax;

extern uint8_t ToSend[];

-extern uint32_t BigBuf[];

/// fpga.h

void FpgaSendCommand(uint16_t cmd, uint16_t v);

void FpgaWriteConfWord(uint8_t v);

-void FpgaDownloadAndGo(void);

+void FpgaDownloadAndGo(int bitstream_version);

+int FpgaGatherBitstreamVersion();

void FpgaGatherVersion(char *dst, int len);

void FpgaSetupSsc(void);

void SetupSpi(int mode);

@@ -77,37 +60,52 @@ bool FpgaSetupSscDma(uint8_t *buf, int len);

void SetAdcMuxFor(uint32_t whichGpio);

// Definitions for the FPGA commands.

-#define FPGA_CMD_SET_CONFREG (1<<12)

-#define FPGA_CMD_SET_DIVISOR (2<<12)

+#define FPGA_CMD_SET_CONFREG (1<<12)

+#define FPGA_CMD_SET_DIVISOR (2<<12)

+#define FPGA_CMD_SET_USER_BYTE1 (3<<12)

// Definitions for the FPGA configuration word.

-#define FPGA_MAJOR_MODE_LF_READER (0<<5)

-#define FPGA_MAJOR_MODE_LF_EDGE_DETECT (1<<5)

-#define FPGA_MAJOR_MODE_HF_READER_TX (2<<5)

-#define FPGA_MAJOR_MODE_HF_READER_RX_XCORR (3<<5)

-#define FPGA_MAJOR_MODE_HF_SIMULATOR (4<<5)

-#define FPGA_MAJOR_MODE_HF_ISO14443A (5<<5)

-#define FPGA_MAJOR_MODE_LF_PASSTHRU (6<<5)

-#define FPGA_MAJOR_MODE_OFF (7<<5)

+// LF

+#define FPGA_MAJOR_MODE_LF_ADC (0<<5)

+#define FPGA_MAJOR_MODE_LF_EDGE_DETECT (1<<5)

+#define FPGA_MAJOR_MODE_LF_PASSTHRU (2<<5)

+// HF

+#define FPGA_MAJOR_MODE_HF_READER_TX (0<<5)

+#define FPGA_MAJOR_MODE_HF_READER_RX_XCORR (1<<5)

+#define FPGA_MAJOR_MODE_HF_SIMULATOR (2<<5)

+#define FPGA_MAJOR_MODE_HF_ISO14443A (3<<5)

+// BOTH

+#define FPGA_MAJOR_MODE_OFF (7<<5)

+// Options for LF_ADC

+#define FPGA_LF_ADC_READER_FIELD (1<<0)

// Options for LF_EDGE_DETECT

+#define FPGA_CMD_SET_EDGE_DETECT_THRESHOLD FPGA_CMD_SET_USER_BYTE1

#define FPGA_LF_EDGE_DETECT_READER_FIELD (1<<0)

+#define FPGA_LF_EDGE_DETECT_TOGGLE_MODE (1<<1)

// Options for the HF reader, tx to tag

#define FPGA_HF_READER_TX_SHALLOW_MOD (1<<0)

// Options for the HF reader, correlating against rx from tag

#define FPGA_HF_READER_RX_XCORR_848_KHZ (1<<0)

#define FPGA_HF_READER_RX_XCORR_SNOOP (1<<1)

-#define FPGA_HF_READER_RX_XCORR_QUARTER_FREQ (1<<2)

+#define FPGA_HF_READER_RX_XCORR_QUARTER_FREQ (1<<2)

// Options for the HF simulated tag, how to modulate

#define FPGA_HF_SIMULATOR_NO_MODULATION (0<<0)

#define FPGA_HF_SIMULATOR_MODULATE_BPSK (1<<0)

#define FPGA_HF_SIMULATOR_MODULATE_212K (2<<0)

+#define FPGA_HF_SIMULATOR_MODULATE_424K (4<<0)

+#define FPGA_HF_SIMULATOR_MODULATE_424K_8BIT 0x5//101

+

// Options for ISO14443A

-#define FPGA_HF_ISO14443A_SNIFFER (0<<0)

+#define FPGA_HF_ISO14443A_SNIFFER (0<<0)

#define FPGA_HF_ISO14443A_TAGSIM_LISTEN (1<<0)

#define FPGA_HF_ISO14443A_TAGSIM_MOD (2<<0)

#define FPGA_HF_ISO14443A_READER_LISTEN (3<<0)

#define FPGA_HF_ISO14443A_READER_MOD (4<<0)

/// lfops.h

+extern uint8_t decimation;

+extern uint8_t bits_per_sample ;

+extern bool averaging;

+

void AcquireRawAdcSamples125k(int divisor);

void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,uint8_t *command);

void ReadTItag(void);

@@ -117,6 +115,7 @@ void AcquireRawBitsTI(void);

void SimulateTagLowFrequency(int period, int gap, int ledcontrol);

void CmdHIDsimTAG(int hi, int lo, int ledcontrol);

void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol);

+void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol);

void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol);

void CopyIOtoT55x7(uint32_t hi, uint32_t lo, uint8_t longFMT); // Clone an ioProx card to T5557/T5567

void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);

@@ -146,8 +145,8 @@ void RAMFUNC SnoopIso14443a(uint8_t param);

void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data);

void ReaderIso14443a(UsbCommand * c);

// Also used in iclass.c

-bool RAMFUNC LogTrace(const uint8_t * btBytes, uint8_t iLen, uint32_t iSamples, uint32_t dwParity, bool readerToTag);

-uint32_t GetParity(const uint8_t * pbtCmd, int iLen);

+bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);

+void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *parity);

void iso14a_set_trigger(bool enable);

void iso14a_clear_trace();

void iso14a_set_tracing(bool enable);

@@ -161,7 +160,9 @@ void ReaderMifare(bool first_try);

int32_t dist_nt(uint32_t nt1, uint32_t nt2);

void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *data);

void MifareUReadBlock(uint8_t arg0,uint8_t *datain);

-void MifareUReadCard(uint8_t arg0,uint8_t *datain);

+void MifareUC_Auth1(uint8_t arg0, uint8_t *datain);

+void MifareUC_Auth2(uint32_t arg0, uint8_t *datain);

+void MifareUReadCard(uint8_t arg0, int Pages, uint8_t *datain);

void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);

void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);

void MifareUWriteBlock(uint8_t arg0,uint8_t *datain);

@@ -176,12 +177,32 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)

void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);

void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain); // Work with "magic Chinese" card

void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);

+void MifareCIdent(); // is "magic chinese" card?

+

+//desfire

+void Mifare_DES_Auth1(uint8_t arg0,uint8_t *datain);

+void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain);

+

+// mifaredesfire.h

+bool InitDesfireCard();

+void MifareSendCommand(uint8_t arg0,uint8_t arg1, uint8_t *datain);

+void MifareDesfireGetInformation();

+void MifareDES_Auth1(uint8_t arg0,uint8_t arg1,uint8_t arg2, uint8_t *datain);

+void ReaderMifareDES(uint32_t param, uint32_t param2, uint8_t * datain);

+int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout);

+size_t CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout);

+void OnSuccess();

+void OnError(uint8_t reason);

+

/// iso15693.h

void RecordRawAdcSamplesIso15693(void);

void AcquireRawAdcSamplesIso15693(void);

void ReaderIso15693(uint32_t parameter); // Simulate an ISO15693 reader - greg

-void SimTagIso15693(uint32_t parameter); // simulate an ISO15693 tag - greg

+void SimTagIso15693(uint32_t parameter, uint8_t *uid); // simulate an ISO15693 tag - greg

void BruteforceIso15693Afi(uint32_t speed); // find an AFI of a tag - atrox

void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t data[]); // send arbitrary commands from CLI - atrox

void SetDebugIso15693(uint32_t flag);

@@ -190,7 +211,9 @@ void SetDebugIso15693(uint32_t flag);

void RAMFUNC SnoopIClass(void);

void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);

void ReaderIClass(uint8_t arg0);

-void doIClassSimulation(uint8_t csn[], int breakAfterMacReceived);

+void ReaderIClass_Replay(uint8_t arg0,uint8_t *MAC);

+void IClass_iso14443A_GetPublic(uint8_t arg0);

+

// hitag2.h

void SnoopHitag(uint32_t type);

void SimulateHitagTag(bool tag_mem_supplied, byte_t* data);