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

jtagtap: Refactored jtagtap_tdi_seq, cleaning up and fixing naming

This commit is contained in:
dragonmux 2022-07-16 01:02:54 +01:00 committed by Piotr Esden-Tempski
parent 131165701c
commit bdae0b2ded
1 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ jtag_proc_t jtag_proc;
static void jtagtap_reset(void); static void jtagtap_reset(void);
static void jtagtap_tms_seq(uint32_t tms_states, int ticks); static void jtagtap_tms_seq(uint32_t tms_states, int ticks);
static void jtagtap_tdi_tdo_seq(uint8_t *data_out, uint8_t final_tms, const uint8_t *data_in, int ticks); static void jtagtap_tdi_tdo_seq(uint8_t *data_out, uint8_t final_tms, const uint8_t *data_in, int ticks);
static void jtagtap_tdi_seq(uint8_t final_tms, const uint8_t *DI, int ticks); static void jtagtap_tdi_seq(uint8_t final_tms, const uint8_t *data_in, int ticks);
static uint8_t jtagtap_next(uint8_t tms, uint8_t tdi); static uint8_t jtagtap_next(uint8_t tms, uint8_t tdi);
int jtagtap_init() int jtagtap_init()
@ -129,10 +129,9 @@ static void jtagtap_tdi_tdo_seq_swd_delay(const uint8_t *data_in, uint8_t *data_
uint8_t value = 0; uint8_t value = 0;
while (clock_cycles--) { while (clock_cycles--) {
/* On the last cycle, assert final_tms to TMS_PIN */ /* On the last cycle, assert final_tms to TMS_PIN */
if (!clock_cycles) gpio_set_val(TMS_PORT, TMS_PIN, clock_cycles ? false : final_tms);
gpio_set_val(TMS_PORT, TMS_PIN, final_tms);
/* Set up the TDI pin and start the clock cycle */ /* Set up the TDI pin and start the clock cycle */
gpio_set_val(TDI_PORT, TDI_PIN, data_in[byte] & (1 << index)); gpio_set_val(TDI_PORT, TDI_PIN, data_in[byte] & (1U << index));
gpio_set(TCK_PORT, TCK_PIN); gpio_set(TCK_PORT, TCK_PIN);
for (volatile int32_t cnt = swd_delay_cnt - 2; cnt > 0; cnt--) for (volatile int32_t cnt = swd_delay_cnt - 2; cnt > 0; cnt--)
continue; continue;
@ -160,10 +159,9 @@ static void jtagtap_tdi_tdo_seq_no_delay(const uint8_t *data_in, uint8_t *data_o
uint8_t value = 0; uint8_t value = 0;
while (clock_cycles--) { while (clock_cycles--) {
/* On the last tick, assert final_tms to TMS_PIN */ /* On the last tick, assert final_tms to TMS_PIN */
if (!clock_cycles) gpio_set_val(TMS_PORT, TMS_PIN, clock_cycles ? false : final_tms);
gpio_set_val(TMS_PORT, TMS_PIN, final_tms);
/* Set up the TDI pin and start the clock cycle */ /* Set up the TDI pin and start the clock cycle */
gpio_set_val(TDI_PORT, TDI_PIN, data_in[byte] & (1 << index)); gpio_set_val(TDI_PORT, TDI_PIN, data_in[byte] & (1U << index));
gpio_set(TCK_PORT, TCK_PIN); gpio_set(TCK_PORT, TCK_PIN);
/* If TDO is high, store a 1 in the appropriate position in the value being accumulated */ /* If TDO is high, store a 1 in the appropriate position in the value being accumulated */
if (gpio_get(TDO_PORT, TDO_PIN)) if (gpio_get(TDO_PORT, TDO_PIN))
@ -190,35 +188,54 @@ static void jtagtap_tdi_tdo_seq(uint8_t *data_out, const uint8_t final_tms, cons
jtagtap_tdi_tdo_seq_no_delay(data_in, data_out, final_tms, ticks); jtagtap_tdi_tdo_seq_no_delay(data_in, data_out, final_tms, ticks);
} }
static void jtagtap_tdi_seq(const uint8_t final_tms, const uint8_t *DI, int ticks) static void jtagtap_tdi_seq_swd_delay(const uint8_t *data_in, const bool final_tms, size_t clock_cycles)
{ {
uint8_t index = 1; size_t byte = 0;
register volatile int32_t cnt; size_t index = 0;
if (swd_delay_cnt) { while (clock_cycles--) {
while (ticks--) { /* On the last tick, assert final_tms to TMS_PIN */
gpio_set_val(TMS_PORT, TMS_PIN, ticks ? 0 : final_tms); gpio_set_val(TMS_PORT, TMS_PIN, clock_cycles ? false : final_tms);
gpio_set_val(TDI_PORT, TDI_PIN, *DI & index); /* Set up the TDI pin and start the clock cycle */
gpio_set_val(TDI_PORT, TDI_PIN, data_in[byte] & (1U << index));
gpio_set(TCK_PORT, TCK_PIN); gpio_set(TCK_PORT, TCK_PIN);
for (cnt = swd_delay_cnt - 2; cnt > 0; cnt--) for (volatile int32_t cnt = swd_delay_cnt - 2; cnt > 0; cnt--)
; continue;
if (!(index <<= 1)) { /* If we've used a whole byte, reset state for the next */
index = 1; if (index++ == 7U) {
DI++; ++byte;
index = 0;
} }
/* Finish the clock cycle */
gpio_clear(TCK_PORT, TCK_PIN); gpio_clear(TCK_PORT, TCK_PIN);
for (cnt = swd_delay_cnt - 2; cnt > 0; cnt--) for (volatile int32_t cnt = swd_delay_cnt - 2; cnt > 0; cnt--)
; continue;
} }
} else { }
while (ticks--) {
gpio_set_val(TMS_PORT, TMS_PIN, ticks ? 0 : final_tms); static void jtagtap_tdi_seq_no_delay(const uint8_t *data_in, const bool final_tms, size_t clock_cycles)
gpio_set_val(TDI_PORT, TDI_PIN, *DI & index); {
size_t byte = 0;
size_t index = 0;
while (clock_cycles--) {
/* On the last tick, assert final_tms to TMS_PIN */
gpio_set_val(TMS_PORT, TMS_PIN, clock_cycles ? false : final_tms);
/* Set up the TDI pin and start the clock cycle */
gpio_set_val(TDI_PORT, TDI_PIN, data_in[byte] & (1U << index));
gpio_set(TCK_PORT, TCK_PIN); gpio_set(TCK_PORT, TCK_PIN);
if (!(index <<= 1)) { /* If we've used a whole byte, reset state for the next */
index = 1; if (index++ == 7U) {
DI++; ++byte;
index = 0;
} }
/* Finish the clock cycle */
gpio_clear(TCK_PORT, TCK_PIN); gpio_clear(TCK_PORT, TCK_PIN);
} }
} }
static void jtagtap_tdi_seq(const uint8_t final_tms, const uint8_t *data_in, int ticks)
{
if (swd_delay_cnt)
jtagtap_tdi_seq_swd_delay(data_in, final_tms, ticks);
else
jtagtap_tdi_seq_no_delay(data_in, final_tms, ticks);
} }