diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-03-18 12:07:41 +0100 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-03-18 12:08:11 +0100 |
| commit | ec108ff59e23ec32abf1223488ad96dd26205a5b (patch) | |
| tree | 199488e7e879e24a2d02822a76b8b011db81813f /src/target/arm7_9_common.c | |
| parent | 46f92878da6c65eac275d1783e4e4019ec3c9af9 (diff) | |
| download | openocd_libswd-ec108ff59e23ec32abf1223488ad96dd26205a5b.tar.gz openocd_libswd-ec108ff59e23ec32abf1223488ad96dd26205a5b.tar.bz2 openocd_libswd-ec108ff59e23ec32abf1223488ad96dd26205a5b.tar.xz openocd_libswd-ec108ff59e23ec32abf1223488ad96dd26205a5b.zip | |
jtag: retire one instance of jtag_get_end_state() usage
Less global variables....
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/target/arm7_9_common.c')
| -rw-r--r-- | src/target/arm7_9_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index c6a08cf1..85c68163 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -690,9 +690,9 @@ int arm7_9_execute_sys_speed(struct target *target) jtag_set_end_state(TAP_IDLE); if (arm7_9->need_bypass_before_restart) { arm7_9->need_bypass_before_restart = 0; - arm_jtag_set_instr(jtag_info, 0xf, NULL); + arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE); } - arm_jtag_set_instr(jtag_info, 0x4, NULL); + arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE); long long then = timeval_ms(); int timeout; @@ -743,9 +743,9 @@ int arm7_9_execute_fast_sys_speed(struct target *target) jtag_set_end_state(TAP_IDLE); if (arm7_9->need_bypass_before_restart) { arm7_9->need_bypass_before_restart = 0; - arm_jtag_set_instr(jtag_info, 0xf, NULL); + arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE); } - arm_jtag_set_instr(jtag_info, 0x4, NULL); + arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE); if (!set) { @@ -1746,9 +1746,9 @@ int arm7_9_restart_core(struct target *target) jtag_set_end_state(TAP_IDLE); if (arm7_9->need_bypass_before_restart) { arm7_9->need_bypass_before_restart = 0; - arm_jtag_set_instr(jtag_info, 0xf, NULL); + arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE); } - arm_jtag_set_instr(jtag_info, 0x4, NULL); + arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE); jtag_add_runtest(1, TAP_IDLE); return jtag_execute_queue(); |