diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2013-07-16 10:00:42 +0400 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-07-17 14:34:29 +0000 |
| commit | c658229f92612a7c3862b2e9ba1a8d6496a8be8a (patch) | |
| tree | 6318ba7a4d8bcc86c4322888faccb912391cfb15 | |
| parent | d1ae39efc02bb67bc637ec92b5f60254c8ac959f (diff) | |
target: fix halt and wait_halt timeout units
Documentation says they should be given values in milliseconds,
DEFAULT_HALT_TIMEOUT matches that too.
Change-Id: Ic1a30fa90f75b412c43fe50ba187d01c3d0a5fba
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/1504
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
| -rw-r--r-- | src/target/target.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/target/target.c b/src/target/target.c index 60a8a773..1f517ac0 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -2417,8 +2417,6 @@ COMMAND_HANDLER(handle_wait_halt_command) int retval = parse_uint(CMD_ARGV[0], &ms); if (ERROR_OK != retval) return ERROR_COMMAND_SYNTAX_ERROR; - /* convert seconds (given) to milliseconds (needed) */ - ms *= 1000; } struct target *target = get_current_target(CMD_CTX); @@ -5538,7 +5536,7 @@ static const struct command_registration target_exec_command_handlers[] = { .handler = handle_wait_halt_command, .mode = COMMAND_EXEC, .help = "wait up to the specified number of milliseconds " - "(default 5) for a previously requested halt", + "(default 5000) for a previously requested halt", .usage = "[milliseconds]", }, { @@ -5546,7 +5544,7 @@ static const struct command_registration target_exec_command_handlers[] = { .handler = handle_halt_command, .mode = COMMAND_EXEC, .help = "request target to halt, then wait up to the specified" - "number of milliseconds (default 5) for it to complete", + "number of milliseconds (default 5000) for it to complete", .usage = "[milliseconds]", }, { |