X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.h;h=f3e0bc2a3daa9a029cfd200ae376583d68312d30;hb=7819834ace37ca7f5d1b834c761dfcb9964ef845;hp=dd9145124401c4178ba3b16f68ac3d18dc92f4a9;hpb=d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69;p=openocd.git

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index dd91451244..f3e0bc2a3d 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -19,10 +19,11 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef ARM_JTAG
-#define ARM_JTAG
+#ifndef OPENOCD_TARGET_ARM_JTAG_H
+#define OPENOCD_TARGET_ARM_JTAG_H
 
 #include <jtag/jtag.h>
+#include <helper/bits.h>
 
 struct arm_jtag {
 	struct jtag_tap *tap;
@@ -42,7 +43,7 @@ static inline int arm_jtag_set_instr(struct jtag_tap *tap,
 		uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
 	/* inline most common code path */
-	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
+	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != (new_instr & (BIT(tap->ir_length) - 1)))
 		return arm_jtag_set_instr_inner(tap, new_instr, no_verify_capture, end_state);
 
 	return ERROR_OK;
@@ -61,6 +62,7 @@ static inline int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_c
 }
 
 int arm_jtag_setup_connection(struct arm_jtag *jtag_info);
+int arm_jtag_close_connection(struct arm_jtag *jtag_info);
 
 /* use this as a static so we can inline it in -O3 and refer to it via a pointer  */
 static inline void arm7flip32(jtag_callback_data_t arg)
@@ -75,4 +77,4 @@ static inline void arm_le_to_h_u32(jtag_callback_data_t arg)
 	*((uint32_t *)arg) = le_to_h_u32(in);
 }
 
-#endif /* ARM_JTAG */
+#endif /* OPENOCD_TARGET_ARM_JTAG_H */