armv7m: improve error handling

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

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 5ed104cf11d0273a09b9c98d981e617a6b567078..3a552eebad110cfbff1f21a7809c186589b439b6 100644 (file)
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -31,7 +31,7 @@
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  void *no_verify_capture)
+int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  void *no_verify_capture, tap_state_t end_state)
 {
        struct jtag_tap *tap;
        tap = jtag_info->tap;
@@ -40,24 +40,24 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  vo
 
        field.num_bits = tap->ir_length;
        field.out_value = t;
-       buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
+       buf_set_u32(t, 0, field.num_bits, new_instr);
        field.in_value = NULL;
 
        if (no_verify_capture == NULL)
        {
-               jtag_add_ir_scan(tap, &field, jtag_get_end_state());
+               jtag_add_ir_scan(tap, &field, 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(tap, &field, jtag_get_end_state());
+               jtag_add_ir_scan_noverify(tap, &field, end_state);
        }
 
        return ERROR_OK;
 }
 
-int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain)
+int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
 {
        int retval = ERROR_OK;
        uint32_t values[1];
@@ -66,7 +66,7 @@ int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain)
        values[0]=new_scan_chain;
        num_bits[0]=jtag_info->scann_size;
 
-       if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL)) != ERROR_OK)
+       if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state)) != ERROR_OK)
        {
                return retval;
        }
@@ -75,14 +75,14 @@ int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain)
                        1,
                        num_bits,
                        values,
-                       jtag_get_end_state());
+                       end_state);
 
        jtag_info->cur_scan_chain = new_scan_chain;
 
        return retval;
 }
 
-int arm_jtag_reset_callback(enum jtag_event event, void *priv)
+static int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
        struct arm_jtag *jtag_info = priv;