[Openocd-svn] r2767 - trunk/src/jtag

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-09-28 14:22:20 +0200 (Mon, 28 Sep 2009)
New Revision: 2767

Modified:
   trunk/src/jtag/ft2232.c
Log:
if srst pulls trst, then set state to TAP_RESET. 

Modified: trunk/src/jtag/ft2232.c
===================================================================
--- trunk/src/jtag/ft2232.c	2009-09-28 12:13:49 UTC (rev 2766)
+++ trunk/src/jtag/ft2232.c	2009-09-28 12:22:20 UTC (rev 2767)
@@ -1,13 +1,16 @@
 /***************************************************************************
+*   Copyright (C) 2009 by Øyvind Harboe                                   *
+*	Øyvind Harboe <oyv...@zy...>                               *
+*                                                                         *
+*   Copyright (C) 2009 by SoftPLC Corporation.  http://softplc.com        *
+*	Dick Hollenbeck <di...@so...>                                    *
+*                                                                         *
 *   Copyright (C) 2004, 2006 by Dominic Rath                              *
 *   Dom...@gm...                                                   *
 *                                                                         *
 *   Copyright (C) 2008 by Spencer Oliver                                  *
 *   sp...@sp...                                                  *
 *                                                                         *
-*   Copyright (C) 2009 by SoftPLC Corporation.  http://softplc.com        *
-*	Dick Hollenbeck <di...@so...>                                    *
-*                                                                         *
 *   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 @@
 		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;