From 20f505f695df9d9ba4c20780848336afec240a31 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 5 Aug 2008 10:50:10 +0000
Subject: [PATCH] halting srst_pulls_trst targets is now snappier and has
 explicit warning.

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

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 547bf3c49..73ee84906 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -835,9 +835,21 @@ int arm7_9_deassert_reset(target_t *target)
 
 	if ((jtag_reset_config & RESET_SRST_PULLS_TRST)!=0)
 	{
+		LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset.");
 		/* set up embedded ice registers again */
 		if ((retval=target->type->examine(target))!=ERROR_OK)
 			return retval;
+
+		if ((retval=target_poll(target))!=ERROR_OK)
+		{
+			return retval;
+		}
+		
+		if ((retval=target_halt(target))!=ERROR_OK)
+		{
+			return retval;
+		}
+		
 	}
 	return retval;
 }
-- 
2.30.2