From 55e87490cfb80da58d03cb0985f63770117db7cb Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 20 Oct 2017 22:01:10 +0200 Subject: [PATCH] fix: remove all traces of fpga_nfc... --- armsrc/Makefile | 2 +- armsrc/appmain.c | 3 --- armsrc/fpgaloader.h | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/armsrc/Makefile b/armsrc/Makefile index 1e40148da..e285f4e67 100644 --- a/armsrc/Makefile +++ b/armsrc/Makefile @@ -56,7 +56,7 @@ SRC_FLASH = flash.c SRC_BEE = bee.c #the FPGA bitstream files. Note: order matters! -FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit fpga_nfc.bit +FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit #the zlib source files required for decompressing the fpga config at run time SRC_ZLIB = inflate.c inffast.c inftrees.c adler32.c zutil.c diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 8dbf412e3..ba5e42a29 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -308,9 +308,6 @@ void SendVersion(void) { FpgaGatherVersion(FPGA_BITSTREAM_HF, temp, sizeof(temp)); strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1); - FpgaGatherVersion(FPGA_BITSTREAM_NFC, temp, sizeof(temp)); - strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1); - // Send Chip ID and used flash memory uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start; uint32_t compressed_data_section_size = common_area.arg1; diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h index 557a136ea..e4d886e3f 100644 --- a/armsrc/fpgaloader.h +++ b/armsrc/fpgaloader.h @@ -35,11 +35,10 @@ void SetAdcMuxFor(uint32_t whichGpio); extern void switch_off(); // definitions for multiple FPGA config files support -#define FPGA_BITSTREAM_MAX 3 // the total number of FPGA bitstreams (configs) +#define FPGA_BITSTREAM_MAX 2 // the total number of FPGA bitstreams (configs) #define FPGA_BITSTREAM_ERR 0 #define FPGA_BITSTREAM_LF 1 #define FPGA_BITSTREAM_HF 2 -#define FPGA_BITSTREAM_NFC 3 // Definitions for the FPGA commands. #define FPGA_CMD_SET_CONFREG (1<<12)