X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=1f517ac068c0a17fd2bbc649b99e3e4f5f7e105c;hb=refs%2Fchanges%2F04%2F1504%2F2;hp=a5c7b30a3a24b2c151fd7b60b9526a2ad1cd99ac;hpb=80d01ca975b3e00e9aba0089a4d0a5c7d8e3f2e0;p=openocd.git

diff --git a/src/target/target.c b/src/target/target.c
index a5c7b30a3a..1f517ac068 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -56,6 +56,9 @@
 #include "image.h"
 #include "rtos/rtos.h"
 
+/* default halt wait timeout (ms) */
+#define DEFAULT_HALT_TIMEOUT 5000
+
 static int target_read_buffer_default(struct target *target, uint32_t address,
 		uint32_t size, uint8_t *buffer);
 static int target_write_buffer_default(struct target *target, uint32_t address,
@@ -456,7 +459,7 @@ int target_poll(struct target *target)
 			target->halt_issued = false;
 		else {
 			long long t = timeval_ms() - target->halt_issued_time;
-			if (t > 1000) {
+			if (t > DEFAULT_HALT_TIMEOUT) {
 				target->halt_issued = false;
 				LOG_INFO("Halt timed out, wake up GDB.");
 				target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
@@ -2409,13 +2412,11 @@ COMMAND_HANDLER(handle_wait_halt_command)
 	if (CMD_ARGC > 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	unsigned ms = 5000;
+	unsigned ms = DEFAULT_HALT_TIMEOUT;
 	if (1 == CMD_ARGC) {
 		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);
@@ -5535,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]",
 	},
 	{
@@ -5543,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]",
 	},
 	{