X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0fa9ca5b53e412decad0df1f6b5baca73ae76a9c..709a8d3ff0f7991425dd2600f057acbd8019616a:/armsrc/apps.h

diff --git a/armsrc/apps.h b/armsrc/apps.h
index f07504d2..b15ae6ad 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -7,21 +7,27 @@
 #ifndef __APPS_H
 #define __APPS_H
 
+#include "stdint.h"
+#include "stddef.h"
+typedef unsigned char byte_t;
+
 // The large multi-purpose buffer, typically used to hold A/D samples,
 // maybe processed in some way.
 DWORD BigBuf[12000];
 
 /// appmain.h
 void ReadMem(int addr);
-void AppMain(void);
+void __attribute__((noreturn)) AppMain(void);
 void SamyRun(void);
 void DbpIntegers(int a, int b, int c);
 void DbpString(char *str);
+void Dbprintf(const char *fmt, ...);
+
 void ToSendStuffBit(int b);
 void ToSendReset(void);
 void ListenReaderField(int limit);
 void AcquireRawAdcSamples125k(BOOL at134khz);
-void DoAcquisition125k(BOOL at134khz);
+void DoAcquisition125k(void);
 extern int ToSendMax;
 extern BYTE ToSend[];
 extern DWORD BigBuf[];
@@ -34,40 +40,41 @@ void FpgaGatherVersion(char *dst, int len);
 void FpgaSetupSsc(void);
 void SetupSpi(int mode);
 void FpgaSetupSscDma(BYTE *buf, int len);
-void SetAdcMuxFor(int whichGpio);
+void SetAdcMuxFor(DWORD 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)
 // Definitions for the FPGA configuration word.
-#define FPGA_MAJOR_MODE_LF_READER						(0<<5)
+#define FPGA_MAJOR_MODE_LF_READER					(0<<5)
 #define FPGA_MAJOR_MODE_LF_SIMULATOR				(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_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)
+#define FPGA_MAJOR_MODE_OFF							(7<<5)
 // 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_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_NO_MODULATION				(0<<0)
+#define FPGA_HF_SIMULATOR_MODULATE_BPSK				(1<<0)
+#define FPGA_HF_SIMULATOR_MODULATE_212K				(2<<0)
 // Options for ISO14443A
-#define FPGA_HF_ISO14443A_SNIFFER						(0<<0)
-#define FPGA_HF_ISO14443A_TAGSIM_LISTEN			(1<<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_LISTEN				(3<<0)
 #define FPGA_HF_ISO14443A_READER_MOD				(4<<0)
 
 /// lfops.h
 void AcquireRawAdcSamples125k(BOOL at134khz);
-void DoAcquisition125k(BOOL at134khz);
 void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYTE *command);
-void ReadTItag();
+void ReadTItag(void);
 void WriteTItag(DWORD idhi, DWORD idlo, WORD crc);
 void AcquireTiType(void);
 void AcquireRawBitsTI(void);
@@ -80,12 +87,15 @@ void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);
 void SimulateIso14443Tag(void);
 void AcquireRawAdcSamplesIso14443(DWORD parameter);
 void ReadSRI512Iso14443(DWORD parameter);
+void ReadSRIX4KIso14443(DWORD parameter);
+void ReadSTMemoryIso14443(DWORD parameter,DWORD dwLast);
 void SnoopIso14443(void);
 
 /// iso14443a.h
 void SnoopIso14443a(void);
 void SimulateIso14443aTag(int tagType, int TagUid);	// ## simulate iso14443a tag
 void ReaderIso14443a(DWORD parameter);
+void ReaderMifare(DWORD parameter);
 
 /// iso15693.h
 void AcquireRawAdcSamplesIso15693(void);
@@ -107,6 +117,9 @@ void *memcpy(void *dest, const void *src, int len);
 void *memset(void *dest, int c, int len);
 int memcmp(const void *av, const void *bv, int len);
 char *strncat(char *dest, const char *src, unsigned int n);
+void num_to_bytes(uint64_t n, size_t len, byte_t* dest);
+uint64_t bytes_to_num(byte_t* src, size_t len);
+
 void SpinDelay(int ms);
 void SpinDelayUs(int us);
 void LED(int led, int ms);