imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openocd: fix minor inconsistencies after renaming "adapter" command 

Replace in the code any reference to the deprecated commands.

Change-Id: I75d28064017d664990b4024967900f32e196230a
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5282
Tested-by: jenkins
Reviewed-by: Marc Schink <dev@zapb.de>
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
This commit is contained in:
Antonio Borneo 2019-08-23 15:12:57 +02:00 committed by Oleksij Rempel
parent 70babcc00b
commit 291d1511aa
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jtag/core.c
View File

@ -1519,9 +1519,9 @@ int adapter_init(struct command_context *cmd_ctx)
return ERROR_OK; return ERROR_OK;
if (!adapter_driver) { if (!adapter_driver) {
/* nothing was previously specified by "interface" command */ /* nothing was previously specified by "adapter driver" command */
LOG_ERROR("Debug Adapter has to be specified, " LOG_ERROR("Debug Adapter has to be specified, "
"see \"interface\" command"); "see \"adapter driver\" command");
return ERROR_JTAG_INVALID_INTERFACE; return ERROR_JTAG_INVALID_INTERFACE;
} }
@ -1538,7 +1538,7 @@ int adapter_init(struct command_context *cmd_ctx)
if (CLOCK_MODE_UNSELECTED == clock_mode) { if (CLOCK_MODE_UNSELECTED == clock_mode) {
LOG_ERROR("An adapter speed is not selected in the init script." LOG_ERROR("An adapter speed is not selected in the init script."
" Insert a call to adapter_khz or jtag_rclk to proceed."); " Insert a call to \"adapter speed\" or \"jtag_rclk\" to proceed.");
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }

4
src/jtag/drivers/cmsis_dap_usb.c
View File

@ -1628,10 +1628,10 @@ static int cmsis_dap_execute_queue(void)
static int cmsis_dap_speed(int speed) static int cmsis_dap_speed(int speed)
{ {
if (speed > DAP_MAX_CLOCK) if (speed > DAP_MAX_CLOCK)
LOG_INFO("High speed (adapter_khz %d) may be limited by adapter firmware.", speed); LOG_INFO("High speed (adapter speed %d) may be limited by adapter firmware.", speed);
if (speed == 0) { if (speed == 0) {
LOG_ERROR("RTCK not supported. Set nonzero adapter_khz."); LOG_ERROR("RTCK not supported. Set nonzero \"adapter speed\".");
return ERROR_JTAG_NOT_IMPLEMENTED; return ERROR_JTAG_NOT_IMPLEMENTED;
} }

2
src/svf/svf.c
View File

@ -990,7 +990,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
/* TODO: set jtag speed to */ /* TODO: set jtag speed to */
if (svf_para.frequency > 0) { if (svf_para.frequency > 0) {
command_run_linef(cmd_ctx, command_run_linef(cmd_ctx,
"adapter_khz %d", "adapter speed %d",
(int)svf_para.frequency / 1000); (int)svf_para.frequency / 1000);
LOG_DEBUG("\tfrequency = %f", svf_para.frequency); LOG_DEBUG("\tfrequency = %f", svf_para.frequency);
} }