From 7e94e2e8b18a382455a9e5965f813d781dc0218a Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Wed, 20 Aug 2008 07:27:24 +0000
Subject: [PATCH] Daniel Gimpelevich fix reset halt on feroceon

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

diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index 38444ab72..e4874620a 100644
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -60,6 +60,19 @@ int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buf
 int feroceon_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int feroceon_quit(void);
 
+int feroceon_assert_reset(target_t *target)
+{
+	armv4_5_common_t *armv4_5 = target->arch_info;
+	arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+	int ud = arm7_9->use_dbgrq;
+
+	arm7_9->use_dbgrq = 0;
+	if (target->reset_halt)
+		arm7_9_halt(target);
+	arm7_9->use_dbgrq = ud;
+	return arm7_9_assert_reset(target);
+}
+
 target_type_t feroceon_target =
 {
 	.name = "feroceon",
@@ -73,7 +86,7 @@ target_type_t feroceon_target =
 	.resume = arm7_9_resume,
 	.step = arm7_9_step,
 
-	.assert_reset = arm7_9_assert_reset,
+	.assert_reset = feroceon_assert_reset,
 	.deassert_reset = arm7_9_deassert_reset,
 	.soft_reset_halt = arm926ejs_soft_reset_halt,
 	
-- 
GitLab