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/arm9tdmi.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/arm9tdmi.c')
| -rw-r--r-- | src/target/arm9tdmi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index f0911880..b4b6f04a 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -101,11 +101,11 @@ int arm9tdmi_examine_debug_reason(struct target *target) fields[2].out_value = NULL; fields[2].in_value = instructionbus; - if ((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK) + if ((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1, TAP_DRPAUSE)) != ERROR_OK) { return retval; } - arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL); + arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL, TAP_DRPAUSE); jtag_add_dr_scan(arm7_9->jtag_info.tap, 3, fields, TAP_DRPAUSE); if ((retval = jtag_execute_queue()) != ERROR_OK) @@ -155,12 +155,12 @@ int arm9tdmi_clock_out(struct arm_jtag *jtag_info, uint32_t instr, buf_set_u32(&sysspeed_buf, 2, 1, 1); jtag_set_end_state(TAP_DRPAUSE); - if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK) + if ((retval = arm_jtag_scann(jtag_info, 0x1, TAP_DRPAUSE)) != ERROR_OK) { return retval; } - arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); + arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE); fields[0].num_bits = 32; fields[0].out_value = out_buf; @@ -214,12 +214,12 @@ int arm9tdmi_clock_data_in(struct arm_jtag *jtag_info, uint32_t *in) struct scan_field fields[3]; jtag_set_end_state(TAP_DRPAUSE); - if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK) + if ((retval = arm_jtag_scann(jtag_info, 0x1, TAP_DRPAUSE)) != ERROR_OK) { return retval; } - arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); + arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE); fields[0].num_bits = 32; fields[0].out_value = NULL; @@ -281,12 +281,12 @@ int arm9tdmi_clock_data_in_endianness(struct arm_jtag *jtag_info, struct scan_field fields[3]; jtag_set_end_state(TAP_DRPAUSE); - if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK) + if ((retval = arm_jtag_scann(jtag_info, 0x1, TAP_DRPAUSE)) != ERROR_OK) { return retval; } - arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL); + arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_DRPAUSE); fields[0].num_bits = 32; fields[0].out_value = NULL; |