more helpful error message (from Sourcerer)

[proxmark3-svn] / armsrc / apps.h

diff --git a/armsrc/apps.h b/armsrc/apps.h
index bf45407f0cb62b86e915f6433bef0bcb200a5fd2..71c25d1a5d8af2839155649e5ecae19e5d99c036 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -7,21 +7,27 @@
 #ifndef __APPS_H\r
 #define __APPS_H\r
 \r
+#include "stdint.h"\r
+#include "stddef.h"\r
+typedef unsigned char byte_t;\r
+\r
 // The large multi-purpose buffer, typically used to hold A/D samples,\r
 // maybe processed in some way.\r
-DWORD BigBuf[12000];\r
+DWORD BigBuf[8000];\r
 \r
 /// appmain.h\r
 void ReadMem(int addr);\r
 void __attribute__((noreturn)) AppMain(void);\r
 void SamyRun(void);\r
-void DbpIntegers(int a, int b, int c);\r
+//void DbpIntegers(int a, int b, int c);\r
 void DbpString(char *str);\r
+void Dbprintf(const char *fmt, ...);\r
+\r
 void ToSendStuffBit(int b);\r
 void ToSendReset(void);\r
 void ListenReaderField(int limit);\r
 void AcquireRawAdcSamples125k(BOOL at134khz);\r
-void DoAcquisition125k(BOOL at134khz);\r
+void DoAcquisition125k(void);\r
 extern int ToSendMax;\r
 extern BYTE ToSend[];\r
 extern DWORD BigBuf[];\r
@@ -53,9 +59,11 @@ void SetAdcMuxFor(DWORD whichGpio);
 // Options for the HF reader, correlating against rx from tag\r
 #define FPGA_HF_READER_RX_XCORR_848_KHZ                                (1<<0)\r
 #define FPGA_HF_READER_RX_XCORR_SNOOP                          (1<<1)\r
+#define FPGA_HF_READER_RX_XCORR_QUARTER_FREQ                   (1<<2)\r
 // Options for the HF simulated tag, how to modulate\r
 #define FPGA_HF_SIMULATOR_NO_MODULATION                                (0<<0)\r
 #define FPGA_HF_SIMULATOR_MODULATE_BPSK                                (1<<0)\r
+#define FPGA_HF_SIMULATOR_MODULATE_212K                                (2<<0)\r
 // Options for ISO14443A\r
 #define FPGA_HF_ISO14443A_SNIFFER                                      (0<<0)\r
 #define FPGA_HF_ISO14443A_TAGSIM_LISTEN                                (1<<0)\r
@@ -65,13 +73,12 @@ void SetAdcMuxFor(DWORD whichGpio);
 \r
 /// lfops.h\r
 void AcquireRawAdcSamples125k(BOOL at134khz);\r
-void DoAcquisition125k(BOOL at134khz);\r
 void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYTE *command);\r
-void ReadTItag();\r
+void ReadTItag(void);\r
 void WriteTItag(DWORD idhi, DWORD idlo, WORD crc);\r
 void AcquireTiType(void);\r
 void AcquireRawBitsTI(void);\r
-void SimulateTagLowFrequency(int period, int ledcontrol);\r
+void SimulateTagLowFrequency(int period, int gap, int ledcontrol);\r
 void CmdHIDsimTAG(int hi, int lo, int ledcontrol);\r
 void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol);\r
 void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);\r
@@ -80,12 +87,15 @@ void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);
 void SimulateIso14443Tag(void);\r
 void AcquireRawAdcSamplesIso14443(DWORD parameter);\r
 void ReadSRI512Iso14443(DWORD parameter);\r
+void ReadSRIX4KIso14443(DWORD parameter);\r
+void ReadSTMemoryIso14443(DWORD parameter,DWORD dwLast);\r
 void SnoopIso14443(void);\r
 \r
 /// iso14443a.h\r
 void SnoopIso14443a(void);\r
 void SimulateIso14443aTag(int tagType, int TagUid);    // ## simulate iso14443a tag\r
 void ReaderIso14443a(DWORD parameter);\r
+void ReaderMifare(DWORD parameter);\r
 \r
 /// iso15693.h\r
 void AcquireRawAdcSamplesIso15693(void);\r
@@ -107,6 +117,9 @@ void *memcpy(void *dest, const void *src, int len);
 void *memset(void *dest, int c, int len);\r
 int memcmp(const void *av, const void *bv, int len);\r
 char *strncat(char *dest, const char *src, unsigned int n);\r
+void num_to_bytes(uint64_t n, size_t len, byte_t* dest);\r
+uint64_t bytes_to_num(byte_t* src, size_t len);\r
+\r
 void SpinDelay(int ms);\r
 void SpinDelayUs(int us);\r
 void LED(int led, int ms);\r