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

Make IDCODE unsigned

This commit is contained in:
Alexey Starikovskiy 2023-08-10 13:50:26 +03:00
parent 8976404b78
commit 0f3afbcaea
19 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/altera.cpp
View File

@ -250,7 +250,7 @@ void Altera::program(unsigned int offset, bool unprotect_flash)
} }
} }
int Altera::idCode() uint32_t Altera::idCode()
{ {
unsigned char tx_data[4] = {IDCODE}; unsigned char tx_data[4] = {IDCODE};
unsigned char rx_data[4]; unsigned char rx_data[4];

2
src/altera.hpp
View File

@ -39,7 +39,7 @@ class Altera: public Device, SPIInterface {
return SPIInterface::dump(base_addr, len); return SPIInterface::dump(base_addr, len);
} }
int idCode() override; uint32_t idCode() override;
void reset() override; void reset() override;
/*************************/ /*************************/

8
src/anlogic.cpp
View File

@ -113,11 +113,7 @@ void Anlogic::program(unsigned int offset, bool unprotect_flash)
const uint8_t *ptr = data; const uint8_t *ptr = data;
while (len > 0) { while (len > 0) {
int xfer_len = (len > 512)?512:len; int xfer_len = (len > 512)?512:len;
Jtag::tapState_t tx_end; Jtag::tapState_t tx_end = (len - xfer_len) ? Jtag::SHIFT_DR : Jtag::RUN_TEST_IDLE;
if (len - xfer_len == 0)
tx_end = Jtag::RUN_TEST_IDLE;
else
tx_end = Jtag::SHIFT_DR;
_jtag->shiftDR(ptr, NULL, xfer_len * 8, tx_end); _jtag->shiftDR(ptr, NULL, xfer_len * 8, tx_end);
len -= xfer_len; len -= xfer_len;
progress.display(pos); progress.display(pos);
@ -143,7 +139,7 @@ void Anlogic::program(unsigned int offset, bool unprotect_flash)
} }
} }
int Anlogic::idCode() uint32_t Anlogic::idCode()
{ {
unsigned char tx_data[4]; unsigned char tx_data[4];
unsigned char rx_data[4]; unsigned char rx_data[4];

2
src/anlogic.hpp
View File

@ -22,7 +22,7 @@ class Anlogic: public Device, SPIInterface {
~Anlogic(); ~Anlogic();
void program(unsigned int offset, bool unprotect_flash) override; void program(unsigned int offset, bool unprotect_flash) override;
int idCode() override; uint32_t idCode() override;
void reset() override; void reset() override;
/* spi interface */ /* spi interface */

2
src/colognechip.hpp
View File

@ -44,7 +44,7 @@ class CologneChip: public Device, SPIInterface {
printError("bulk erase flash not supported"); return false;} printError("bulk erase flash not supported"); return false;}
void program(unsigned int offset, bool unprotect_flash) override; void program(unsigned int offset, bool unprotect_flash) override;
int idCode() override {return 0;} uint32_t idCode() override {return 0;}
void reset() override; void reset() override;
private: private:

2
src/device.hpp
View File

@ -50,7 +50,7 @@ class Device {
virtual bool unprotect_flash() = 0; virtual bool unprotect_flash() = 0;
virtual bool bulk_erase_flash() = 0; virtual bool bulk_erase_flash() = 0;
virtual int idCode() = 0; virtual uint32_t idCode() = 0;
virtual void reset(); virtual void reset();
virtual bool connectJtagToMCU() {return false;} virtual bool connectJtagToMCU() {return false;}

2
src/efinix.hpp
View File

@ -37,7 +37,7 @@ class Efinix: public Device, SPIInterface {
bool bulk_erase_flash() override { bool bulk_erase_flash() override {
printError("bulk erase flash not supported"); return false;} printError("bulk erase flash not supported"); return false;}
/* not supported in SPI Active mode */ /* not supported in SPI Active mode */
int idCode() override {return 0;} uint32_t idCode() override {return 0;}
void reset() override; void reset() override;
/* spi interface */ /* spi interface */

2
src/gowin.cpp
View File

@ -400,7 +400,7 @@ bool Gowin::DisableCfg()
return pollFlag(STATUS_SYSTEM_EDIT_MODE, 0); return pollFlag(STATUS_SYSTEM_EDIT_MODE, 0);
} }
int Gowin::idCode() uint32_t Gowin::idCode()
{ {
uint8_t device_id[4]; uint8_t device_id[4];
wr_rd(READ_IDCODE, NULL, 0, device_id, 4); wr_rd(READ_IDCODE, NULL, 0, device_id, 4);

2
src/gowin.hpp
View File

@ -22,7 +22,7 @@ class Gowin: public Device, SPIInterface {
Device::prog_type_t prg_type, bool external_flash, Device::prog_type_t prg_type, bool external_flash,
bool verify, int8_t verbose); bool verify, int8_t verbose);
~Gowin(); ~Gowin();
int idCode() override; uint32_t idCode() override;
void reset() override; void reset() override;
void program(unsigned int offset, bool unprotect_flash) override; void program(unsigned int offset, bool unprotect_flash) override;
void programFlash(); void programFlash();

2
src/ice40.hpp
View File

@ -28,7 +28,7 @@ class Ice40: public Device, SPIInterface {
bool unprotect_flash() override; bool unprotect_flash() override;
bool bulk_erase_flash() override; bool bulk_erase_flash() override;
/* not supported in SPI Active mode */ /* not supported in SPI Active mode */
int idCode() override {return 0;} uint32_t idCode() override {return 0;}
void reset() override; void reset() override;
int spi_put(uint8_t cmd, const uint8_t *tx, uint8_t *rx, int spi_put(uint8_t cmd, const uint8_t *tx, uint8_t *rx,

5
src/jtag.cpp
View File

@ -440,7 +440,7 @@ int Jtag::shiftIR(unsigned char *tdi, unsigned char *tdo, int irlen, tapState_t
return 0; return 0;
} }
void Jtag::set_state(int newState) void Jtag::set_state(tapState_t newState)
{ {
unsigned char tms = 0; unsigned char tms = 0;
while (newState != _state) { while (newState != _state) {
@ -621,6 +621,9 @@ void Jtag::set_state(int newState)
_state = SELECT_DR_SCAN; _state = SELECT_DR_SCAN;
} }
break; break;
case UNKNOWN:;
// UNKNOWN should not be valid...
throw std::exception();
} }
setTMS(tms); setTMS(tms);

11
src/jtag.hpp
View File

@ -67,6 +67,7 @@ class Jtag {
* \return a pointer instance of JtagInterface * \return a pointer instance of JtagInterface
*/ */
JtagInterface *get_ll_class() {return _jtag;} JtagInterface *get_ll_class() {return _jtag;}
enum tapState_t { enum tapState_t {
TEST_LOGIC_RESET = 0, TEST_LOGIC_RESET = 0,
RUN_TEST_IDLE = 1, RUN_TEST_IDLE = 1,
@ -88,16 +89,16 @@ class Jtag {
}; };
int shiftIR(unsigned char *tdi, unsigned char *tdo, int irlen, int shiftIR(unsigned char *tdi, unsigned char *tdo, int irlen,
Jtag::tapState_t end_state = RUN_TEST_IDLE); tapState_t end_state = RUN_TEST_IDLE);
int shiftIR(unsigned char tdi, int irlen, int shiftIR(unsigned char tdi, int irlen,
Jtag::tapState_t end_state = RUN_TEST_IDLE); tapState_t end_state = RUN_TEST_IDLE);
int shiftDR(const uint8_t *tdi, unsigned char *tdo, int drlen, int shiftDR(const uint8_t *tdi, unsigned char *tdo, int drlen,
Jtag::tapState_t end_state = RUN_TEST_IDLE); tapState_t end_state = RUN_TEST_IDLE);
int read_write(const uint8_t *tdi, unsigned char *tdo, int len, char last); int read_write(const uint8_t *tdi, unsigned char *tdo, int len, char last);
void toggleClk(int nb); void toggleClk(int nb);
void go_test_logic_reset(); void go_test_logic_reset();
void set_state(int newState); void set_state(tapState_t newState);
int flushTMS(bool flush_buffer = false); int flushTMS(bool flush_buffer = false);
void flush() {flushTMS(); _jtag->flush();} void flush() {flushTMS(); _jtag->flush();}
void setTMS(unsigned char tms); void setTMS(unsigned char tms);
@ -119,7 +120,7 @@ class Jtag {
*/ */
bool search_and_insert_device_with_idcode(uint32_t idcode); bool search_and_insert_device_with_idcode(uint32_t idcode);
bool _verbose; bool _verbose;
int _state; tapState_t _state;
int _tms_buffer_size; int _tms_buffer_size;
int _num_tms; int _num_tms;
unsigned char *_tms_buffer; unsigned char *_tms_buffer;

2
src/lattice.cpp
View File

@ -843,7 +843,7 @@ bool Lattice::DisableCfg()
return true; return true;
} }
int Lattice::idCode() uint32_t Lattice::idCode()
{ {
uint8_t device_id[4]; uint8_t device_id[4];
wr_rd(READ_DEVICE_ID_CODE, NULL, 0, device_id, 4); wr_rd(READ_DEVICE_ID_CODE, NULL, 0, device_id, 4);

2
src/lattice.hpp
View File

@ -23,7 +23,7 @@ class Lattice: public Device, SPIInterface {
Lattice(Jtag *jtag, std::string filename, const std::string &file_type, Lattice(Jtag *jtag, std::string filename, const std::string &file_type,
Device::prog_type_t prg_type, std::string flash_sector, bool verify, Device::prog_type_t prg_type, std::string flash_sector, bool verify,
int8_t verbose); int8_t verbose);
int idCode() override; uint32_t idCode() override;
int userCode(); int userCode();
void reset() override {} void reset() override {}
void program(unsigned int offset, bool unprotect_flash) override; void program(unsigned int offset, bool unprotect_flash) override;

8
src/svf_jtag.cpp
View File

@ -217,12 +217,12 @@ void SVF_jtag::parse_runtest(vector<string> const &vstr)
end_state = fsm_state[*res]; end_state = fsm_state[*res];
} }
if (run_state != -1) { if (run_state != -1) {
_run_state = run_state; _run_state = (Jtag::tapState_t)run_state;
} }
if (end_state != -1) { if (end_state != -1) {
_end_state = end_state; _end_state = (Jtag::tapState_t)end_state;
} else if (run_state != -1) { } else if (run_state != -1) {
_end_state = run_state; _end_state = (Jtag::tapState_t)run_state;
} }
_jtag->set_state(_run_state); _jtag->set_state(_run_state);
_jtag->toggleClk(nb_iter); _jtag->toggleClk(nb_iter);
@ -336,7 +336,7 @@ void SVF_jtag::handle_instruction(vector<string> const &vstr)
SVF_jtag::SVF_jtag(Jtag *jtag, bool verbose):_verbose(verbose), _freq_hz(0), SVF_jtag::SVF_jtag(Jtag *jtag, bool verbose):_verbose(verbose), _freq_hz(0),
_enddr((Jtag::tapState_t)fsm_state["IDLE"]), _endir((Jtag::tapState_t)fsm_state["IDLE"]), _enddr((Jtag::tapState_t)fsm_state["IDLE"]), _endir((Jtag::tapState_t)fsm_state["IDLE"]),
_run_state(fsm_state["IDLE"]), _end_state(fsm_state["IDLE"]) _run_state((Jtag::tapState_t)fsm_state["IDLE"]), _end_state((Jtag::tapState_t)fsm_state["IDLE"])
{ {
_jtag = jtag; _jtag = jtag;

4
src/svf_jtag.hpp
View File

@ -60,8 +60,8 @@ class SVF_jtag {
uint32_t _freq_hz; uint32_t _freq_hz;
Jtag::tapState_t _enddr; Jtag::tapState_t _enddr;
Jtag::tapState_t _endir; Jtag::tapState_t _endir;
int _run_state; Jtag::tapState_t _run_state;
int _end_state; Jtag::tapState_t _end_state;
svf_XYR hdr; svf_XYR hdr;
svf_XYR hir; svf_XYR hir;
svf_XYR sdr; svf_XYR sdr;

2
src/xilinx.cpp
View File

@ -330,7 +330,7 @@ void Xilinx::reset()
_jtag->toggleClk(2000); _jtag->toggleClk(2000);
} }
int Xilinx::idCode() uint32_t Xilinx::idCode()
{ {
int id = 0; int id = 0;
unsigned char tx_data[4]= {0x00, 0x00, 0x00, 0x00}; unsigned char tx_data[4]= {0x00, 0x00, 0x00, 0x00};

2
src/xilinx.hpp
View File

@ -46,7 +46,7 @@ class Xilinx: public Device, SPIInterface {
*/ */
bool bulk_erase_flash() override; bool bulk_erase_flash() override;
int idCode() override; uint32_t idCode() override;
void reset() override; void reset() override;
/* -------------- */ /* -------------- */