Make the bootrom correctly nack in case of flash write error (e.g. due to lock bits)

[proxmark3-svn] / armsrc / apps.h

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 040737e7d5653c5448b311209f28a9b381870ba6..fba62365b9678484207de769f796f537e059aab4 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -7,6 +7,10 @@
 #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
@@ -21,7 +25,7 @@ void ToSendStuffBit(int b);
 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,6 +57,7 @@ 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
@@ -66,9 +71,8 @@ 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
@@ -81,12 +85,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
@@ -108,6 +115,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