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
@@ -301,7 +301,7 @@ COMMAND_HANDLER(tms470_handle_flash_keyset_command)
|
||||
int start = (0 == strncmp(CMD_ARGV[i], "0x", 2)) ? 2 : 0;
|
||||
|
||||
if (1 != sscanf(&CMD_ARGV[i][start], "%" SCNx32 "", &flashKeys[i])) {
|
||||
command_print(CMD_CTX, "could not process flash key %s",
|
||||
command_print(CMD, "could not process flash key %s",
|
||||
CMD_ARGV[i]);
|
||||
LOG_ERROR("could not process flash key %s", CMD_ARGV[i]);
|
||||
return ERROR_COMMAND_SYNTAX_ERROR;
|
||||
@@ -310,19 +310,19 @@ COMMAND_HANDLER(tms470_handle_flash_keyset_command)
|
||||
|
||||
keysSet = 1;
|
||||
} else if (CMD_ARGC != 0) {
|
||||
command_print(CMD_CTX, "tms470 flash_keyset <key0> <key1> <key2> <key3>");
|
||||
command_print(CMD, "tms470 flash_keyset <key0> <key1> <key2> <key3>");
|
||||
return ERROR_COMMAND_SYNTAX_ERROR;
|
||||
}
|
||||
|
||||
if (keysSet) {
|
||||
command_print(CMD_CTX,
|
||||
command_print(CMD,
|
||||
"using flash keys 0x%08" PRIx32 ", 0x%08" PRIx32 ", 0x%08" PRIx32 ", 0x%08" PRIx32 "",
|
||||
flashKeys[0],
|
||||
flashKeys[1],
|
||||
flashKeys[2],
|
||||
flashKeys[3]);
|
||||
} else
|
||||
command_print(CMD_CTX, "flash keys not set");
|
||||
command_print(CMD, "flash keys not set");
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
@@ -352,12 +352,12 @@ COMMAND_HANDLER(tms470_handle_osc_megahertz_command)
|
||||
|
||||
if (oscMHz <= 0) {
|
||||
LOG_ERROR("osc_megahertz must be positive and non-zero!");
|
||||
command_print(CMD_CTX, "osc_megahertz must be positive and non-zero!");
|
||||
command_print(CMD, "osc_megahertz must be positive and non-zero!");
|
||||
oscMHz = 12;
|
||||
return ERROR_COMMAND_SYNTAX_ERROR;
|
||||
}
|
||||
|
||||
command_print(CMD_CTX, "osc_megahertz=%d", oscMHz);
|
||||
command_print(CMD, "osc_megahertz=%d", oscMHz);
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
@@ -375,7 +375,7 @@ COMMAND_HANDLER(tms470_handle_plldis_command)
|
||||
plldis = plldis ? 1 : 0;
|
||||
}
|
||||
|
||||
command_print(CMD_CTX, "plldis=%d", plldis);
|
||||
command_print(CMD, "plldis=%d", plldis);
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user