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:
parent
70babcc00b
commit
291d1511aa
|
@ -1519,9 +1519,9 @@ int adapter_init(struct command_context *cmd_ctx)
|
|||
return ERROR_OK;
|
||||
|
||||
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, "
|
||||
"see \"interface\" command");
|
||||
"see \"adapter driver\" command");
|
||||
return ERROR_JTAG_INVALID_INTERFACE;
|
||||
}
|
||||
|
||||
|
@ -1538,7 +1538,7 @@ int adapter_init(struct command_context *cmd_ctx)
|
|||
|
||||
if (CLOCK_MODE_UNSELECTED == clock_mode) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
|
@ -1628,10 +1628,10 @@ static int cmsis_dap_execute_queue(void)
|
|||
static int cmsis_dap_speed(int speed)
|
||||
{
|
||||
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) {
|
||||
LOG_ERROR("RTCK not supported. Set nonzero adapter_khz.");
|
||||
LOG_ERROR("RTCK not supported. Set nonzero \"adapter speed\".");
|
||||
return ERROR_JTAG_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
|
|
|
@ -990,7 +990,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
|
|||
/* TODO: set jtag speed to */
|
||||
if (svf_para.frequency > 0) {
|
||||
command_run_linef(cmd_ctx,
|
||||
"adapter_khz %d",
|
||||
"adapter speed %d",
|
||||
(int)svf_para.frequency / 1000);
|
||||
LOG_DEBUG("\tfrequency = %f", svf_para.frequency);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue