X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fgw16012.c;h=441234c19b24c9785fc49b0cba605139e895b74f;hb=67caf323f74937e11c0f5f95c2ee57d2786ac02b;hp=8d59e25dd45e41cd183cb098cca55c02cb9b53c5;hpb=a88871bc6ad13561d9e60fbd9152b8f0c05329b1;p=openocd.git

diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 8d59e25dd4..441234c19b 100644
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -22,7 +22,7 @@
 #endif
 
 #define INCLUDE_JTAG_INTERFACE_H
-#include "jtag.h"
+#include "interface.h"
 
 
 #if 1
@@ -369,16 +369,14 @@ static int gw16012_execute_queue(void)
 #ifdef _DEBUG_JTAG_IO_
 				LOG_DEBUG("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, cmd->cmd.runtest->end_state);
 #endif
-				if (cmd->cmd.runtest->end_state != TAP_INVALID)
-					gw16012_end_state(cmd->cmd.runtest->end_state);
+				gw16012_end_state(cmd->cmd.runtest->end_state);
 				gw16012_runtest(cmd->cmd.runtest->num_cycles);
 				break;
 			case JTAG_STATEMOVE:
 #ifdef _DEBUG_JTAG_IO_
 				LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
 #endif
-				if (cmd->cmd.statemove->end_state != TAP_INVALID)
-					gw16012_end_state(cmd->cmd.statemove->end_state);
+				gw16012_end_state(cmd->cmd.statemove->end_state);
 				gw16012_state_move();
 				break;
 			case JTAG_PATHMOVE:
@@ -388,8 +386,7 @@ static int gw16012_execute_queue(void)
 				gw16012_path_move(cmd->cmd.pathmove);
 				break;
 			case JTAG_SCAN:
-				if (cmd->cmd.scan->end_state != TAP_INVALID)
-					gw16012_end_state(cmd->cmd.scan->end_state);
+				gw16012_end_state(cmd->cmd.scan->end_state);
 				scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
 				type = jtag_scan_type(cmd->cmd.scan);
 #ifdef _DEBUG_JTAG_IO_