From 8ce828dd382c907db4c6bd38e5b54996e50327fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Harboe?= Date: Thu, 18 Mar 2010 18:31:58 +0100 Subject: [PATCH] jtag: remove jtag_get_end_state()'s that should be unecessary MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit By a bit of code inspection it seems like all of these instances of jtag_get_end_state() can be unambigously replaced by constants. Signed-off-by: Øyvind Harboe --- src/jtag/zy1000/zy1000.c | 2 +- src/target/arm7_9_common.c | 2 +- src/target/arm7tdmi.c | 4 ++-- src/target/arm9tdmi.c | 2 +- src/target/embeddedice.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index 177d286d8b..9b8b48043d 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -849,7 +849,7 @@ void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer, } } else { - tap_state_t end_state = jtag_get_end_state(); + tap_state_t end_state = TAP_IDLE; tap_state_t shift_end_state; if (post_bits == 0) shift_end_state = end_state; diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index 85c68163af..4c8d83d664 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -995,7 +995,7 @@ int arm7_9_assert_reset(struct target *target) * certain ARM9 cores (maybe more) - AT91SAM9260 * and STR9 */ - jtag_add_runtest(1, jtag_get_end_state()); + jtag_add_runtest(1, TAP_IDLE); } else { diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index 25151ff4b9..f14527510f 100644 --- a/src/target/arm7tdmi.c +++ b/src/target/arm7tdmi.c @@ -104,9 +104,9 @@ static __inline int arm7tdmi_clock_out_inner(struct arm_jtag *jtag_info, uint32_ 2, arm7tdmi_num_bits, values, - jtag_get_end_state()); + TAP_DRPAUSE); - jtag_add_runtest(0, jtag_get_end_state()); + jtag_add_runtest(0, TAP_DRPAUSE); return ERROR_OK; } diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index b4b6f04a56..4f28599a52 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -186,7 +186,7 @@ int arm9tdmi_clock_out(struct arm_jtag *jtag_info, uint32_t instr, jtag_add_dr_scan(jtag_info->tap, 3, fields, TAP_DRPAUSE); } - jtag_add_runtest(0, jtag_get_end_state()); + jtag_add_runtest(0, TAP_DRPAUSE); #ifdef _DEBUG_INSTRUCTION_EXECUTION_ { diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h index cd48ce6971..d278115273 100644 --- a/src/target/embeddedice.h +++ b/src/target/embeddedice.h @@ -128,7 +128,7 @@ static __inline__ void embeddedice_write_reg_inner(struct jtag_tap *tap, int reg 2, embeddedice_num_bits, values, - jtag_get_end_state()); + TAP_IDLE); } void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer, int little, int count); -- 2.30.2