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

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

index 57fb55fd3d38c051c3f3a2b509cf672462173b42..b5638ee188b15b3b180521313cbb36b8b9198757 100644 (file)

--- a/armsrc/apps.h

+++ b/armsrc/apps.h

@@ -19,6 +19,7 @@

#include "mifare.h"

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

#include "BigBuf.h"

+#include "fpgaloader.h"

extern const uint8_t OddByteParity[256];

extern int rsamples; // = 0;

@@ -50,60 +51,6 @@ void ListenReaderField(int limit);

extern int ToSendMax;

extern uint8_t ToSend[];

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

@@ -122,6 +69,7 @@ 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

@@ -141,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

@@ -160,6 +108,7 @@ 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);

@@ -170,10 +119,10 @@ 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);