From 521d8d5bfaebe69f507de42847360486290248ee Mon Sep 17 00:00:00 2001
From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Mon, 8 Jun 2009 10:57:18 +0000
Subject: [PATCH] Simplify jtag_add_pathmove: - Use jtag_set_error instead of
accessing jtag_error directly. - Eliminate superfluous retval temporary
variable. - Reduce scope of loop induction variable. - Wrap to fit within 80
columns.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2123 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/jtag/jtag.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index b4d0cae89..b118b0ceb 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -606,8 +606,6 @@ void jtag_add_tlr(void)
void jtag_add_pathmove(int num_states, const tap_state_t *path)
{
tap_state_t cur_state = cmd_queue_cur_state;
- int i;
- int retval;
/* the last state has to be a stable state */
if (!tap_is_state_stable(path[num_states - 1]))
@@ -616,7 +614,7 @@ void jtag_add_pathmove(int num_states, const tap_state_t *path)
exit(-1);
}
- for (i=0; i<num_states; i++)
+ for (int i = 0; i < num_states; i++)
{
if (path[i] == TAP_RESET)
{
@@ -627,7 +625,8 @@ void jtag_add_pathmove(int num_states, const tap_state_t *path)
if ( tap_state_transition(cur_state, true) != path[i]
&& tap_state_transition(cur_state, false) != path[i])
{
- LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name(cur_state), tap_state_name(path[i]));
+ LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
+ tap_state_name(cur_state), tap_state_name(path[i]));
exit(-1);
}
cur_state = path[i];
@@ -635,10 +634,8 @@ void jtag_add_pathmove(int num_states, const tap_state_t *path)
jtag_checks();
- retval = interface_jtag_add_pathmove(num_states, path);
+ jtag_set_error(interface_jtag_add_pathmove(num_states, path));
cmd_queue_cur_state = path[num_states - 1];
- if (retval!=ERROR_OK)
- jtag_error=retval;
}
void jtag_add_runtest(int num_cycles, tap_state_t state)
--
GitLab