From 3e25f320b472c3ff13231a392e7be12d76aed1f0 Mon Sep 17 00:00:00 2001 From: Jaap Crezee Date: Wed, 14 Apr 2021 12:33:39 +0200 Subject: [PATCH] added gitignore file and fixed compilation due to multiple defined symbol fast_rw_buf --- .gitignore | 11 +++++++++++ src/mpsse.c | 2 ++ src/mpsse.h | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..96fd9c2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*.o +*.user +*.pro +*.a +*.so + + +Makefile +config.h +config.log +config.status diff --git a/src/mpsse.c b/src/mpsse.c index 456b51b..daba9de 100644 --- a/src/mpsse.c +++ b/src/mpsse.c @@ -20,6 +20,8 @@ #include "support.h" #include "config.h" +unsigned char fast_rw_buf[SPI_RW_SIZE + CMD_SIZE]; + /* List of known FT2232-based devices */ struct vid_pid supported_devices[] = { { 0x0403, 0x6010, "FT2232 Future Technology Devices International, Ltd" }, diff --git a/src/mpsse.h b/src/mpsse.h index 4a00eed..2d00d55 100644 --- a/src/mpsse.h +++ b/src/mpsse.h @@ -218,7 +218,7 @@ swig_string_data Transfer(struct mpsse_context *mpsse, char *data, int size); char *Read(struct mpsse_context *mpsse, int size); char *Transfer(struct mpsse_context *mpsse, char *data, int size); -unsigned char fast_rw_buf[SPI_RW_SIZE + CMD_SIZE]; +extern unsigned char fast_rw_buf[SPI_RW_SIZE + CMD_SIZE]; int FastWrite(struct mpsse_context *mpsse, char *data, int size); int FastRead(struct mpsse_context *mpsse, char *data, int size); int FastTransfer(struct mpsse_context *mpsse, char *wdata, char *rdata, int size);