This is an automated email from Gerrit.

Paul Fertser ([email protected]) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/1504

-- gerrit

commit dfa30e8f3071a2d36bc1025c3c26e7f13cc8f0cb
Author: Paul Fertser <[email protected]>
Date:   Tue Jul 16 10:00:42 2013 +0400

    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 <[email protected]>

diff --git a/src/target/target.c b/src/target/target.c
index 60a8a77..1f517ac 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]",
        },
        {

-- 

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to