From 963214c83dc6273e8868e146dbe96c9dddff17dc Mon Sep 17 00:00:00 2001 From: Mathias K Date: Sun, 10 Nov 2013 09:13:53 +0100 Subject: [PATCH] stlink: remove stlink_api command Remove stlink_api command. Change-Id: I8f7885d3756fec462f9ebbee2ed285a98a51366c Signed-off-by: Mathias K Reviewed-on: http://openocd.zylin.com/1760 Tested-by: jenkins Reviewed-by: Spencer Oliver --- doc/openocd.texi | 4 ---- src/jtag/drivers/stlink_usb.c | 7 +------ src/jtag/hla/hla_interface.c | 22 ---------------------- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/doc/openocd.texi b/doc/openocd.texi index 5f2b89ed8e..7558eb8b30 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -3041,10 +3041,6 @@ Specifies the adapter layout to use. The vendor ID and product ID of the device. @end deffn -@deffn {Config Command} {stlink_api} api_level -Manually sets the stlink api used, valid options are 1 or 2. (@b{STLINK Only}). -@end deffn - @deffn {Config Command} {trace} source_clock_hz [output_file_path] Enable SWO tracing (if supported). The source clock rate for the trace port must be specified, this is typically the CPU clock rate. If diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c index 957f1d40fd..597df6d00e 100644 --- a/src/jtag/drivers/stlink_usb.c +++ b/src/jtag/drivers/stlink_usb.c @@ -1652,12 +1652,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd) api = h->version.jtag_api_max; - /* check that user has not requested certain api version - * and if they have check it is supported */ - if ((param->api != 0) && (param->api <= h->version.jtag_api_max)) { - api = param->api; - LOG_INFO("using stlink api v%d", api); - } + LOG_INFO("using stlink api v%d", api); /* set the used jtag api, this will default to the newest supported version */ h->jtag_api = api; diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index 81cac4886d..1b6a3e31dc 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -214,21 +214,6 @@ COMMAND_HANDLER(hl_interface_handle_vid_pid_command) return ERROR_OK; } -COMMAND_HANDLER(stlink_interface_handle_api_command) -{ - if (CMD_ARGC != 1) - return ERROR_COMMAND_SYNTAX_ERROR; - - unsigned new_api; - COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], new_api); - if ((new_api == 0) || (new_api > 2)) - return ERROR_COMMAND_SYNTAX_ERROR; - - hl_if.param.api = new_api; - - return ERROR_OK; -} - COMMAND_HANDLER(interface_handle_trace_command) { FILE *f = NULL; @@ -284,13 +269,6 @@ static const struct command_registration hl_interface_command_handlers[] = { .usage = "(vid pid)* ", }, { - .name = "stlink_api", - .handler = &stlink_interface_handle_api_command, - .mode = COMMAND_CONFIG, - .help = "set the desired stlink api level", - .usage = "api version 1 or 2", - }, - { .name = "trace", .handler = &interface_handle_trace_command, .mode = COMMAND_CONFIG, -- 2.30.2