Improve handle_md_command argument handling:

[openocd.git] / src / target / arm_jtag.c

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index ad57cef940198a5e9fd8c28cf8ff4037054ec4c2..46539c19c9d1e25949a4f96695119085e8153776 100644 (file)
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -26,11 +26,6 @@
 
 #include "arm_jtag.h"
 
-#include "binarybuffer.h"
-#include "log.h"
-#include "jtag.h"
-
-#include <stdlib.h>
 
 #if 0
 #define _ARM_JTAG_SCAN_N_CHECK_
@@ -58,13 +53,13 @@ int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  void *no_verify_ca
 
                if (no_verify_capture==NULL)
                {
-                       jtag_add_ir_scan(1, &field, TAP_INVALID);
+                       jtag_add_ir_scan(1, &field, jtag_get_end_state());
                } else
                {
                        /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
                         * have special verification code.
                         */
-                       jtag_add_ir_scan_noverify(1, &field, TAP_INVALID);
+                       jtag_add_ir_scan_noverify(1, &field, jtag_get_end_state());
                }
        }
 
@@ -91,7 +86,7 @@ int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
                                1,
                                num_bits,
                                values,
-                               TAP_INVALID);
+                               jtag_get_end_state());
 
                jtag_info->cur_scan_chain = new_scan_chain;
        }