diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-16 14:19:44 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-16 14:19:44 -0800 |
| commit | 2c3e413d49d8f446ec5347c4356888fbbfa4ec1d (patch) | |
| tree | 86a23fabaae381c6c8c74b99359e63eed076c892 /src | |
| parent | d265c219b90bfe9454991bed6b41f790f085d230 (diff) | |
| download | openocd+libswd-2c3e413d49d8f446ec5347c4356888fbbfa4ec1d.tar.gz openocd+libswd-2c3e413d49d8f446ec5347c4356888fbbfa4ec1d.tar.bz2 openocd+libswd-2c3e413d49d8f446ec5347c4356888fbbfa4ec1d.tar.xz openocd+libswd-2c3e413d49d8f446ec5347c4356888fbbfa4ec1d.zip | |
JTAG: shrink "scan_chain" output
Tweak the "scan_chain" output by removing column separators. Also
remove the "current instruction" state ... which changes constantly.
Now its style resembles the "targets" output, and can even fit on
one line in standard terminals and in the PDF docs.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jtag/tcl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index f4815c8e..00b1038e 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -1021,11 +1021,13 @@ COMMAND_HANDLER(handle_scan_chain_command) char expected_id[12]; tap = jtag_all_taps(); - command_print(CMD_CTX, " TapName | Enabled | IdCode Expected IrLen IrCap IrMask Instr "); - command_print(CMD_CTX, "---|--------------------|---------|------------|------------|------|------|------|---------"); + command_print(CMD_CTX, +" TapName Enabled IdCode Expected IrLen IrCap IrMask"); + command_print(CMD_CTX, +"-- ------------------- -------- ---------- ---------- ----- ----- ------"); while (tap) { - uint32_t expected, expected_mask, cur_instr, ii; + uint32_t expected, expected_mask, ii; snprintf(expected_id, sizeof expected_id, "0x%08x", (unsigned)((tap->expected_ids_cnt > 0) @@ -1036,10 +1038,9 @@ COMMAND_HANDLER(handle_scan_chain_command) expected = buf_get_u32(tap->expected, 0, tap->ir_length); expected_mask = buf_get_u32(tap->expected_mask, 0, tap->ir_length); - cur_instr = buf_get_u32(tap->cur_instr, 0, tap->ir_length); command_print(CMD_CTX, - "%2d | %-18s | %c | 0x%08x | %s | 0x%02x | 0x%02x | 0x%02x | 0x%02x", + "%2d %-18s %c 0x%08x %s %5d 0x%02x 0x%02x", tap->abs_chain_position, tap->dotted_name, tap->enabled ? 'Y' : 'n', @@ -1047,8 +1048,7 @@ COMMAND_HANDLER(handle_scan_chain_command) expected_id, (unsigned int)(tap->ir_length), (unsigned int)(expected), - (unsigned int)(expected_mask), - (unsigned int)(cur_instr)); + (unsigned int)(expected_mask)); for (ii = 1; ii < tap->expected_ids_cnt; ii++) { snprintf(expected_id, sizeof expected_id, "0x%08x", @@ -1057,7 +1057,7 @@ COMMAND_HANDLER(handle_scan_chain_command) expected_id[2] = '*'; command_print(CMD_CTX, - " | | | | %s | | | | ", + " %s", expected_id); } |