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

Merge pull request #410 from pu-cc/gatemate-chain-fix 

gatemate: fix configuration byte alignment in jtag chains
This commit is contained in:
Gwenhael Goavec-Merou 2023-12-27 14:42:29 +01:00 committed by GitHub
parent a3745bca7d 001f20c884
commit c51dbcb0ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/colognechip.cpp
View File

@ -7,6 +7,7 @@
#include "colognechip.hpp" #include "colognechip.hpp"
#include <memory> #include <memory>
#include <string.h>
#define JTAG_CONFIGURE 0x06 #define JTAG_CONFIGURE 0x06
#define JTAG_SPI_BYPASS 0x05 #define JTAG_SPI_BYPASS 0x05
@ -279,19 +280,42 @@ 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'.
* in order to generate a proper 'nop' command (0x00, 0xFF), send a
* sequence of zeros instead of ones.
*/
int bits_after = _jtag->get_device_index();
if (bits_after > 0) {
int n = (bits_after + 7) / 8;
uint8_t tx[n];
memset(tx, 0x00, n);
_jtag->shiftDR(tx, NULL, 8-bits_after, Jtag::SHIFT_DR);
}
Jtag::tapState_t next_state = Jtag::SHIFT_DR;
for (int i = 0; i < length; i += size) { for (int i = 0; i < length; i += size) {
if (length < i + size) if (length < i + size) {
size = length-i; size = length-i;
next_state = Jtag::RUN_TEST_IDLE;
}
for (int ii = 0; ii < size; ii++) for (int ii = 0; ii < size; ii++)
tmp[ii] = data[i+ii]; tmp[ii] = data[i+ii];
_jtag->shiftDR(tmp, NULL, size*8, Jtag::SHIFT_DR); _jtag->shiftDR(tmp, NULL, size*8, next_state);
progress.display(i); progress.display(i);
} }
progress.done(); progress.done();
_jtag->set_state(Jtag::RUN_TEST_IDLE);
if (_ftdi_jtag) { if (_ftdi_jtag) {
waitCfgDone(); waitCfgDone();

6
src/jtag.hpp
View File

@ -65,6 +65,12 @@ class Jtag {
*/ */
std::vector<int> get_devices_list() {return _devices_list;} std::vector<int> get_devices_list() {return _devices_list;}
/*!
* \brief return device index in list
* \return device index
*/
int get_device_index() {return device_index;}
/*! /*!
* \brief return current selected device idcode * \brief return current selected device idcode
* \return device idcode * \return device idcode