summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/jtag/ft2232.c14
1 files changed, 11 insertions, 3 deletions
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;