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

xilinx: use shiftIR with val when it's possible

This commit is contained in:
Gwenhael Goavec-Merou 2019-10-05 18:12:33 +02:00
parent 1afeb22478
commit 9391b7840d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xilinx.cpp
View File

@ -43,10 +43,9 @@ void Xilinx::reset()
int Xilinx::idCode() int Xilinx::idCode()
{ {
unsigned char tx_data = IDCODE;
unsigned char rx_data[4]; unsigned char rx_data[4];
_jtag->go_test_logic_reset(); _jtag->go_test_logic_reset();
_jtag->shiftIR(&tx_data, NULL, 6); _jtag->shiftIR(IDCODE, 6);
_jtag->shiftDR(NULL, rx_data, 32); _jtag->shiftDR(NULL, rx_data, 32);
return ((rx_data[0] & 0x000000ff) | return ((rx_data[0] & 0x000000ff) |
((rx_data[1] << 8) & 0x0000ff00) | ((rx_data[1] << 8) & 0x0000ff00) |
@ -78,8 +77,7 @@ void Xilinx::program(unsigned int offset)
* TCK five times. This ensures starting in X 1 5 * TCK five times. This ensures starting in X 1 5
* the TLR (Test-Logic-Reset) state. * the TLR (Test-Logic-Reset) state.
*/ */
tx_buf = JPROGRAM; _jtag->shiftIR(JPROGRAM, 6);
_jtag->shiftIR(&tx_buf, NULL, 6/*, FtdiJtag::TEST_LOGIC_RESET*/);
/* test */ /* test */
tx_buf = BYPASS; tx_buf = BYPASS;
do { do {
@ -97,8 +95,7 @@ void Xilinx::program(unsigned int offset)
* exiting SHIFT-IR, as defined in the 0 1 1 * exiting SHIFT-IR, as defined in the 0 1 1
* IEEE standard. * IEEE standard.
*/ */
tx_buf = CFG_IN; _jtag->shiftIR(CFG_IN, 6);
_jtag->shiftIR(&tx_buf, NULL, 6);
/* /*
* 11: Enter the SELECT-DR state. X 1 2 * 11: Enter the SELECT-DR state. X 1 2
*/ */
@ -133,8 +130,7 @@ void Xilinx::program(unsigned int offset)
* 20: Load the last bit of the JSTART instruction. 0 1 1 * 20: Load the last bit of the JSTART instruction. 0 1 1
* 21: Move to the UPDATE-IR state. X 1 1 * 21: Move to the UPDATE-IR state. X 1 1
*/ */
tx_buf = JSTART; _jtag->shiftIR(JSTART, 6, FtdiJtag::UPDATE_IR);
_jtag->shiftIR(&tx_buf, NULL, 6, FtdiJtag::UPDATE_IR);
/* /*
* 22: Move to the RTI state and clock the * 22: Move to the RTI state and clock the
* startup sequence by applying a minimum X 0 2000 * startup sequence by applying a minimum X 0 2000