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

Changes per code review.

This commit is contained in:
phdussud 2021-06-19 09:40:33 -07:00
parent f84cb403e4
commit cbbac0bff8
1 changed files with 51 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/dirtyJtag.cpp
View File

@ -215,7 +215,6 @@ int DirtyJtag::writeTMS(uint8_t *tms, int len, bool flush_buffer)
buffer_idx = 0; buffer_idx = 0;
} }
} }
assert(buffer_idx == 0);
return len; return len;
} }
@ -327,28 +326,15 @@ int DirtyJtag::writeTDI(uint8_t *tx, uint8_t *rx, uint32_t len, bool end)
unsigned char last_bit = unsigned char last_bit =
(tx_cpy[pos >> 3] & (1 << (pos & 0x07))) ? SIG_TDI: 0; (tx_cpy[pos >> 3] & (1 << (pos & 0x07))) ? SIG_TDI: 0;
if (sendBitBang(SIG_TMS | SIG_TDI, uint8_t mask = SIG_TMS | SIG_TDI;
SIG_TMS | (last_bit), (rx ? &sig : 0), true) != 0) { uint8_t val = SIG_TMS | (last_bit);
cerr << "writeTDI: last bit error" << endl;
return -EXIT_FAILURE;
}
if (rx) { if (rx)
rx[pos >> 3] >>= 1;
if (sig & SIG_TDO) {
rx[pos >> 3] |= (1 << (pos & 0x07));;
}
}
}
return EXIT_SUCCESS;
}
int DirtyJtag::sendBitBang(uint8_t mask, uint8_t val, uint8_t *read, bool last)
{ {
if (read || !((mask & SIG_TDI) && (mask & SIG_TMS))) {
int actual_length; int actual_length;
mask |= SIG_TCK; mask |= SIG_TCK;
uint8_t buf[] = {CMD_SETSIG, uint8_t buf[] = {
CMD_SETSIG,
static_cast<uint8_t>(mask), static_cast<uint8_t>(mask),
static_cast<uint8_t>(val), static_cast<uint8_t>(val),
CMD_SETSIG, CMD_SETSIG,
@ -357,40 +343,44 @@ int DirtyJtag::sendBitBang(uint8_t mask, uint8_t val, uint8_t *read, bool last)
CMD_GETSIG, //<---Read instruction CMD_GETSIG, //<---Read instruction
CMD_STOP, CMD_STOP,
}; };
if (!read){
//remove the read instruction
buf[6] = CMD_STOP;
}
if (libusb_bulk_transfer(dev_handle, DIRTYJTAG_WRITE_EP, if (libusb_bulk_transfer(dev_handle, DIRTYJTAG_WRITE_EP,
buf, sizeof(buf), &actual_length, 1000) < 0) { buf, sizeof(buf), &actual_length, 1000) < 0)
cerr << "sendBitBang: usb bulk write failed 1" << endl; {
cerr << "writeTDI: last bit error: usb bulk write failed 1" << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
if (read) {
do do
{ {
if (libusb_bulk_transfer(dev_handle, DIRTYJTAG_READ_EP, if (libusb_bulk_transfer(dev_handle, DIRTYJTAG_READ_EP,
read, 1, &actual_length, 1000) < 0) &sig, 1, &actual_length, 1000) < 0)
{ {
cerr << "sendBitBang: usb bulk read failed 4" << endl; cerr << "writeTDI: last bit error: usb bulk read failed" << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
} while (actual_length == 0); } while (actual_length == 0);
rx[pos >> 3] >>= 1;
if (sig & SIG_TDO)
{
rx[pos >> 3] |= (1 << (pos & 0x07));
} }
if (last) {
buf[2] &= ~SIG_TCK; buf[2] &= ~SIG_TCK;
buf[3] = CMD_STOP; buf[3] = CMD_STOP;
if (libusb_bulk_transfer(dev_handle, DIRTYJTAG_WRITE_EP, if (libusb_bulk_transfer(dev_handle, DIRTYJTAG_WRITE_EP,
buf, 4, &actual_length, 1000) < 0) { buf, 4, &actual_length, 1000) < 0)
cerr << "sendBitBang usb bulk write failed" << endl; {
cerr << "writeTDI: last bit error: usb bulk write failed 2" << endl;
return -EXIT_FAILURE;
}
}
else
{
if (toggleClk(SIG_TMS & val, SIG_TDI & val, 1))
{
cerr << "writeTDI: last bit error" << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
} }
}
return EXIT_SUCCESS; return EXIT_SUCCESS;
} else {
return toggleClk(SIG_TMS & val, SIG_TDI & val, 1);
}
} }