luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xilinx,lattice: drop useless offset in program_mem signature

This commit is contained in:
Gwenhael Goavec-Merou 2020-02-14 15:14:22 +01:00
parent 298c4d184e
commit 1f02fce1c9
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lattice.cpp
View File

@ -244,9 +244,8 @@ bool Lattice::program_mem()
return true; return true;
} }
bool Lattice::program_flash(unsigned int offset) bool Lattice::program_flash()
{ {
(void) offset;
bool err; bool err;
uint64_t featuresRow; uint64_t featuresRow;
uint16_t feabits; uint16_t feabits;
@ -414,8 +413,9 @@ bool Lattice::program_flash(unsigned int offset)
void Lattice::program(unsigned int offset) void Lattice::program(unsigned int offset)
{ {
(void) offset;
if (_mode == FLASH_MODE) if (_mode == FLASH_MODE)
program_flash(offset); program_flash();
else if (_mode == MEM_MODE) else if (_mode == MEM_MODE)
program_mem(); program_mem();

2
src/lattice.hpp
View File

@ -36,7 +36,7 @@ class Lattice: public Device {
void reset() override {} void reset() override {}
void program(unsigned int offset) override; void program(unsigned int offset) override;
bool program_mem(); bool program_mem();
bool program_flash(unsigned int offset); bool program_flash();
bool Verify(JedParser &_jed, bool unlock = false); bool Verify(JedParser &_jed, bool unlock = false);
private: private:

6
src/xilinx.cpp
View File

@ -71,7 +71,7 @@ void Xilinx::program(unsigned int offset)
case Device::MEM_MODE: case Device::MEM_MODE:
BitParser bitfile(_filename, _verbose); BitParser bitfile(_filename, _verbose);
bitfile.parse(); bitfile.parse();
program_mem(bitfile, offset); program_mem(bitfile);
break; break;
} }
} }
@ -84,7 +84,7 @@ void Xilinx::program_spi(unsigned int offset)
/* first: load spi over jtag */ /* first: load spi over jtag */
BitParser bitfile(bitname, _verbose); BitParser bitfile(bitname, _verbose);
bitfile.parse(); bitfile.parse();
program_mem(bitfile, offset); program_mem(bitfile);
/* last: read file and erase/flash spi flash */ /* last: read file and erase/flash spi flash */
McsParser mcs(_filename, _verbose); McsParser mcs(_filename, _verbose);
@ -93,7 +93,7 @@ void Xilinx::program_spi(unsigned int offset)
spiFlash.erase_and_prog(offset, mcs.getData(), mcs.getLength()); 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; if (_filename == "") return;
std::cout << "load program" << std::endl; std::cout << "load program" << std::endl;

2
src/xilinx.hpp
View File

@ -12,7 +12,7 @@ class Xilinx: public Device {
void program(unsigned int offset = 0) override; void program(unsigned int offset = 0) override;
void program_spi(unsigned int offset = 0); void program_spi(unsigned int offset = 0);
void program_mem(BitParser &bitfile, unsigned int offset = 0); void program_mem(BitParser &bitfile);
int idCode(); int idCode();
void reset(); void reset();
}; };