New mode define for FPGA

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 67f9349b1eb9dd95b0b82dc94e46f21c018ee60a..3fdb6169479047ba78e445cf7ba472cdad413a82 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -8,16 +8,16 @@
 #define __APPS_H\r
 \r
 /// appmain.c\r
 #define __APPS_H\r
 \r
 /// appmain.c\r

-void ReadMem(int addr);
+void ReadMem(int addr);\r

 void AppMain(void);\r
 void SamyRun(void);\r
 void DbpIntegers(int a, int b, int c);\r
 void DbpString(char *str);\r
 void ToSendStuffBit(int b);\r
 void ToSendReset(void);\r
 void AppMain(void);\r
 void SamyRun(void);\r
 void DbpIntegers(int a, int b, int c);\r
 void DbpString(char *str);\r
 void ToSendStuffBit(int b);\r
 void ToSendReset(void);\r

-void ListenReaderField(int limit);
-void AcquireRawAdcSamples125k(BOOL at134khz);
-void DoAcquisition125k(BOOL at134khz);
+void ListenReaderField(int limit);\r
+void AcquireRawAdcSamples125k(BOOL at134khz);\r
+void DoAcquisition125k(BOOL at134khz);\r

 extern int ToSendMax;\r
 extern BYTE ToSend[];\r
 extern DWORD BigBuf[];\r
 extern int ToSendMax;\r
 extern BYTE ToSend[];\r
 extern DWORD BigBuf[];\r


@@ -32,39 +32,36 @@ void FpgaSetupSscDma(BYTE *buf, int len);
 void SetAdcMuxFor(int whichGpio);\r
 \r
 // Definitions for the FPGA commands.\r
 void SetAdcMuxFor(int 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
 // Definitions for the FPGA configuration word.\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_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_UNUSED                         (6<<5)\r
-#define FPGA_MAJOR_MODE_OFF                                    (7<<5)\r
-// Options for the LF reader\r
-#define FPGA_LF_READER_USE_125_KHZ                     (1<<3)\r
-#define FPGA_LF_READER_USE_134_KHZ                     (0<<3)\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

 // Options for the HF reader, tx to tag\r
 // Options for the HF reader, tx to tag\r

-#define FPGA_HF_READER_TX_SHALLOW_MOD          (1<<0)\r
+#define FPGA_HF_READER_TX_SHALLOW_MOD                          (1<<0)\r

 // Options for the HF reader, correlating against rx from tag\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_SNOOP          (1<<1)\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
 // 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
 // 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_TAGSIM_MOD           (2<<0)\r
-#define FPGA_HF_ISO14443A_READER_LISTEN                (3<<0)\r
-#define FPGA_HF_ISO14443A_READER_MOD           (4<<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_MOD                           (4<<0)\r

 \r
 /// iso14443.h\r
 void SimulateIso14443Tag(void);\r
 void AcquireRawAdcSamplesIso14443(DWORD parameter);\r
 \r
 /// iso14443.h\r
 void SimulateIso14443Tag(void);\r
 void AcquireRawAdcSamplesIso14443(DWORD parameter);\r

-void ReadSRI512Iso14443(DWORD parameter);
+void ReadSRI512Iso14443(DWORD parameter);\r

 void SnoopIso14443(void);\r
 \r
 /// iso14443a.h\r
 void SnoopIso14443(void);\r
 \r
 /// iso14443a.h\r


@@ -78,24 +75,24 @@ void ReaderIso15693(DWORD parameter);       // Simulate an ISO15693 reader - greg
 void SimTagIso15693(DWORD parameter);  // simulate an ISO15693 tag - greg\r
 \r
 /// util.h\r
 void SimTagIso15693(DWORD parameter);  // simulate an ISO15693 tag - greg\r
 \r
 /// util.h\r

-#define LED_RED 1
-#define LED_ORANGE 2
-#define LED_GREEN 4
-#define LED_RED2 8
-#define BUTTON_HOLD 1
-#define BUTTON_NO_CLICK 0
-#define BUTTON_SINGLE_CLICK -1
-#define BUTTON_DOUBLE_CLICK -2
-#define BUTTON_ERROR -99
+#define LED_RED 1\r
+#define LED_ORANGE 2\r
+#define LED_GREEN 4\r
+#define LED_RED2 8\r
+#define BUTTON_HOLD 1\r
+#define BUTTON_NO_CLICK 0\r
+#define BUTTON_SINGLE_CLICK -1\r
+#define BUTTON_DOUBLE_CLICK -2\r
+#define BUTTON_ERROR -99\r

 int strlen(char *str);\r
 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
 int strlen(char *str);\r
 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

-void SpinDelay(int ms);
+void SpinDelay(int ms);\r

 void SpinDelayUs(int us);\r
 void SpinDelayUs(int us);\r

-void LED(int led, int ms);
-void LEDsoff();
-int BUTTON_CLICKED(int ms);
-int BUTTON_HELD(int ms);
+void LED(int led, int ms);\r
+void LEDsoff();\r
+int BUTTON_CLICKED(int ms);\r
+int BUTTON_HELD(int ms);\r

 \r
 #endif\r
 \r
 #endif\r