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

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

index 27e08fa1e528f7a894b67d652854eeb27821947b..b5638ee188b15b3b180521313cbb36b8b9198757 100644 (file)

--- a/armsrc/apps.h

+++ b/armsrc/apps.h

@@ -17,50 +17,11 @@

#include "common.h"

#include "hitag2.h"

#include "mifare.h"

-

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

-

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

-// maybe processed in some way.

-#define BIGBUF_SIZE 40000

-uint32_t BigBuf[BIGBUF_SIZE / sizeof(uint32_t)];

-#define TRACE_OFFSET 0

-#define TRACE_SIZE 3000

-#define RECV_CMD_OFFSET (TRACE_OFFSET + TRACE_SIZE)

-#define MAX_FRAME_SIZE 256

-#define MAX_PARITY_SIZE ((MAX_FRAME_SIZE + 1)/ 8)

-#define RECV_CMD_PAR_OFFSET (RECV_CMD_OFFSET + MAX_FRAME_SIZE)

-#define RECV_RESP_OFFSET (RECV_CMD_PAR_OFFSET + MAX_PARITY_SIZE)

-#define RECV_RESP_PAR_OFFSET (RECV_RESP_OFFSET + MAX_FRAME_SIZE)

-#define CARD_MEMORY_OFFSET (RECV_RESP_PAR_OFFSET + MAX_PARITY_SIZE)

-#define CARD_MEMORY_SIZE 4096

-#define DMA_BUFFER_OFFSET CARD_MEMORY_OFFSET

-#define DMA_BUFFER_SIZE CARD_MEMORY_SIZE

-#define FREE_BUFFER_OFFSET (CARD_MEMORY_OFFSET + CARD_MEMORY_SIZE)

-#define FREE_BUFFER_SIZE (BIGBUF_SIZE - FREE_BUFFER_OFFSET - 1)

-

-/*

-The statements above translates into this :

-BIGBUF_SIZE = 40000

-TRACE_OFFSET = 0

-TRACE_SIZE = 3000

-RECV_CMD_OFFSET = 3000

-MAX_FRAME_SIZE = 256

-MAX_PARITY_SIZE = 32

-RECV_CMD_PAR_OFFSET = 3256

-RECV_RESP_OFFSET = 3288

-RECV_RESP_PAR_OFFSET= 3544

-CARD_MEMORY_OFFSET = 3576

-CARD_MEMORY_SIZE = 4096

-DMA_BUFFER_OFFSET = 3576

-DMA_BUFFER_SIZE = 4096

-FREE_BUFFER_OFFSET = 7672

-FREE_BUFFER_SIZE = 32327

- */

+#include "BigBuf.h"

+#include "fpgaloader.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;

@@ -78,74 +39,24 @@ void DbpString(char *str);

void Dbprintf(const char *fmt, ...);

void Dbhexdump(int len, uint8_t *d, bool bAsci);

+// ADC Vref = 3300mV, and an (10M+1M):1M voltage divider on the HF input can measure voltages up to 36300 mV

+#define MAX_ADC_HF_VOLTAGE 36300

+// ADC Vref = 3300mV, and an (10000k+240k):240k voltage divider on the LF input can measure voltages up to 140800 mV

+#define MAX_ADC_LF_VOLTAGE 140800

int AvgAdc(int ch);

void ToSendStuffBit(int b);

void ToSendReset(void);

void ListenReaderField(int limit);

-void AcquireRawAdcSamples125k(int at134khz);

-void SnoopLFRawAdcSamples(int divisor, int trigger_threshold);

-void DoAcquisition125k(int trigger_threshold);

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(int bitstream_version);

-int FpgaGatherBitstreamVersion();

-void FpgaGatherVersion(char *dst, int len);

-void FpgaSetupSsc(void);

-void SetupSpi(int mode);

-bool FpgaSetupSscDma(uint8_t *buf, int len);

-#define FpgaDisableSscDma(void) AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;

-#define FpgaEnableSscDma(void) AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTEN;

-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_USER_BYTE1 (3<<12)

-// Definitions for the FPGA configuration word.

-// 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)

-// 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_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);

@@ -154,7 +65,11 @@ void AcquireTiType(void);

void AcquireRawBitsTI(void);

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

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

+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);

+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);

+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);

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

+void CmdAWIDdemodFSK(int findone, int *high, int *low, int ledcontrol); // Realtime demodulation mode for AWID26

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

@@ -174,10 +89,10 @@ void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode);

void EM4xWriteWord(uint32_t Data, uint8_t Address, uint32_t Pwd, uint8_t PwdMode);

/// iso14443.h

-void SimulateIso14443Tag(void);

-void AcquireRawAdcSamplesIso14443(uint32_t parameter);

-void ReadSTMemoryIso14443(uint32_t);

-void RAMFUNC SnoopIso14443(void);

+void SimulateIso14443bTag(void);

+void AcquireRawAdcSamplesIso14443b(uint32_t parameter);

+void ReadSTMemoryIso14443b(uint32_t);

+void RAMFUNC SnoopIso14443b(void);

void SendRawCommand14443B(uint32_t, uint32_t, uint8_t, uint8_t[]);

/// iso14443a.h

@@ -188,25 +103,26 @@ void ReaderIso14443a(UsbCommand * c);

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);

+

void RAMFUNC SniffMifare(uint8_t param);

/// epa.h

void EPA_PACE_Collect_Nonce(UsbCommand * c);

+void EPA_PACE_Replay(UsbCommand *c);

// mifarecmd.h

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, int arg1, uint8_t *datain);

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

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

+void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, 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);

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

+//void MifareUWriteBlockCompat(uint8_t arg0,uint8_t *datain);

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

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

-void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);

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

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

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

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

@@ -216,6 +132,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

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?

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

//desfire

void Mifare_DES_Auth1(uint8_t arg0,uint8_t *datain);