diff --git a/src/anlogic.cpp b/src/anlogic.cpp index 0326237..49d4961 100644 --- a/src/anlogic.cpp +++ b/src/anlogic.cpp @@ -37,6 +37,7 @@ Anlogic::Anlogic(Jtag *jtag, const std::string &filename, bool flash_wr, bool sram_wr, bool verbose): Device(jtag, filename, verbose), _svf(_jtag, _verbose) { + (void)flash_wr; if (_filename != "") { if (_file_extension == "svf") _mode = Device::MEM_MODE; diff --git a/src/anlogicBitParser.cpp b/src/anlogicBitParser.cpp index 3aa7568..91bbba1 100644 --- a/src/anlogicBitParser.cpp +++ b/src/anlogicBitParser.cpp @@ -112,7 +112,7 @@ int AnlogicBitParser::parse() data.resize(size_data); _fd.read(reinterpret_cast(&(data[0])), size_data); - int pos = 0; + unsigned int pos = 0; std::vector> blocks; do { uint16_t len = (data[pos++] << 8); diff --git a/src/board.hpp b/src/board.hpp index 192230f..1665a16 100644 --- a/src/board.hpp +++ b/src/board.hpp @@ -76,9 +76,9 @@ typedef struct { } target_cable_t; #define JTAG_BOARD(_name, _cable, _rst, _done) \ - {_name, {"", _cable, _rst, _done, COMM_JTAG, {}}} + {_name, {"", _cable, _rst, _done, COMM_JTAG, {}, {}}} #define JTAG_BITBANG_BOARD(_name, _cable, _rst, _done, _tms, _tck, _tdi, _tdo) \ - {_name, {"", _cable, _rst, _done, COMM_JTAG, { _tms, _tck, _tdi, _tdo }}} + {_name, {"", _cable, _rst, _done, COMM_JTAG, { _tms, _tck, _tdi, _tdo }, {}}} #define SPI_BOARD(_name, _manufacturer, _cable, _rst, _done, _cs, _sck, _si, _so, _holdn, _wpn) \ {_name, {_manufacturer, _cable, _rst, _done, COMM_SPI, {}, \ {_cs, _sck, _so, _si, _holdn, _wpn}}} diff --git a/src/cable.hpp b/src/cable.hpp index 709076b..631c597 100644 --- a/src/cable.hpp +++ b/src/cable.hpp @@ -9,13 +9,13 @@ /*! * \brief define type of communication */ -enum { +enum communication_type { MODE_ANLOGICCABLE = 0, /*! JTAG probe from Anlogic */ MODE_FTDI_BITBANG = 1, /*! used with ft232RL/ft231x */ MODE_FTDI_SERIAL = 2, /*! ft2232, ft232H */ MODE_DIRTYJTAG = 3, /*! JTAG probe firmware for STM32F1 */ - MODE_USBBLASTER = 4 /*! JTAG probe firmware for USBBLASTER */ -} communication_type_t; + MODE_USBBLASTER = 4, /*! JTAG probe firmware for USBBLASTER */ +}; typedef struct { int type; diff --git a/src/epcq.cpp b/src/epcq.cpp index 9f2f7f8..369a668 100644 --- a/src/epcq.cpp +++ b/src/epcq.cpp @@ -203,7 +203,7 @@ void EPCQ::dumpJICFile(char *jic_file, char *out_file, size_t max_len) fseek(jic, offset, SEEK_SET); FILE *out = fopen(out_file, "w"); for (i=0; i < max_len && (1 == fread(&c, 1, 1, jic)); i++) { - fprintf(out, "%lx %x\n", i, c); + fprintf(out, "%zx %x\n", i, c); } fclose(jic); fclose(out); diff --git a/src/fsparser.cpp b/src/fsparser.cpp index 3463ae3..d25ee60 100644 --- a/src/fsparser.cpp +++ b/src/fsparser.cpp @@ -74,7 +74,7 @@ int FsParser::parse() parseHeader(); _fd.seekg(0, _fd.beg); - int max = 0; + size_t max = 0; while (1) { std::getline(_fd, buffer, '\n'); @@ -84,8 +84,8 @@ int FsParser::parse() continue; vectTmp.push_back(buffer); /* needed to determine data used for checksum */ - if ((int)buffer.size() > max) - max = (int) buffer.size(); + if (buffer.size() > max) + max = buffer.size(); } /* we know each data size finished with 6 x 0xff @@ -167,7 +167,7 @@ int FsParser::parse() for (auto &&line: vectTmp) { /* store bit for checksum */ - if ((int)line.size() == max) + if (line.size() == max) tmp += line.substr(padding, addr_length); } @@ -175,7 +175,7 @@ int FsParser::parse() uint32_t sum = 0; uint32_t max_pos = (idcode == 0) ? tmp.size() : addr_length * nb_line; - for (int pos = 0; pos < max_pos; pos+=16) { + for (uint32_t pos = 0; pos < max_pos; pos+=16) { int16_t data16 = 0; for (int offset = 0; offset < 16; offset ++) { uint16_t val = (tmp[pos+offset] == '1'?1:0); diff --git a/src/ftdipp_mpsse.cpp b/src/ftdipp_mpsse.cpp index eee9e60..c8bb77c 100644 --- a/src/ftdipp_mpsse.cpp +++ b/src/ftdipp_mpsse.cpp @@ -26,7 +26,7 @@ FTDIpp_MPSSE::FTDIpp_MPSSE(const mpsse_bit_config &cable, const string &dev, _interface(cable.interface), _clkHZ(clkHZ), _buffer_size(2*32768), _num(0) { - sprintf(_product, ""); + strcpy(_product, ""); if (!dev.empty()) { if (!search_with_dev(dev)) { cerr << "No cable found" << endl; diff --git a/src/ftdispi.cpp b/src/ftdispi.cpp index 495757c..dcbeff6 100644 --- a/src/ftdispi.cpp +++ b/src/ftdispi.cpp @@ -66,6 +66,9 @@ FtdiSpi::FtdiSpi(int vid, int pid, unsigned char interface, uint32_t clkHZ, bool verbose): FTDIpp_MPSSE(bit_conf, "", "", clkHZ, verbose) { + (void)pid; + (void)vid; + (void)interface; setMode(0); setCSmode(SPI_CS_AUTO); setEndianness(SPI_MSB_FIRST); diff --git a/src/jedParser.cpp b/src/jedParser.cpp index 80c5843..d1eb43f 100644 --- a/src/jedParser.cpp +++ b/src/jedParser.cpp @@ -309,7 +309,7 @@ int JedParser::parse() int size = 0; for (size_t i = 0; i < _data_list.size(); i++) { if (_verbose) { - printf("area[%ld] %d %d ", i, _data_list[i].offset, _data_list[i].len); + printf("area[%zd] %d %d ", i, _data_list[i].offset, _data_list[i].len); printf("%s\n", _data_list[i].associatedPrevNote.c_str()); } size += _data_list[i].len; @@ -331,7 +331,7 @@ int JedParser::parse() } if (_verbose) - printf("array size %ld\n", _data_list[0].data.size()); + printf("array size %zd\n", _data_list[0].data.size()); if (_fuse_count != size) { cerr << "Not all fuses are programmed" << endl; diff --git a/src/lattice.cpp b/src/lattice.cpp index 31d52d7..b43175c 100644 --- a/src/lattice.cpp +++ b/src/lattice.cpp @@ -71,6 +71,7 @@ Lattice::Lattice(Jtag *jtag, const string filename, bool flash_wr, bool sram_wr, bool verbose): Device(jtag, filename, verbose), _fpga_family(UNKNOWN_FAMILY) { + (void)sram_wr; if (_filename != "") { if (_file_extension == "jed" || _file_extension == "mcs") { _mode = Device::FLASH_MODE; @@ -899,7 +900,7 @@ bool Lattice::Verify(std::vector data, bool unlock) _jtag->shiftDR(tx_buf, rx_buf, 16*8, Jtag::PAUSE_DR); for (size_t i = 0; i < data[line].size(); i++) { if (rx_buf[i] != (unsigned char)data[line][i]) { - printf("%3lu %3lu %02x -> %02x\n", line, i, + printf("%3zu %3zu %02x -> %02x\n", line, i, rx_buf[i], (unsigned char)data[line][i]); failure = true; }