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

dirtyJtag optimizations to cut the number of USB requests

This commit is contained in:
phdussud 2021-06-13 11:38:30 -07:00
parent 2bf7b255b3
commit f84cb403e4
1 changed files with 72 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/dirtyJtag.cpp
View File

@ -179,14 +179,43 @@ int DirtyJtag::setClkFreq(uint32_t clkHZ)
int DirtyJtag::writeTMS(uint8_t *tms, int len, bool flush_buffer) int DirtyJtag::writeTMS(uint8_t *tms, int len, bool flush_buffer)
{ {
(void) flush_buffer; (void) flush_buffer;
int actual_length;
if (len == 0) if (len == 0)
return 0; return 0;
for (int i = 0; i < len; i++) { uint8_t mask= SIG_TCK | SIG_TMS;
bool val = (tms[i >> 3] & (1 << (i & 0x07))); uint8_t buf[64];
sendBitBang(SIG_TMS, ((val)?SIG_TMS : 0), NULL, (i == len-1)); u_int buffer_idx = 0;
for (int i = 0; i < len; i++)
{
uint8_t val = (tms[i >> 3] & (1 << (i & 0x07))) ? SIG_TMS : 0;
buf[buffer_idx++] = CMD_SETSIG;
buf[buffer_idx++] = mask;
buf[buffer_idx++] = val;
buf[buffer_idx++] = CMD_SETSIG;
buf[buffer_idx++] = mask;
buf[buffer_idx++] = val | SIG_TCK;
if ((buffer_idx + 7) >= sizeof(buf) || (i == len - 1)) {
//flush the buffer
if (i == len - 1) {
//insert tck falling edge
buf[buffer_idx++] = CMD_SETSIG;
buf[buffer_idx++] = mask;
buf[buffer_idx++] = val;
} }
buf[buffer_idx++] = CMD_STOP;
int ret = libusb_bulk_transfer(dev_handle, DIRTYJTAG_WRITE_EP,
buf, buffer_idx, &actual_length, 1000);
if (ret < 0)
{
cerr << "toggleClk: usb bulk write failed " << ret << endl;
return -EXIT_FAILURE;
}
buffer_idx = 0;
}
}
assert(buffer_idx == 0);
return len; return len;
} }
@ -316,33 +345,34 @@ int DirtyJtag::writeTDI(uint8_t *tx, uint8_t *rx, uint32_t len, bool end)
int DirtyJtag::sendBitBang(uint8_t mask, uint8_t val, uint8_t *read, bool last) 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,
static_cast<uint8_t>(mask), static_cast<uint8_t>(mask),
static_cast<uint8_t>(val | SIG_TCK), static_cast<uint8_t>(val | SIG_TCK),
CMD_STOP}; CMD_GETSIG, //<---Read instruction
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, 7, &actual_length, 1000) < 0) { buf, sizeof(buf), &actual_length, 1000) < 0) {
cerr << "sendBitBang: usb bulk write failed 1" << endl; cerr << "sendBitBang: usb bulk write failed 1" << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
if (read) { if (read) {
uint8_t rd_buf[] = {CMD_GETSIG, CMD_STOP}; do
if (libusb_bulk_transfer(dev_handle, DIRTYJTAG_WRITE_EP, {
rd_buf, 2, &actual_length, 1000) < 0) {
cerr << "sendBitBang: usb bulk write failed 3" << endl;
return -EXIT_FAILURE;
}
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) { read, 1, &actual_length, 1000) < 0)
{
cerr << "sendBitBang: usb bulk read failed 4" << endl; cerr << "sendBitBang: usb bulk read failed 4" << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
@ -360,4 +390,7 @@ int DirtyJtag::sendBitBang(uint8_t mask, uint8_t val, uint8_t *read, bool last)
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
} else {
return toggleClk(SIG_TMS & val, SIG_TDI & val, 1);
}
} }