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

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

index ee9fea743010b4bb6d06b0342a13e2bb878ee100..57fb55fd3d38c051c3f3a2b509cf672462173b42 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;

@@ -53,17 +38,17 @@ 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);

@@ -111,6 +96,8 @@ void SetAdcMuxFor(uint32_t whichGpio);

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

@@ -119,6 +106,10 @@ void SetAdcMuxFor(uint32_t whichGpio);

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

@@ -127,6 +118,9 @@ 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 CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol);

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

@@ -158,11 +152,10 @@ 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);

+

void RAMFUNC SniffMifare(uint8_t param);

/// epa.h

@@ -172,8 +165,9 @@ void EPA_PACE_Collect_Nonce(UsbCommand * c);

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

@@ -188,12 +182,33 @@ 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?

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

+

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