Cortex-A/R: Fix Mask-ISR parsing

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

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 1739a8a9c4e695cb3719e9f984b22dadad7e6217..d2b9feeed2c2b716a0062b736ed94163e7a95ec9 100644 (file)
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -31,11 +31,9 @@
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info,
+int arm_jtag_set_instr_inner(struct jtag_tap *tap,
                uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
-       struct jtag_tap *tap;
-       tap = jtag_info->tap;
        struct scan_field field;
        uint8_t t[4];
 
@@ -59,20 +57,18 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info,
 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];
-       int num_bits[1];
 
-       values[0] = new_scan_chain;
-       num_bits[0] = jtag_info->scann_size;
+       uint8_t out_value[4];
+       buf_set_u32(out_value, 0, jtag_info->scann_size, new_scan_chain);
+       struct scan_field field = { .num_bits = jtag_info->scann_size, .out_value = out_value, };
 
-       retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state);
+       retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->scann_instr, NULL, end_state);
        if (retval != ERROR_OK)
                return retval;
 
-       jtag_add_dr_out(jtag_info->tap,
+       jtag_add_dr_scan(jtag_info->tap,
                        1,
-                       num_bits,
-                       values,
+                       &field,
                        end_state);
 
        jtag_info->cur_scan_chain = new_scan_chain;