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

jtagtap: Reworked jtagtap_tms_seq(), saving 8 bytes and simplifying things

This commit is contained in:
dragonmux 2022-07-15 23:33:41 +01:00 committed by Piotr Esden-Tempski
parent 303fa15171
commit 1671b97f61
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/jtagtap.h
View File

@ -36,8 +36,8 @@ typedef struct jtag_proc_s {
* - Caputure the value on TDO * - Caputure the value on TDO
* - Release TCK. * - Release TCK.
*/ */
uint8_t (*jtagtap_next)(const uint8_t TMS, const uint8_t TDI); uint8_t (*jtagtap_next)(const uint8_t tms, const uint8_t tdi);
void (*jtagtap_tms_seq)(uint32_t MS, int ticks); void (*jtagtap_tms_seq)(uint32_t tms_states, int ticks);
/* /*
* Shift out a sequence on MS and DI, capture data to DO. * Shift out a sequence on MS and DI, capture data to DO.

59
src/platforms/common/jtagtap.c
View File

@ -85,34 +85,41 @@ static uint8_t jtagtap_next(const uint8_t tms, const uint8_t tdi)
return result != 0; return result != 0;
} }
static void jtagtap_tms_seq_swd_delay(uint32_t tms_states, size_t ticks)
{
while (ticks) {
const bool state = tms_states & 1;
gpio_set_val(TMS_PORT, TMS_PIN, state);
gpio_set(TCK_PORT, TCK_PIN);
for (volatile int32_t cnt = swd_delay_cnt - 2; cnt > 0; cnt--)
continue;
tms_states >>= 1;
ticks--;
gpio_clear(TCK_PORT, TCK_PIN);
for (volatile int32_t cnt = swd_delay_cnt - 2; cnt > 0; cnt--)
continue;
}
}
static void jtagtap_tms_seq_no_delay(uint32_t tms_states, size_t ticks)
{
while (ticks) {
const bool state = tms_states & 1;
gpio_set_val(TMS_PORT, TMS_PIN, state);
gpio_set(TCK_PORT, TCK_PIN);
tms_states >>= 1;
ticks--;
gpio_clear(TCK_PORT, TCK_PIN);
}
}
static void jtagtap_tms_seq(uint32_t MS, int ticks) static void jtagtap_tms_seq(uint32_t MS, int ticks)
{ {
gpio_set_val(TDI_PORT, TDI_PIN, 1); gpio_set_val(TDI_PORT, TDI_PIN, true);
bool state = MS & 1; if (swd_delay_cnt)
register volatile int32_t cnt; jtagtap_tms_seq_swd_delay(MS, ticks);
if (swd_delay_cnt) { else
while (ticks) { jtagtap_tms_seq_no_delay(MS, ticks);
gpio_set_val(TMS_PORT, TMS_PIN, state);
gpio_set(TCK_PORT, TCK_PIN);
for (cnt = swd_delay_cnt - 2; cnt > 0; cnt--)
continue;
MS >>= 1;
state = MS & 1;
ticks--;
gpio_clear(TCK_PORT, TCK_PIN);
for (cnt = swd_delay_cnt - 2; cnt > 0; cnt--)
continue;
}
} else {
while (ticks) {
gpio_set_val(TMS_PORT, TMS_PIN, state);
gpio_set(TCK_PORT, TCK_PIN);
MS >>= 1;
state = MS & 1;
ticks--;
gpio_clear(TCK_PORT, TCK_PIN);
}
}
} }
static void jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks) static void jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks)