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

lattice:cppcheck

This commit is contained in:
Gwenhael Goavec-Merou 2020-08-19 17:00:44 +02:00
parent 7e763dcc25
commit 4a70675ea6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lattice.cpp
View File

@ -763,7 +763,7 @@ bool Lattice::flashErase(uint8_t mask)
return true; return true;
} }
bool Lattice::flashProg(uint32_t start_addr, string name, vector<string> data) bool Lattice::flashProg(uint32_t start_addr, const string &name, vector<string> data)
{ {
(void)start_addr; (void)start_addr;
ProgressBar progress("Writing " + name, data.size(), 50); ProgressBar progress("Writing " + name, data.size(), 50);
@ -802,7 +802,7 @@ bool Lattice::Verify(std::vector<std::string> data, bool unlock)
_jtag->shiftDR(tx_buf, rx_buf, 16*8, Jtag::PAUSE_DR); _jtag->shiftDR(tx_buf, rx_buf, 16*8, Jtag::PAUSE_DR);
for (size_t i = 0; i < data[line].size(); i++) { for (size_t i = 0; i < data[line].size(); i++) {
if (rx_buf[i] != (unsigned char)data[line][i]) { if (rx_buf[i] != (unsigned char)data[line][i]) {
printf("%3ld %3ld %02x -> %02x\n", line, i, printf("%3lu %3lu %02x -> %02x\n", line, i,
rx_buf[i], (unsigned char)data[line][i]); rx_buf[i], (unsigned char)data[line][i]);
failure = true; failure = true;
} }
@ -972,12 +972,12 @@ int Lattice::spi_wait(uint8_t cmd, uint8_t mask, uint8_t cond,
tmp = (LatticeBitParser::reverseByte(rx)); tmp = (LatticeBitParser::reverseByte(rx));
count ++; count ++;
if (count == timeout){ if (count == timeout){
printf("timeout: %x %x %d\n", tmp, rx, count); printf("timeout: %x %x %u\n", tmp, rx, count);
break; break;
} }
if (verbose) { if (verbose) {
printf("%x %x %x %d\n", tmp, mask, cond, count); printf("%x %x %x %u\n", tmp, mask, cond, count);
} }
} while ((tmp & mask) != cond); } while ((tmp & mask) != cond);
_jtag->set_state(Jtag::RUN_TEST_IDLE); _jtag->set_state(Jtag::RUN_TEST_IDLE);

2
src/lattice.hpp
View File

@ -61,7 +61,7 @@ class Lattice: public Device, SPIInterface {
bool pollBusyFlag(bool verbose = false); bool pollBusyFlag(bool verbose = false);
bool flashEraseAll(); bool flashEraseAll();
bool flashErase(uint8_t mask); bool flashErase(uint8_t mask);
bool flashProg(uint32_t start_addr, std::string name, bool flashProg(uint32_t start_addr, const std::string &name,
std::vector<std::string> data); std::vector<std::string> data);
bool checkStatus(uint32_t val, uint32_t mask); bool checkStatus(uint32_t val, uint32_t mask);
void displayReadReg(uint32_t dev); void displayReadReg(uint32_t dev);