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

command: Fixed the regression in the RTT command's formatting output caused by a bad refactor

This commit is contained in:
dragonmux 2022-08-24 21:47:14 +01:00 committed by Piotr Esden-Tempski
parent 48bda951fc
commit 0c708ffa48
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/command.c
View File

@ -514,7 +514,7 @@ static bool cmd_rtt(target *t, int argc, const char **argv)
gdb_out("auto "); gdb_out("auto ");
for (size_t i = 0; i < MAX_RTT_CHAN; i++) { for (size_t i = 0; i < MAX_RTT_CHAN; i++) {
if (rtt_channel[i].is_enabled) if (rtt_channel[i].is_enabled)
gdb_outf("%d ", i); gdb_outf("%" PRIu32 " ", (uint32_t)i);
} }
gdb_outf( gdb_outf(
"\nmax poll ms: %u min poll ms: %u max errs: %u\n", rtt_max_poll_ms, rtt_min_poll_ms, rtt_max_poll_errs); "\nmax poll ms: %u min poll ms: %u max errs: %u\n", rtt_max_poll_ms, rtt_min_poll_ms, rtt_max_poll_errs);
@ -542,10 +542,11 @@ static bool cmd_rtt(target *t, int argc, const char **argv)
gdb_outf("cbaddr: 0x%x\n", rtt_cbaddr); gdb_outf("cbaddr: 0x%x\n", rtt_cbaddr);
gdb_out("ch ena cfg i/o buf@ size head@ tail@ flg\n"); gdb_out("ch ena cfg i/o buf@ size head@ tail@ flg\n");
for (size_t i = 0; i < MAX_RTT_CHAN; ++i) { for (size_t i = 0; i < MAX_RTT_CHAN; ++i) {
gdb_outf("%2zu %c %c %s 0x%08x %5d 0x%08x 0x%08x %d\n", i, rtt_channel[i].is_enabled ? 'y' : 'n', gdb_outf("%2" PRIu32 " %c %c %s 0x%08" PRIx32 " %5" PRIu32 " 0x%08" PRIx32 " 0x%08" PRIx32 " %"
rtt_channel[i].is_configured ? 'y' : 'n', rtt_channel[i].is_output ? "out" : "in ", PRIu32 "\n",
rtt_channel[i].buf_addr, rtt_channel[i].buf_size, rtt_channel[i].head_addr, rtt_channel[i].tail_addr, (uint32_t)i, rtt_channel[i].is_enabled ? 'y' : 'n', rtt_channel[i].is_configured ? 'y' : 'n',
rtt_channel[i].flag); rtt_channel[i].is_output ? "out" : "in ", rtt_channel[i].buf_addr, rtt_channel[i].buf_size,
rtt_channel[i].head_addr, rtt_channel[i].tail_addr, rtt_channel[i].flag);
} }
} else if (argc == 3 && !strncmp(argv[1], "ident", command_len)) { } else if (argc == 3 && !strncmp(argv[1], "ident", command_len)) {
strncpy(rtt_ident, argv[2], sizeof(rtt_ident)); strncpy(rtt_ident, argv[2], sizeof(rtt_ident));