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

PIO JTAG WORKS NOW!

This commit is contained in:
Triss 2021-09-25 00:43:36 +02:00
parent f4d25dbed9
commit 2cfeee3e5c
1 changed files with 20 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
bsp/rp2040/m_default/dap_jtag.c
View File

@ -172,8 +172,12 @@ static uint8_t bitswap(uint8_t in) {
} }
void JTAG_Sequence(uint32_t info, const uint8_t* tdi, uint8_t* tdo) { void JTAG_Sequence(uint32_t info, const uint8_t* tdi, uint8_t* tdo) {
dap_jtag_program_init(PINOUT_JTAG_PIO_DEV, jtagsm, offset, float div = (float)clock_get_hz(clk_sys) / (4 * DAP_Data.clock_freq);
50*1000, PINOUT_JTAG_TCK, PINOUT_JTAG_TDI, PINOUT_JTAG_TDO); if (div < 2) div = 2;
else if (div > 65536) div = 65536;
pio_sm_set_clkdiv(PINOUT_JTAG_PIO_DEV, jtagsm, div);
/*dap_jtag_program_init(PINOUT_JTAG_PIO_DEV, jtagsm, offset,
DAP_Data.clock_freq, PINOUT_JTAG_TCK, PINOUT_JTAG_TDI, PINOUT_JTAG_TDO);*/
uint32_t n = info & JTAG_SEQUENCE_TCK; uint32_t n = info & JTAG_SEQUENCE_TCK;
if (n == 0) n = 64; if (n == 0) n = 64;
@ -185,102 +189,55 @@ void JTAG_Sequence(uint32_t info, const uint8_t* tdi, uint8_t* tdo) {
io_ro_8* rx = (io_ro_8*)&PINOUT_JTAG_PIO_DEV->rxf[jtagsm]; io_ro_8* rx = (io_ro_8*)&PINOUT_JTAG_PIO_DEV->rxf[jtagsm];
uint32_t bytelen = (n + 7) >> 3; uint32_t bytelen = (n + 7) >> 3;
uint32_t last_shift = (8 - n) & 7;//(bytelen << 3) - n; uint32_t last_shift = (8 - n) & 7;
printf("n=%lu bytelen=%lu last_shift=%lu\n", n, bytelen, last_shift); //printf("n=%lu bytelen=%lu last_shift=%lu\n", n, bytelen, last_shift);
uint32_t txremain = bytelen, uint32_t txremain = bytelen,
rxremain = last_shift ? bytelen : (bytelen /*+ 1*/); rxremain = last_shift ? bytelen : (bytelen + 1);
printf("txremain=%lu rxremain=%lu\n", txremain, rxremain); /*printf("txremain=%lu rxremain=%lu\n", txremain, rxremain);
printf("%s", "tdi: "); printf("%s", "tdi: ");
for (size_t j = 0; j < ((n + 7) >> 3); ++j) { for (size_t j = 0; j < ((n + 7) >> 3); ++j) {
printf("0x%x ", ((const uint8_t*)tdi)[j]); printf("0x%x ", ((const uint8_t*)tdi)[j]);
} }
printf("%c", '\n');*/
//printf("init : pc=%x insn=%04lx\n", pio_sm_get_pc(PINOUT_JTAG_PIO_DEV, jtagsm), pio0_hw->sm[jtagsm].instr); PINOUT_JTAG_PIO_DEV->txf[jtagsm] = (uint8_t)(n - 1);
*tx = (uint8_t)(n - 1);
//printf("txlen: pc=%x insn=%04lx\n", pio_sm_get_pc(PINOUT_JTAG_PIO_DEV, jtagsm), pio0_hw->sm[jtagsm].instr);
//return;
bool done_extrabit = false;
size_t oi = 0, ii = 0; size_t oi = 0, ii = 0;
while (txremain || rxremain) { while (txremain || rxremain) {
if (txremain && !pio_sm_is_tx_fifo_full(PINOUT_JTAG_PIO_DEV, jtagsm)) { if (txremain && !pio_sm_is_tx_fifo_full(PINOUT_JTAG_PIO_DEV, jtagsm)) {
//printf("tdi%2u: pc=%x insn=%04lx\n", ii, pio_sm_get_pc(PINOUT_JTAG_PIO_DEV, jtagsm), pio0_hw->sm[jtagsm].instr);
*tx = bitswap(tdi[ii]); *tx = bitswap(tdi[ii]);
--txremain; --txremain;
printf("tx %02x rem %lu smpc=%x\n", tdi[ii], txremain, pio_sm_get_pc(PINOUT_JTAG_PIO_DEV, jtagsm)); //printf("tx %02x rem %lu smpc=%x\n", tdi[ii], txremain, pio_sm_get_pc(PINOUT_JTAG_PIO_DEV, jtagsm));
++ii; ++ii;
} }
if (rxremain && !pio_sm_is_rx_fifo_empty(PINOUT_JTAG_PIO_DEV, jtagsm)) { if (rxremain && !pio_sm_is_rx_fifo_empty(PINOUT_JTAG_PIO_DEV, jtagsm)) {
//printf("tdo%2u: pc=%x insn=%04lx\n", oi, pio_sm_get_pc(PINOUT_JTAG_PIO_DEV, jtagsm), pio0_hw->sm[jtagsm].instr);
uint8_t ov = *rx; uint8_t ov = *rx;
--rxremain; --rxremain;
printf("rx %02x rem %lu smpc=%x\n", ov, rxremain, pio_sm_get_pc(PINOUT_JTAG_PIO_DEV, jtagsm)); //printf("rx %02x rem %lu smpc=%x\n", ov, rxremain, pio_sm_get_pc(PINOUT_JTAG_PIO_DEV, jtagsm));
if ((info & JTAG_SEQUENCE_TDO) /*&& !(!last_shift && rxremain == 1)*/) { if ((info & JTAG_SEQUENCE_TDO)) {
if (last_shift && oi == bytelen - 1) { if (last_shift && oi == bytelen - 1) {
tdo[oi] = bitswap(ov << last_shift); //printf("orig=%02x swap=%02x shamt=%lu result=%02x\n", ov, bitswap(ov), last_shift, bitswap(ov)>>last_shift);
tdo[oi] = bitswap(ov) >> last_shift;
} else { } else {
tdo[oi] = bitswap(ov); tdo[oi] = bitswap(ov);
} }
++oi; ++oi;
} }
} }
/*if (rxremain == 1 && txremain == 0 && last_shift == 0) {
printf("smpc=%x smin=%04lx\n",
pio_sm_get_pc(PINOUT_JTAG_PIO_DEV, jtagsm), pio0_hw->sm[jtagsm].instr);
if (!pio_sm_is_tx_fifo_full(PINOUT_JTAG_PIO_DEV, jtagsm) && !done_extrabit) {
done_extrabit = true;
uint8_t last_byte = tdi[ii-1];
uint8_t last_bit = last_byte & 0x80;
printf("extrabit %x!\n", last_bit);
*tx = last_bit ? 0xff : 0x00;
}
}*/
} }
/*if (last_shift) { /*if (info & JTAG_SEQUENCE_TDO) {
uint8_t* last = &tdo[bytelen-1]; printf("%s", "tdo: ");
*last = bitswap(*last);
*last <<= last_shift;
*last = bitswap(*last);
}*/
if (info & JTAG_SEQUENCE_TDO) {
printf("%s", "\ntdo: ");
for (size_t j = 0; j < ((n + 7) >> 3); ++j) { for (size_t j = 0; j < ((n + 7) >> 3); ++j) {
printf("0x%x ", ((const uint8_t*)tdo)[j]); printf("0x%x ", ((const uint8_t*)tdo)[j]);
} }
printf("%c", '\n'); printf("%c", '\n');
} else printf("%s", "\nno tdo\n"); } else printf("%s", "no tdo\n");*/
/*uint32_t n = info & JTAG_SEQUENCE_TCK;
if (n == 0) n = 64;
bool tms = info & JTAG_SEQUENCE_TMS;
// SET TMS TO ^
for (size_t i = 0; n != 0; --n, ++i) {
uint8_t iv = tdi[i];
uint8_t ov = 0;
for (size_t k = 0; k < 8; ++k) {
tdi = (iv >> k) & 1;
// SET TDI; TCK LOW
// DELAY
// GET TDO; TCK HI
ov |= tdo << k;
}
if (info & JTAG_SEQUENCE_TDO) tdo[i] = ov;
}*/
} }
#endif #endif
// TODO: the following ones can all be implemented in terms of JTAG_Sequence
static void jtag_seq(uint32_t num, int tms, const void* tdi, void* tdo) { static void jtag_seq(uint32_t num, int tms, const void* tdi, void* tdo) {
static uint64_t last_bit = ~(uint64_t)0; static uint64_t last_bit = ~(uint64_t)0;
uint64_t devnull = 0; uint64_t devnull = 0;