Michael Fischer found this bogus warning. Fixed.

Error:   jtag.c:941 jtag_add_reset(): BUG: transition of req_tlr_or_trst ...

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

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index e78d99d93b797e697e1c7d87b62d6a427f6e09c9..1e0e889bff808b3a7d697f27facecec227e93f21 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -930,8 +930,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
        */
        if ((jtag_reset_config & RESET_HAS_SRST)&&
                        (jtag_reset_config & RESET_HAS_TRST)&& 
-                       ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0)&&
-                       ((jtag_reset_config & RESET_TRST_PULLS_SRST)==0))
+                       ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0))
        {
                if (((req_tlr_or_trst&&!jtag_trst)||
                                (!req_tlr_or_trst&&jtag_trst))&&
@@ -1593,8 +1592,7 @@ int jtag_init_reset(struct command_context_s *cmd_ctx)
        if (jtag_reset_config & RESET_HAS_SRST)
        {
                jtag_add_reset(1, 1);
-               if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0)
-                       jtag_add_reset(0, 1);
+               jtag_add_reset(0, 1);
        }
        jtag_add_reset(0, 0);
        if ((retval = jtag_execute_queue()) != ERROR_OK)