From 1f02fce1c9ceb71e023a1118914022d35bc66b50 Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Fri, 14 Feb 2020 15:14:22 +0100
Subject: [PATCH] xilinx,lattice: drop useless offset in program_mem signature

---
 src/lattice.cpp | 6 +++---
 src/lattice.hpp | 2 +-
 src/xilinx.cpp  | 6 +++---
 src/xilinx.hpp  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lattice.cpp b/src/lattice.cpp
index 39ee1e7..1fd184f 100644
--- a/src/lattice.cpp
+++ b/src/lattice.cpp
@@ -244,9 +244,8 @@ bool Lattice::program_mem()
 	return true;
 }
 
-bool Lattice::program_flash(unsigned int offset)
+bool Lattice::program_flash()
 {
-	(void) offset;
 	bool err;
 	uint64_t featuresRow;
 	uint16_t feabits;
@@ -414,8 +413,9 @@ bool Lattice::program_flash(unsigned int offset)
 
 void Lattice::program(unsigned int offset)
 {
+	(void) offset;
 	if (_mode == FLASH_MODE)
-		program_flash(offset);
+		program_flash();
 	else if (_mode == MEM_MODE)
 		program_mem();
 
diff --git a/src/lattice.hpp b/src/lattice.hpp
index 4ef0d61..fc81155 100644
--- a/src/lattice.hpp
+++ b/src/lattice.hpp
@@ -36,7 +36,7 @@ class Lattice: public Device {
 		void reset() override {}
 		void program(unsigned int offset) override;
 		bool program_mem();
-		bool program_flash(unsigned int offset);
+		bool program_flash();
 		bool Verify(JedParser &_jed, bool unlock = false);
 
 	private:
diff --git a/src/xilinx.cpp b/src/xilinx.cpp
index 4969056..4620dd4 100644
--- a/src/xilinx.cpp
+++ b/src/xilinx.cpp
@@ -71,7 +71,7 @@ void Xilinx::program(unsigned int offset)
 		case Device::MEM_MODE:
 			BitParser bitfile(_filename, _verbose);
 			bitfile.parse();
-			program_mem(bitfile, offset);
+			program_mem(bitfile);
 			break;
 	}
 }
@@ -84,7 +84,7 @@ void Xilinx::program_spi(unsigned int offset)
 	/* first: load spi over jtag */
 	BitParser bitfile(bitname, _verbose);
 	bitfile.parse();
-	program_mem(bitfile, offset);
+	program_mem(bitfile);
 
 	/* last: read file and erase/flash spi flash */
 	McsParser mcs(_filename, _verbose);
@@ -93,7 +93,7 @@ void Xilinx::program_spi(unsigned int offset)
 	spiFlash.erase_and_prog(offset, mcs.getData(), mcs.getLength());
 }
 
-void Xilinx::program_mem(BitParser &bitfile, unsigned int offset)
+void Xilinx::program_mem(BitParser &bitfile)
 {
 	if (_filename == "") return;
 	std::cout << "load program" << std::endl;
diff --git a/src/xilinx.hpp b/src/xilinx.hpp
index 2fa0dde..e7d91ae 100644
--- a/src/xilinx.hpp
+++ b/src/xilinx.hpp
@@ -12,7 +12,7 @@ class Xilinx: public Device {
 
 		void program(unsigned int offset = 0) override;
 		void program_spi(unsigned int offset = 0);
-		void program_mem(BitParser &bitfile, unsigned int offset = 0);
+		void program_mem(BitParser &bitfile);
 		int idCode();
 		void reset();
 };