helper/command: change prototype of command_print/command_print_sameline
To prepare for handling TCL return values consistently, all calls to command_print/command_print_sameline should switch to CMD as first parameter. Change prototype of command_print() and command_print_sameline() to pass CMD instead of CMD_CTX. Since the first parameter is currently not used, the change can be done though scripts without manual coding. This patch is created using the command: sed -i PATTERN $(find src/ doc/ -type f) with all the following patters: 's/\(command_print(cmd\)->ctx,/\1,/' 's/\(command_print(CMD\)_CTX,/\1,/' 's/\(command_print(struct command_\)context \*context,/\1invocation *cmd,/' 's/\(command_print_sameline(cmd\)->ctx,/\1,/' 's/\(command_print_sameline(CMD\)_CTX,/\1,/' 's/\(command_print_sameline(struct command_\)context \*context,/\1invocation *cmd,/' This change is inspired by http://openocd.zylin.com/1815 from Paul Fertser but is now done through scripting. Change-Id: I3386d8f96cdc477e7a2308dd18269de3bed04385 Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Signed-off-by: Paul Fertser <fercerpav@gmail.com> Reviewed-on: http://openocd.zylin.com/5081 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
This commit is contained in:
committed by
Tomas Vanek
parent
6916550938
commit
6cb5ba6f11
@@ -269,10 +269,10 @@ COMMAND_HANDLER(aice_handle_aice_info_command)
|
||||
{
|
||||
LOG_DEBUG("aice_handle_aice_info_command");
|
||||
|
||||
command_print(CMD_CTX, "Description: %s", param.device_desc);
|
||||
command_print(CMD_CTX, "Serial number: %s", param.serial);
|
||||
command_print(CMD, "Description: %s", param.device_desc);
|
||||
command_print(CMD, "Serial number: %s", param.serial);
|
||||
if (strncmp(aice_port->name, "aice_pipe", 9) == 0)
|
||||
command_print(CMD_CTX, "Adapter: %s", param.adapter_name);
|
||||
command_print(CMD, "Adapter: %s", param.adapter_name);
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
@@ -165,9 +165,9 @@ COMMAND_HANDLER(handle_scan_chain_command)
|
||||
|
||||
aice_scan_jtag_chain();
|
||||
tap = jtag_all_taps();
|
||||
command_print(CMD_CTX,
|
||||
command_print(CMD,
|
||||
" TapName Enabled IdCode Expected IrLen IrCap IrMask");
|
||||
command_print(CMD_CTX,
|
||||
command_print(CMD,
|
||||
"-- ------------------- -------- ---------- ---------- ----- ----- ------");
|
||||
|
||||
while (tap) {
|
||||
@@ -183,7 +183,7 @@ 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);
|
||||
|
||||
command_print(CMD_CTX,
|
||||
command_print(CMD,
|
||||
"%2d %-18s %c 0x%08x %s %5d 0x%02x 0x%02x",
|
||||
tap->abs_chain_position,
|
||||
tap->dotted_name,
|
||||
@@ -200,7 +200,7 @@ COMMAND_HANDLER(handle_scan_chain_command)
|
||||
if (tap->ignore_version)
|
||||
expected_id[2] = '*';
|
||||
|
||||
command_print(CMD_CTX,
|
||||
command_print(CMD,
|
||||
" %s",
|
||||
expected_id);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user