From 17465c9edd8e350baabda98c92fc9a0284df9631 Mon Sep 17 00:00:00 2001
From: d18c7db <d18c7db@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Sun, 19 Jul 2009 03:58:02 +0000
Subject: [PATCH] New mode define for FPGA

---
 armsrc/apps.h | 79 +++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 41 deletions(-)

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 67f9349b..3fdb6169 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -8,16 +8,16 @@
 #define __APPS_H
 
 /// appmain.c
-void ReadMem(int addr);
+void ReadMem(int addr);
 void AppMain(void);
 void SamyRun(void);
 void DbpIntegers(int a, int b, int c);
 void DbpString(char *str);
 void ToSendStuffBit(int b);
 void ToSendReset(void);
-void ListenReaderField(int limit);
-void AcquireRawAdcSamples125k(BOOL at134khz);
-void DoAcquisition125k(BOOL at134khz);
+void ListenReaderField(int limit);
+void AcquireRawAdcSamples125k(BOOL at134khz);
+void DoAcquisition125k(BOOL at134khz);
 extern int ToSendMax;
 extern BYTE ToSend[];
 extern DWORD BigBuf[];
@@ -32,39 +32,36 @@ void FpgaSetupSscDma(BYTE *buf, int len);
 void SetAdcMuxFor(int 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_SIMULATOR		(1<<5)
-#define FPGA_MAJOR_MODE_HF_READER_TX		(2<<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_SIMULATOR		(4<<5)
-#define FPGA_MAJOR_MODE_HF_ISO14443A		(5<<5)
-#define FPGA_MAJOR_MODE_UNUSED				(6<<5)
-#define FPGA_MAJOR_MODE_OFF					(7<<5)
-// Options for the LF reader
-#define FPGA_LF_READER_USE_125_KHZ			(1<<3)
-#define FPGA_LF_READER_USE_134_KHZ			(0<<3)
+#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)
 // Options for the HF reader, tx to tag
-#define FPGA_HF_READER_TX_SHALLOW_MOD		(1<<0)
+#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_SNOOP		(1<<1)
+#define FPGA_HF_READER_RX_XCORR_848_KHZ			(1<<0)
+#define FPGA_HF_READER_RX_XCORR_SNOOP				(1<<1)
 // 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)
 // Options for ISO14443A
-#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_MOD		(4<<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_MOD				(4<<0)
 
 /// iso14443.h
 void SimulateIso14443Tag(void);
 void AcquireRawAdcSamplesIso14443(DWORD parameter);
-void ReadSRI512Iso14443(DWORD parameter);
+void ReadSRI512Iso14443(DWORD parameter);
 void SnoopIso14443(void);
 
 /// iso14443a.h
@@ -78,24 +75,24 @@ void ReaderIso15693(DWORD parameter);	// Simulate an ISO15693 reader - greg
 void SimTagIso15693(DWORD parameter);	// simulate an ISO15693 tag - greg
 
 /// util.h
-#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
+#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
 int strlen(char *str);
 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);
-void SpinDelay(int ms);
+void SpinDelay(int ms);
 void SpinDelayUs(int us);
-void LED(int led, int ms);
-void LEDsoff();
-int BUTTON_CLICKED(int ms);
-int BUTTON_HELD(int ms);
+void LED(int led, int ms);
+void LEDsoff();
+int BUTTON_CLICKED(int ms);
+int BUTTON_HELD(int ms);
 
 #endif
-- 
2.39.5