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

swdptap: Refactored swdptap_seq_in_parity and cleaned up

This commit is contained in:
dragonmux 2022-07-16 02:42:23 +01:00 committed by Piotr Esden-Tempski
parent 6f0bdf5f32
commit c267327975
1 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/platforms/common/swdptap.c
View File

@ -102,49 +102,23 @@ static uint32_t swdptap_seq_in(size_t clock_cycles)
return swdptap_seq_in_no_delay(clock_cycles); return swdptap_seq_in_no_delay(clock_cycles);
} }
static bool swdptap_seq_in_parity(uint32_t *ret, size_t ticks) static bool swdptap_seq_in_parity(uint32_t *ret, size_t clock_cycles)
{ {
uint32_t index = 1; const uint32_t result = swdptap_seq_in(clock_cycles);
uint32_t res = 0;
bool bit;
int len = ticks;
register volatile int32_t cnt;
swdptap_turnaround(SWDIO_STATUS_FLOAT); int parity = __builtin_popcount(result);
if (swd_delay_cnt) { const bool bit = gpio_get(SWDIO_PORT, SWDIO_PIN);
while (len--) {
bit = gpio_get(SWDIO_PORT, SWDIO_PIN);
gpio_set(SWCLK_PORT, SWCLK_PIN);
for(cnt = swd_delay_cnt; --cnt > 0;);
res |= (bit) ? index : 0;
index <<= 1;
gpio_clear(SWCLK_PORT, SWCLK_PIN);
for(cnt = swd_delay_cnt; --cnt > 0;);
}
} else {
while (len--) {
bit = gpio_get(SWDIO_PORT, SWDIO_PIN);
gpio_set(SWCLK_PORT, SWCLK_PIN);
res |= (bit) ? index : 0;
index <<= 1;
gpio_clear(SWCLK_PORT, SWCLK_PIN);
}
}
int parity = __builtin_popcount(res);
bit = gpio_get(SWDIO_PORT, SWDIO_PIN);
gpio_set(SWCLK_PORT, SWCLK_PIN); gpio_set(SWCLK_PORT, SWCLK_PIN);
for(cnt = swd_delay_cnt; --cnt > 0;); for (volatile int32_t cnt = swd_delay_cnt - 2; cnt > 0; cnt--)
parity += (bit) ? 1 : 0; continue;
parity += bit ? 1 : 0;
gpio_clear(SWCLK_PORT, SWCLK_PIN); gpio_clear(SWCLK_PORT, SWCLK_PIN);
for(cnt = swd_delay_cnt; --cnt > 0;); for (volatile int32_t cnt = swd_delay_cnt - 2; cnt > 0; cnt--)
#ifdef DEBUG_SWD_BITS continue;
for (int i = 0; i < len; i++) *ret = result;
DEBUG("%d", (res & (1 << i)) ? 1 : 0);
#endif
*ret = res;
/* Terminate the read cycle now */ /* Terminate the read cycle now */
swdptap_turnaround(SWDIO_STATUS_DRIVE); swdptap_turnaround(SWDIO_STATUS_DRIVE);
return (parity & 1); return parity & 1;
} }
static void swdptap_seq_out(uint32_t tms_states, size_t ticks) static void swdptap_seq_out(uint32_t tms_states, size_t ticks)