sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hosted/dap: Fix tdi_tdo_seq.

This commit is contained in:
Uwe Bonnes 2021-01-01 14:10:25 +01:00 committed by UweBonnes
parent 2d4a503135
commit 5c8e277663
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platforms/hosted/cmsis_dap.c
View File

@ -349,7 +349,7 @@ static void cmsis_dap_jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms,
const uint8_t *DI, int ticks) const uint8_t *DI, int ticks)
{ {
dap_jtagtap_tdi_tdo_seq(DO, (final_tms), NULL, DI, ticks); dap_jtagtap_tdi_tdo_seq(DO, (final_tms), NULL, DI, ticks);
DEBUG_PROBE("jtagtap_tdi_tdo_seq %d, %02x-> %02x\n", ticks, DI[0], DO[0]); DEBUG_PROBE("jtagtap_tdi_tdo_seq %d, %02x-> %02x\n", ticks, DI[0], (DO)? DO[0] : 0);
} }
static void cmsis_dap_jtagtap_tdi_seq(const uint8_t final_tms, static void cmsis_dap_jtagtap_tdi_seq(const uint8_t final_tms,

44
src/platforms/hosted/dap.c
View File

@ -644,15 +644,16 @@ void dap_write_single(ADIv5_AP_t *ap, uint32_t dest, const void *src,
void dap_jtagtap_tdi_tdo_seq(uint8_t *DO, bool final_tms, const uint8_t *TMS, void dap_jtagtap_tdi_tdo_seq(uint8_t *DO, bool final_tms, const uint8_t *TMS,
const uint8_t *DI, int ticks) const uint8_t *DI, int ticks)
{ {
DEBUG_PROBE("dap_jtagtap_tdi_tdo_seq %s %d ticks\n",
(final_tms) ? "final" : "", ticks);
uint8_t buf[64]; uint8_t buf[64];
const uint8_t *din = DI;
uint8_t *dout = DO;
if (!TMS) { if (!TMS) {
int last_byte = 0; int last_byte = last_byte = (ticks - 1) >> 3;
int last_bit = 0; int last_bit = (ticks - 1) & 7;
if (final_tms) { if (final_tms)
last_byte = ticks >> 3;
last_bit = ticks & 7;
ticks --; ticks --;
}
while (ticks) { while (ticks) {
int transfers = ticks; int transfers = ticks;
if (transfers > 64) if (transfers > 64)
@ -660,11 +661,12 @@ void dap_jtagtap_tdi_tdo_seq(uint8_t *DO, bool final_tms, const uint8_t *TMS,
uint8_t *p = buf; uint8_t *p = buf;
*p++ = ID_DAP_JTAG_SEQUENCE; *p++ = ID_DAP_JTAG_SEQUENCE;
*p++ = 1; *p++ = 1;
*p++ = transfers | ((DO) ? DAP_JTAG_TDO_CAPTURE : 0); *p++ = ((transfers == 64) ? 0 : transfers) |
((DO) ? DAP_JTAG_TDO_CAPTURE : 0);
int n_di_bytes = (transfers + 7) >> 3; int n_di_bytes = (transfers + 7) >> 3;
if (DI) { if (din) {
p = memcpy(p, DI, n_di_bytes); p = memcpy(p, din, n_di_bytes);
DI += n_di_bytes; din += n_di_bytes;
} else { } else {
p = memset(p, 0xff, n_di_bytes); p = memset(p, 0xff, n_di_bytes);
} }
@ -672,9 +674,9 @@ void dap_jtagtap_tdi_tdo_seq(uint8_t *DO, bool final_tms, const uint8_t *TMS,
dbg_dap_cmd(buf, sizeof(buf), p - buf); dbg_dap_cmd(buf, sizeof(buf), p - buf);
if (buf[0] != DAP_OK) if (buf[0] != DAP_OK)
DEBUG_WARN("dap_jtagtap_tdi_tdo_seq failed %02x\n", buf[0]); DEBUG_WARN("dap_jtagtap_tdi_tdo_seq failed %02x\n", buf[0]);
if (DO) { if (dout) {
memcpy(DO, &buf[1], (transfers + 7) >> 3); memcpy(dout, &buf[1], (transfers + 7) >> 3);
DO += (transfers + 7) >> 3; dout += (transfers + 7) >> 3;
} }
ticks -= transfers; ticks -= transfers;
} }
@ -682,8 +684,8 @@ void dap_jtagtap_tdi_tdo_seq(uint8_t *DO, bool final_tms, const uint8_t *TMS,
uint8_t *p = buf; uint8_t *p = buf;
*p++ = ID_DAP_JTAG_SEQUENCE; *p++ = ID_DAP_JTAG_SEQUENCE;
*p++ = 1; *p++ = 1;
*p++ = 1 | ((DO) ? DAP_JTAG_TDO_CAPTURE : 0) | DAP_JTAG_TMS; *p++ = 1 | ((dout) ? DAP_JTAG_TDO_CAPTURE : 0) | DAP_JTAG_TMS;
if (DI) { if (din) {
*p++ = ((DI[last_byte] & (1 << last_bit)) ? 1 : 0); *p++ = ((DI[last_byte] & (1 << last_bit)) ? 1 : 0);
} else { } else {
*p++ = 0; *p++ = 0;
@ -691,7 +693,7 @@ void dap_jtagtap_tdi_tdo_seq(uint8_t *DO, bool final_tms, const uint8_t *TMS,
dbg_dap_cmd(buf, sizeof(buf), p - buf); dbg_dap_cmd(buf, sizeof(buf), p - buf);
if (buf[0] == DAP_ERROR) if (buf[0] == DAP_ERROR)
DEBUG_WARN("dap_jtagtap_tdi_tdo_seq failed %02x\n", buf[0]); DEBUG_WARN("dap_jtagtap_tdi_tdo_seq failed %02x\n", buf[0]);
if (DO) { if (dout) {
if (buf[1] & 1) if (buf[1] & 1)
DO[last_byte] |= (1 << last_bit); DO[last_byte] |= (1 << last_bit);
else else
@ -709,11 +711,11 @@ void dap_jtagtap_tdi_tdo_seq(uint8_t *DO, bool final_tms, const uint8_t *TMS,
*p++ = transfers; *p++ = transfers;
for (int i = 0; i < transfers; i++) { for (int i = 0; i < transfers; i++) {
*p++ = 1 | ((DO) ? DAP_JTAG_TDO_CAPTURE : 0) | *p++ = 1 | ((DO) ? DAP_JTAG_TDO_CAPTURE : 0) |
((TMS[i >> 8] & (1 << (i & 7))) ? DAP_JTAG_TMS : 0); ((TMS[i / 8] & (1 << (i & 7))) ? DAP_JTAG_TMS : 0);
if (DI) if (DI)
*p++ = (DI[i >> 8] & (1 << (i & 7))) ? 1 : 0; *p++ = (DI[i / 8] & (1 << (i & 7))) ? 1 : 0;
else else
*p++ = 0x55; *p++ = 1;
} }
dbg_dap_cmd(buf, sizeof(buf), p - buf); dbg_dap_cmd(buf, sizeof(buf), p - buf);
if (buf[0] == DAP_ERROR) if (buf[0] == DAP_ERROR)
@ -721,9 +723,9 @@ void dap_jtagtap_tdi_tdo_seq(uint8_t *DO, bool final_tms, const uint8_t *TMS,
if (DO) { if (DO) {
for (int i = 0; i < transfers; i++) { for (int i = 0; i < transfers; i++) {
if (buf[i + 1]) if (buf[i + 1])
DO[i >> 8] |= (1 << (i & 7)); DO[i / 8] |= (1 << (i & 7));
else else
DO[i >> 8] &= ~(1 << (i & 7)); DO[i / 8] &= ~(1 << (i & 7));
} }
} }
ticks -= transfers; ticks -= transfers;