From: ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Thu, 6 Aug 2009 23:34:34 +0000 (+0000)
Subject: Gary Carlson [gcarlson@carlson-minot.com]:
X-Git-Tag: v0.3.0-rc0~377
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d40fd9e0f42c32d180a580962d76d55e73be8232;p=openocd

Gary Carlson [gcarlson@carlson-minot.com]:
- revert patch from rev1507 as it was causing reset issues with arm9 cores

git-svn-id: svn://svn.berlios.de/openocd/trunk@2574 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index d8bfb0f3..1ec73b2d 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -499,12 +499,10 @@ static void jlink_reset(int trst, int srst)
 	{
 		jlink_simple_command(EMU_CMD_HW_TRST0);
 	}
+
 	if (trst == 0)
 	{
 		jlink_simple_command(EMU_CMD_HW_TRST1);
-		jtag_sleep(5000);
-		jlink_end_state(TAP_RESET);
-		jlink_state_move();
 	}
 }