diff --git a/altera.cpp b/altera.cpp index ff1a9c0..dad5318 100644 --- a/altera.cpp +++ b/altera.cpp @@ -7,8 +7,8 @@ #define IRLENGTH 10 #define BIT_FOR_FLASH "/usr/local/share/cycloader/test_sfl.svf" -Altera::Altera(FtdiJtag *jtag, std::string filename):Device(jtag, filename), - _svf(_jtag) +Altera::Altera(FtdiJtag *jtag, std::string filename, bool verbose): + Device(jtag, filename, verbose), _svf(_jtag, _verbose) { if (_filename != "") { if (_file_extension == "svf") diff --git a/altera.hpp b/altera.hpp index 03def00..22127a8 100644 --- a/altera.hpp +++ b/altera.hpp @@ -8,7 +8,7 @@ class Altera: public Device { public: - Altera(FtdiJtag *jtag, std::string filename); + Altera(FtdiJtag *jtag, std::string filename, bool verbose); ~Altera(); void program(unsigned int offset = 0); diff --git a/xilinx.cpp b/xilinx.cpp index 88e6ef5..83153b1 100644 --- a/xilinx.cpp +++ b/xilinx.cpp @@ -9,8 +9,9 @@ #include "xilinx.hpp" #include "part.hpp" -Xilinx::Xilinx(FtdiJtag *jtag, std::string filename):Device(jtag, filename) - { +Xilinx::Xilinx(FtdiJtag *jtag, std::string filename, bool verbose): + Device(jtag, filename, verbose) +{ if (_filename != ""){ if (_file_extension == "bit") _mode = Device::MEM_MODE; @@ -43,7 +44,6 @@ void Xilinx::reset() _jtag->shiftIR(BYPASS, 6); _jtag->set_state(FtdiJtag::RUN_TEST_IDLE); _jtag->toggleClk(2000); - } int Xilinx::idCode() @@ -69,7 +69,7 @@ void Xilinx::program(unsigned int offset) reset(); break; case Device::MEM_MODE: - BitParser bitfile(_filename); + BitParser bitfile(_filename, _verbose); bitfile.parse(); program_mem(bitfile, offset); break; @@ -82,14 +82,14 @@ void Xilinx::program_spi(unsigned int offset) bitname += fpga_list[idCode()].family + ".bit"; /* first: load spi over jtag */ - BitParser bitfile(bitname); + BitParser bitfile(bitname, _verbose); bitfile.parse(); program_mem(bitfile, offset); /* last: read file and erase/flash spi flash */ - McsParser mcs(_filename); + McsParser mcs(_filename, _verbose); mcs.parse(); - SPIFlash spiFlash(_jtag); + SPIFlash spiFlash(_jtag, _verbose); spiFlash.erase_and_prog(offset, mcs.getData(), mcs.getLength()); } diff --git a/xilinx.hpp b/xilinx.hpp index 9aedd12..2fa0dde 100644 --- a/xilinx.hpp +++ b/xilinx.hpp @@ -7,7 +7,7 @@ class Xilinx: public Device { public: - Xilinx(FtdiJtag *jtag, std::string filename); + Xilinx(FtdiJtag *jtag, std::string filename, bool verbose); ~Xilinx(); void program(unsigned int offset = 0) override;