From c3fc86d9af62ccf5a416ef6d732f350c028c5200 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 19 Oct 2016 21:23:03 +0200 Subject: [PATCH] CHG: Xoring in the value allows for the ticks timers to co-exist. Or that is the idea. --- armsrc/fpgaloader.c | 2 +- armsrc/fpgaloader.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c index 86f144cf..08a38663 100644 --- a/armsrc/fpgaloader.c +++ b/armsrc/fpgaloader.c @@ -126,7 +126,7 @@ void FpgaSetupSsc(void) { GPIO_SSC_CLK; AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT; - AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SSC); + AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_SSC); // Now set up the SSC proper, starting from a known state. AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST; diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h index 5c0f802e..5e5e6af6 100644 --- a/armsrc/fpgaloader.h +++ b/armsrc/fpgaloader.h @@ -59,11 +59,11 @@ void SetAdcMuxFor(uint32_t whichGpio); #define FPGA_HF_READER_RX_XCORR_SNOOP (1<<1) #define FPGA_HF_READER_RX_XCORR_QUARTER_FREQ (1<<2) // 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_MODULATE_212K (2<<0) -#define FPGA_HF_SIMULATOR_MODULATE_424K (4<<0) -#define FPGA_HF_SIMULATOR_MODULATE_424K_8BIT 0x5//101 +#define FPGA_HF_SIMULATOR_NO_MODULATION (0<<0) // 0000 +#define FPGA_HF_SIMULATOR_MODULATE_BPSK (1<<0) // 0001 +#define FPGA_HF_SIMULATOR_MODULATE_212K (2<<0) // 0010 +#define FPGA_HF_SIMULATOR_MODULATE_424K (4<<0) // 0100 +#define FPGA_HF_SIMULATOR_MODULATE_424K_8BIT 0x5 // 0101 // no 848K // Options for ISO14443A -- 2.39.5