From 86c0f4cafc6fca5fae2b284cbbd3f44a288480c0 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Thu, 5 Mar 2009 06:55:35 +0000
Subject: Nicolas Pitre <nico@cam.org> fix "halt 0" to only halt and not to
 poll/wait afterwards. This follows the intention in the docs.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1398 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/target/target.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/target')

diff --git a/src/target/target.c b/src/target/target.c
index 6a72c5b6..d2fb1c8a 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1759,6 +1759,16 @@ int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 		return retval;
 	}
 
+	if (argc == 1)
+	{
+		int wait;
+		char *end;
+
+		wait = strtoul(args[0], &end, 0);
+		if (!*end && !wait)
+			return ERROR_OK;
+	}
+
 	return handle_wait_halt_command(cmd_ctx, cmd, args, argc);
 }
 
-- 
cgit v1.2.3