From d9f50cb7d6a8b60cf425d8f87ba0907bffd15233 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sun, 13 Apr 2008 10:09:27 +0000
Subject: - Set up ICE registers after TRST - Work in progress to allow
 launching GDB/telnet server *before* jtag chain enum, validate & examine

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

(limited to 'src/jtag/jtag.c')

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index fa439ec5..fe76a322 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -1518,9 +1518,6 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
 
 	LOG_DEBUG("-");
 	
-	if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
-		return retval;
-
 	device = jtag_devices;
 	jtag_ir_scan_size = 0;
 	jtag_num_devices = 0;
@@ -1559,6 +1556,10 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
 int jtag_init_reset(struct command_context_s *cmd_ctx)
 {
 	int retval;
+
+	if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
+		return retval;
+
 	LOG_DEBUG("Trying to bring the JTAG controller to life by asserting TRST / tms");
 
 	/* Reset can happen after a power cycle.
@@ -1599,6 +1600,9 @@ int jtag_init_reset(struct command_context_s *cmd_ctx)
 
 int jtag_init(struct command_context_s *cmd_ctx)
 {
+	int retval;
+	if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
+		return retval;
 	if (jtag_init_inner(cmd_ctx)==ERROR_OK)
 	{
 		return ERROR_OK;
-- 
cgit v1.2.3