diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2010-03-18 12:11:58 -0700 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2010-03-18 12:11:58 -0700 |
| commit | c09035ea2cb24dee300476a3502919d23d90d1f5 (patch) | |
| tree | 1cd32a7ce1d3d0d89b098e490721a9754bae351c /src/target/arm_jtag.c | |
| parent | 52a788e008ecf0ca6156f02de08a0f062d49a236 (diff) | |
| parent | ec108ff59e23ec32abf1223488ad96dd26205a5b (diff) | |
| download | openocd+libswd-c09035ea2cb24dee300476a3502919d23d90d1f5.tar.gz openocd+libswd-c09035ea2cb24dee300476a3502919d23d90d1f5.tar.bz2 openocd+libswd-c09035ea2cb24dee300476a3502919d23d90d1f5.tar.xz openocd+libswd-c09035ea2cb24dee300476a3502919d23d90d1f5.zip | |
Merge branch 'master' of ssh://dbrownell@openocd.git.sourceforge.net/gitroot/openocd/openocd
Diffstat (limited to 'src/target/arm_jtag.c')
| -rw-r--r-- | src/target/arm_jtag.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c index 5ed104cf..f8b5f4f4 100644 --- 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; @@ -45,19 +45,19 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr, vo 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,7 +75,7 @@ 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; |