Fix commit 232, reenable GUI

[proxmark3-svn] / armsrc / apps.h

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 11084ad7d00be26e4f7364037d9cf9cb3ae0fdd5..bf45407f0cb62b86e915f6433bef0bcb200a5fd2 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -9,11 +9,11 @@
 \r
 // The large multi-purpose buffer, typically used to hold A/D samples,\r
 // maybe processed in some way.\r
-DWORD BigBuf[16000];\r
+DWORD BigBuf[12000];\r
 \r
 /// appmain.h\r
 void ReadMem(int addr);\r
-void AppMain(void);\r
+void __attribute__((noreturn)) AppMain(void);\r
 void SamyRun(void);\r
 void DbpIntegers(int a, int b, int c);\r
 void DbpString(char *str);\r
@@ -30,36 +30,37 @@ extern DWORD BigBuf[];
 void FpgaSendCommand(WORD cmd, WORD v);\r
 void FpgaWriteConfWord(BYTE v);\r
 void FpgaDownloadAndGo(void);\r
+void FpgaGatherVersion(char *dst, int len);\r
 void FpgaSetupSsc(void);\r
 void SetupSpi(int mode);\r
 void FpgaSetupSscDma(BYTE *buf, int len);\r
-void SetAdcMuxFor(int whichGpio);\r
+void SetAdcMuxFor(DWORD whichGpio);\r
 \r
 // Definitions for the FPGA commands.\r
-#define FPGA_CMD_SET_CONFREG                                                           (1<<12)\r
-#define FPGA_CMD_SET_DIVISOR                                                           (2<<12)\r
+#define FPGA_CMD_SET_CONFREG                                           (1<<12)\r
+#define FPGA_CMD_SET_DIVISOR                                           (2<<12)\r
 // Definitions for the FPGA configuration word.\r
-#define FPGA_MAJOR_MODE_LF_READER                                              (0<<5)\r
+#define FPGA_MAJOR_MODE_LF_READER                                      (0<<5)\r
 #define FPGA_MAJOR_MODE_LF_SIMULATOR                           (1<<5)\r
 #define FPGA_MAJOR_MODE_HF_READER_TX                           (2<<5)\r
-#define FPGA_MAJOR_MODE_HF_READER_RX_XCORR     (3<<5)\r
+#define FPGA_MAJOR_MODE_HF_READER_RX_XCORR                     (3<<5)\r
 #define FPGA_MAJOR_MODE_HF_SIMULATOR                           (4<<5)\r
 #define FPGA_MAJOR_MODE_HF_ISO14443A                           (5<<5)\r
 #define FPGA_MAJOR_MODE_LF_PASSTHRU                                    (6<<5)\r
-#define FPGA_MAJOR_MODE_OFF                                                                    (7<<5)\r
+#define FPGA_MAJOR_MODE_OFF                                                    (7<<5)\r
 // Options for the HF reader, tx to tag\r
 #define FPGA_HF_READER_TX_SHALLOW_MOD                          (1<<0)\r
 // 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_848_KHZ                                (1<<0)\r
 #define FPGA_HF_READER_RX_XCORR_SNOOP                          (1<<1)\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_NO_MODULATION                                (0<<0)\r
+#define FPGA_HF_SIMULATOR_MODULATE_BPSK                                (1<<0)\r
 // Options for ISO14443A\r
-#define FPGA_HF_ISO14443A_SNIFFER                                              (0<<0)\r
-#define FPGA_HF_ISO14443A_TAGSIM_LISTEN                        (1<<0)\r
+#define FPGA_HF_ISO14443A_SNIFFER                                      (0<<0)\r
+#define FPGA_HF_ISO14443A_TAGSIM_LISTEN                                (1<<0)\r
 #define FPGA_HF_ISO14443A_TAGSIM_MOD                           (2<<0)\r
-#define FPGA_HF_ISO14443A_READER_LISTEN                        (3<<0)\r
+#define FPGA_HF_ISO14443A_READER_LISTEN                                (3<<0)\r
 #define FPGA_HF_ISO14443A_READER_MOD                           (4<<0)\r
 \r
 /// lfops.h\r
@@ -73,6 +74,7 @@ void AcquireRawBitsTI(void);
 void SimulateTagLowFrequency(int period, 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
 \r
 /// iso14443.h\r
 void SimulateIso14443Tag(void);\r
@@ -104,11 +106,13 @@ int strlen(char *str);
 void *memcpy(void *dest, const void *src, int len);\r
 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 SpinDelay(int ms);\r
 void SpinDelayUs(int us);\r
 void LED(int led, int ms);\r
 void LEDsoff();\r
 int BUTTON_CLICKED(int ms);\r
 int BUTTON_HELD(int ms);\r
+void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);\r
 \r
 #endif\r