David Brownell <david-b@pacbell.net>:

[openocd.git] / src / jtag / bitq.c

diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index 40b704b9ed04f8d5b396af094f09a81395eed4da..83e14e6687190eab62d78d48112384e30a7afc1f 100644 (file)
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #endif
 
-#define INCLUDE_JTAG_INTERFACE_H
 #include "bitq.h"
+#include "interface.h"
 
 
 bitq_interface_t* bitq_interface;       /* low level bit queue interface */
@@ -138,9 +138,6 @@ void bitq_io(int tms, int tdi, int tdo_req)
 
 void bitq_end_state(tap_state_t state)
 {
-       if (state==TAP_INVALID)
-               return;
-
        if (!tap_is_state_stable(state))
        {
                LOG_ERROR("BUG: %i is not a valid end state", state);
@@ -301,7 +298,7 @@ int bitq_execute_queue(void)
 #ifdef _DEBUG_JTAG_IO_
                        LOG_DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst);
 #endif
-                       if ( (cmd->cmd.reset->trst == 1) || ( cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST) ) )
+                       if ( (cmd->cmd.reset->trst == 1) || ( cmd->cmd.reset->srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST) ) )
                        {
                                tap_set_state(TAP_RESET);
                        }