summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-24 21:13:29 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-24 21:13:29 +0000
commitad8f1b42956bdf463ce85ed741e1f62ba91ae62f (patch)
tree37a88aedbeb7ce6f63f3f08280f664a9c661cc85 /src
parent5ecae346cc675cf269d5e3371a7d05181d570cdb (diff)
downloadopenocd+libswd-ad8f1b42956bdf463ce85ed741e1f62ba91ae62f.tar.gz
openocd+libswd-ad8f1b42956bdf463ce85ed741e1f62ba91ae62f.tar.bz2
openocd+libswd-ad8f1b42956bdf463ce85ed741e1f62ba91ae62f.tar.xz
openocd+libswd-ad8f1b42956bdf463ce85ed741e1f62ba91ae62f.zip
David Brownell <david-b@pacbell.net>:
Doc (mostly) update for jtag_khz: - switch to @deffn syntax - add entry for "jtag_rclk" - move deprecated "jtag_speed" into collection of deprecated calls And for ft2232, don't be the only adapter to *log* an error if RTCK is requested; it's already reported properly, like any other nonfatal command parameter. "jtag_rclk" just works as expected, without any scarey messages. git-svn-id: svn://svn.berlios.de/openocd/trunk@1910 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/jtag/ft2232.c2
-rw-r--r--src/jtag/jtag.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 43c6f169..4239c2d0 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -446,7 +446,7 @@ static int ft2232_khz(int khz, int* jtag_speed)
{
if (khz==0)
{
- LOG_ERROR("RCLK not supported");
+ LOG_DEBUG("RTCK not supported");
return ERROR_FAIL;
}
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index fce0eb8a..56a8075b 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -2315,9 +2315,10 @@ int jtag_register_commands(struct command_context_s *cmd_ctx)
register_command(cmd_ctx, NULL, "interface", handle_interface_command,
COMMAND_CONFIG, "try to configure interface");
register_command(cmd_ctx, NULL, "jtag_speed", handle_jtag_speed_command,
- COMMAND_ANY, "set jtag speed (if supported)");
+ COMMAND_ANY, "(DEPRECATED) set jtag speed (if supported)");
register_command(cmd_ctx, NULL, "jtag_khz", handle_jtag_khz_command,
- COMMAND_ANY, "same as jtag_speed, except it takes maximum khz as arguments. 0 KHz = RTCK.");
+ COMMAND_ANY, "set maximum jtag speed (if supported); "
+ "parameter is maximum khz, or 0 for adaptive clocking (RTCK).");
register_command(cmd_ctx, NULL, "jtag_device", handle_jtag_device_command,
COMMAND_CONFIG, "jtag_device <ir_length> <ir_expected> <ir_mask>");
register_command(cmd_ctx, NULL, "reset_config", handle_reset_config_command,