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/etm.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/etm.c')
| -rw-r--r-- | src/target/etm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/target/etm.c b/src/target/etm.c index a1c77b0f..3c25f4e8 100644 --- a/src/target/etm.c +++ b/src/target/etm.c @@ -505,8 +505,8 @@ static int etm_read_reg_w_check(struct reg *reg, LOG_DEBUG("%s (%u)", r->name, reg_addr); jtag_set_end_state(TAP_IDLE); - arm_jtag_scann(etm_reg->jtag_info, 0x6); - arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL); + arm_jtag_scann(etm_reg->jtag_info, 0x6, TAP_IDLE); + arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL, TAP_IDLE); fields[0].num_bits = 32; fields[0].out_value = reg->value; @@ -588,8 +588,8 @@ static int etm_write_reg(struct reg *reg, uint32_t value) LOG_DEBUG("%s (%u): 0x%8.8" PRIx32 "", r->name, reg_addr, value); jtag_set_end_state(TAP_IDLE); - arm_jtag_scann(etm_reg->jtag_info, 0x6); - arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL); + arm_jtag_scann(etm_reg->jtag_info, 0x6, TAP_IDLE); + arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL, TAP_IDLE); fields[0].num_bits = 32; uint8_t tmp1[4]; |