From: mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sat, 24 May 2008 11:33:34 +0000 (+0000)
Subject: - swap processing of reset handling. First srst and than trst.
X-Git-Tag: v0.1.0~609
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8b916771331a17231c9501d86b10e6bd37bfae2c;p=openocd

- swap processing of reset handling. First srst and than trst.

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

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 190ada46..3d2468e1 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -447,22 +447,22 @@ void jlink_reset(int trst, int srst)
 	LOG_DEBUG("trst: %i, srst: %i", trst, srst);
 	
 	/* Signals are active low */
-	if (trst == 0)
+	if (srst == 0)
 	{
-		jlink_simple_command(EMU_CMD_HW_TRST1);
+		jlink_simple_command(EMU_CMD_HW_RESET1);
 	}
-	else if (trst == 1)
+	else if (srst == 1)
 	{
-		jlink_simple_command(EMU_CMD_HW_TRST0);
+		jlink_simple_command(EMU_CMD_HW_RESET0);
 	}
 	
-	if (srst == 0)
+	if (trst == 0)
 	{
-		jlink_simple_command(EMU_CMD_HW_RESET1);
+		jlink_simple_command(EMU_CMD_HW_TRST1);
 	}
-	else if (srst == 1)
+	else if (trst == 1)
 	{
-		jlink_simple_command(EMU_CMD_HW_RESET0);
+		jlink_simple_command(EMU_CMD_HW_TRST0);
 	}
 }