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

jtag, ftdiJtagBitbang: improve tms flush and fix data reconstruct in specific conditions

This commit is contained in:
Gwenhael Goavec-Merou 2020-05-19 08:32:43 +02:00
parent fd133f9c91
commit aa752856c3
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ftdiJtagBitbang.cpp
View File

@ -115,15 +115,14 @@ int FtdiJtagBitBang::storeTMS(uint8_t *tms, int nb_bit, uint8_t tdi, bool read)
xfer_len -= xfer; xfer_len -= xfer;
if (xfer_len != 0) if (xfer_len != 0)
write(NULL); write(NULL, 0);
} }
return nb_bit; return nb_bit;
} }
int FtdiJtagBitBang::writeTMS(uint8_t *tdo, int len) int FtdiJtagBitBang::writeTMS(uint8_t *tdo, int len)
{ {
(void) len; return write(tdo, len);
return write(tdo);
} }
/** /**
@ -159,12 +158,11 @@ int FtdiJtagBitBang::storeTDI(uint8_t *tdi, int nb_byte, bool read)
int FtdiJtagBitBang::writeTDI(uint8_t *tdo, int nb_bit) int FtdiJtagBitBang::writeTDI(uint8_t *tdo, int nb_bit)
{ {
(void) nb_bit; return write(tdo, nb_bit);
return write(tdo);
} }
int FtdiJtagBitBang::write(uint8_t *tdo) int FtdiJtagBitBang::write(uint8_t *tdo, int nb_bit)
{ {
int ret = 0; int ret = 0;
if (_nb_bit == 0) if (_nb_bit == 0)
@ -184,8 +182,10 @@ int FtdiJtagBitBang::write(uint8_t *tdo)
* even bit are discarded since JTAG read in rising edge * even bit are discarded since JTAG read in rising edge
* since jtag is LSB first we need to shift right content by 1 * since jtag is LSB first we need to shift right content by 1
* and add 0x80 (1 << 7) or 0 * and add 0x80 (1 << 7) or 0
* the buffer may contains some tms bit, so start with i
* equal to fill exactly nb_bit bits
* */ * */
for (int i = 1, offset=0; i < _nb_bit; i+=2, offset++) { for (int i = (_nb_bit-(nb_bit *2) + 1), offset=0; i < _nb_bit; i+=2, offset++) {
tdo[offset >> 3] = (((_in_buf[i] & _tdo_pin) ? 0x80 : 0x00) | tdo[offset >> 3] = (((_in_buf[i] & _tdo_pin) ? 0x80 : 0x00) |
(tdo[offset >> 3] >> 1)); (tdo[offset >> 3] >> 1));
} }

2
src/ftdiJtagBitbang.hpp
View File

@ -70,7 +70,7 @@ class FtdiJtagBitBang : public JtagInterface, private FTDIpp_MPSSE {
private: private:
void init_internal(const FTDIpp_MPSSE::mpsse_bit_config &cable, void init_internal(const FTDIpp_MPSSE::mpsse_bit_config &cable,
const jtag_pins_conf_t *pin_conf); const jtag_pins_conf_t *pin_conf);
int write(uint8_t *tdo); int write(uint8_t *tdo, int nb_bit);
int setBitmode(uint8_t mode); int setBitmode(uint8_t mode);
uint8_t *_in_buf; uint8_t *_in_buf;

6
src/jtag.cpp
View File

@ -147,6 +147,7 @@ void Jtag::setTMS(unsigned char tms)
int Jtag::flushTMS(bool flush_buffer) int Jtag::flushTMS(bool flush_buffer)
{ {
int xfer = _num_tms;
if (_num_tms != 0) { if (_num_tms != 0) {
display("%s: %d %x\n", __func__, _num_tms, _tms_buffer[0]); display("%s: %d %x\n", __func__, _num_tms, _tms_buffer[0]);
@ -155,9 +156,10 @@ int Jtag::flushTMS(bool flush_buffer)
/* reset buffer and number of bits */ /* reset buffer and number of bits */
bzero(_tms_buffer, _tms_buffer_size); bzero(_tms_buffer, _tms_buffer_size);
_num_tms = 0; _num_tms = 0;
if (flush_buffer) {
return _jtag->writeTMS(NULL, xfer);
}
} }
if (flush_buffer)
return _jtag->writeTMS(NULL);
return 0; return 0;
} }