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/arm966e.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/arm966e.c')
| -rw-r--r-- | src/target/arm966e.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/target/arm966e.c b/src/target/arm966e.c index 67678c14..c1e80582 100644 --- a/src/target/arm966e.c +++ b/src/target/arm966e.c @@ -85,11 +85,11 @@ static int arm966e_read_cp15(struct target *target, int reg_addr, uint32_t *valu uint8_t nr_w_buf = 0; jtag_set_end_state(TAP_IDLE); - if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK) + if ((retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE)) != 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_IDLE); fields[0].num_bits = 32; /* REVISIT: table 7-2 shows that bits 31-31 need to be @@ -140,11 +140,11 @@ int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value) buf_set_u32(value_buf, 0, 32, value); jtag_set_end_state(TAP_IDLE); - if ((retval = arm_jtag_scann(jtag_info, 0xf)) != ERROR_OK) + if ((retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE)) != 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_IDLE); fields[0].num_bits = 32; fields[0].out_value = value_buf; |