From e3a0647558e4377e633a20d12c386286a927049a Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Mon, 28 Sep 2009 12:22:20 +0000
Subject: if srst pulls trst, then set state to TAP_RESET.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2767 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/jtag/ft2232.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index bebf707a..87f02d60 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -1,13 +1,16 @@
/***************************************************************************
+* Copyright (C) 2009 by Øyvind Harboe *
+* Øyvind Harboe <oyvind.harboe@zylin.com> *
+* *
+* Copyright (C) 2009 by SoftPLC Corporation. http://softplc.com *
+* Dick Hollenbeck <dick@softplc.com> *
+* *
* Copyright (C) 2004, 2006 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
* Copyright (C) 2008 by Spencer Oliver *
* spen@spen-soft.co.uk *
* *
-* Copyright (C) 2009 by SoftPLC Corporation. http://softplc.com *
-* Dick Hollenbeck <dick@softplc.com> *
-* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
@@ -1709,6 +1712,11 @@ static int ft2232_execute_reset(jtag_command_t *cmd)
first_unsent = cmd;
}
+ if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST)))
+ {
+ tap_set_state(TAP_RESET);
+ }
+
layout->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
require_send = 1;
--
cgit v1.2.3