summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-03-18 18:31:58 +0100
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-03-19 08:31:44 +0100
commit8ce828dd382c907db4c6bd38e5b54996e50327fd (patch)
treeb62183e48601042a10d0d84c31d6587e9fa7da88
parent8d411d0d249dda7ceb951c4f8c8a509f4fd1dfb0 (diff)
downloadopenocd_libswd-8ce828dd382c907db4c6bd38e5b54996e50327fd.tar.gz
openocd_libswd-8ce828dd382c907db4c6bd38e5b54996e50327fd.tar.bz2
openocd_libswd-8ce828dd382c907db4c6bd38e5b54996e50327fd.tar.xz
openocd_libswd-8ce828dd382c907db4c6bd38e5b54996e50327fd.zip
jtag: remove jtag_get_end_state()'s that should be unecessary
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 <oyvind.harboe@zylin.com>
-rw-r--r--src/jtag/zy1000/zy1000.c2
-rw-r--r--src/target/arm7_9_common.c2
-rw-r--r--src/target/arm7tdmi.c4
-rw-r--r--src/target/arm9tdmi.c2
-rw-r--r--src/target/embeddedice.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 177d286d..9b8b4804 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 85c68163..4c8d83d6 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 25151ff4..f1452751 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 b4b6f04a..4f28599a 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 cd48ce69..d2781152 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);