Merge pull request #571 from pu-cc/gatemate-jtag-bypass

colognechip: Simplify handling of JTAG bypass bits
This commit is contained in:
Gwenhael Goavec-Merou 2025-07-10 09:43:50 +02:00 committed by GitHub
commit 5e91e20e29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 15 deletions

View File

@ -324,25 +324,14 @@ void CologneChip::programJTAG_sram(const uint8_t *data, int length)
ProgressBar progress("Load SRAM via JTAG", length, 50, _quiet); ProgressBar progress("Load SRAM via JTAG", length, 50, _quiet);
/* make sure to only send multiples of 8 bits */
int bits_before = _jtag->get_devices_list().size() - _jtag->get_device_index() - 1;
if (bits_before > 0) {
int n = 8 - (bits_before % 8);
uint8_t tx[n];
memset(tx, 0x00, n);
_jtag->shiftDR(tx, NULL, n, Jtag::SHIFT_DR);
}
/* the bypass register defaults to '0'. /* the bypass register defaults to '0'.
* in order to generate a proper 'nop' command (0x00, 0xFF), send a * in order to generate a proper 'nop' command (0x00, 0xFF), send a
* sequence of zeros instead of ones. * sequence of zeros instead of ones.
*/ */
int bits_after = _jtag->get_device_index(); if (_jtag->get_devices_list().size() > 1) {
if (bits_after > 0) { int bits_before = 8 - (_jtag->get_device_index() % 8);
int n = (bits_after + 7) / 8; _jtag->set_state(Jtag::SHIFT_DR, 0);
uint8_t tx[n]; _jtag->toggleClk(bits_before, 0);
memset(tx, 0x00, n);
_jtag->shiftDR(tx, NULL, 8-bits_after, Jtag::SHIFT_DR);
} }
Jtag::tapState_t next_state = Jtag::SHIFT_DR; Jtag::tapState_t next_state = Jtag::SHIFT_DR;