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

stlink: remove stlink_api command

Browse Source 
Remove stlink_api command.

Change-Id: I8f7885d3756fec462f9ebbee2ed285a98a51366c
Signed-off-by: Mathias K <kesmtp@freenet.de>
Reviewed-on: http://openocd.zylin.com/1760
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Mathias K 2013-11-10 09:13:53 +01:00 committed by Spencer Oliver
parent 1ab86419d7
commit 963214c83d
3 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/openocd.texi
View File

@ -3041,10 +3041,6 @@ Specifies the adapter layout to use.
The vendor ID and product ID of the device. The vendor ID and product ID of the device.
@end deffn @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] @deffn {Config Command} {trace} source_clock_hz [output_file_path]
Enable SWO tracing (if supported). The source clock rate for the Enable SWO tracing (if supported). The source clock rate for the
trace port must be specified, this is typically the CPU clock rate. If trace port must be specified, this is typically the CPU clock rate. If

7
src/jtag/drivers/stlink_usb.c
View File

@ -1652,12 +1652,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
api = h->version.jtag_api_max; api = h->version.jtag_api_max;
/* check that user has not requested certain api version LOG_INFO("using stlink api v%d", api);
* 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);
}
/* set the used jtag api, this will default to the newest supported version */ /* set the used jtag api, this will default to the newest supported version */
h->jtag_api = api; h->jtag_api = api;

22
src/jtag/hla/hla_interface.c
View File

@ -214,21 +214,6 @@ COMMAND_HANDLER(hl_interface_handle_vid_pid_command)
return ERROR_OK; 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) COMMAND_HANDLER(interface_handle_trace_command)
{ {
FILE *f = NULL; FILE *f = NULL;
@ -284,13 +269,6 @@ static const struct command_registration hl_interface_command_handlers[] = {
.usage = "(vid pid)* ", .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", .name = "trace",
.handler = &interface_handle_trace_command, .handler = &interface_handle_trace_command,
.mode = COMMAND_CONFIG, .mode = COMMAND_CONFIG,