From 04cb1210733537aa65d2975515a8be137dbd0b2b Mon Sep 17 00:00:00 2001
From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Thu, 11 Jun 2009 07:08:03 +0000
Subject: [PATCH] Move jtag_add_statemove decl/body nearer jtag_add_pathmove.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2184 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/jtag/core.c | 88 ++++++++++++++++++++++++-------------------------
src/jtag/jtag.h | 66 ++++++++++++++++++-------------------
2 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 27866502a..1c14c8ea9 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -476,6 +476,50 @@ void jtag_add_pathmove(int num_states, const tap_state_t *path)
cmd_queue_cur_state = path[num_states - 1];
}
+int jtag_add_statemove(tap_state_t goal_state)
+{
+ tap_state_t cur_state = cmd_queue_cur_state;
+
+ LOG_DEBUG( "cur_state=%s goal_state=%s",
+ tap_state_name(cur_state),
+ tap_state_name(goal_state) );
+
+
+ if (goal_state==cur_state )
+ ; /* nothing to do */
+ else if( goal_state==TAP_RESET )
+ {
+ jtag_add_tlr();
+ }
+ else if( tap_is_state_stable(cur_state) && tap_is_state_stable(goal_state) )
+ {
+ unsigned tms_bits = tap_get_tms_path(cur_state, goal_state);
+ unsigned tms_count = tap_get_tms_path_len(cur_state, goal_state);
+ tap_state_t moves[8];
+ assert(tms_count < DIM(moves));
+
+ for (unsigned i = 0; i < tms_count; i++, tms_bits >>= 1)
+ {
+ bool bit = tms_bits & 1;
+
+ cur_state = tap_state_transition(cur_state, bit);
+ moves[i] = cur_state;
+ }
+
+ jtag_add_pathmove(tms_count, moves);
+ }
+ else if( tap_state_transition(cur_state, true) == goal_state
+ || tap_state_transition(cur_state, false) == goal_state )
+ {
+ jtag_add_pathmove(1, &goal_state);
+ }
+
+ else
+ return ERROR_FAIL;
+
+ return ERROR_OK;
+}
+
void jtag_add_runtest(int num_cycles, tap_state_t state)
{
jtag_prelude(state);
@@ -1249,50 +1293,6 @@ int jtag_srst_asserted(int *srst_asserted)
return jtag->srst_asserted(srst_asserted);
}
-int jtag_add_statemove(tap_state_t goal_state)
-{
- tap_state_t cur_state = cmd_queue_cur_state;
-
- LOG_DEBUG( "cur_state=%s goal_state=%s",
- tap_state_name(cur_state),
- tap_state_name(goal_state) );
-
-
- if (goal_state==cur_state )
- ; /* nothing to do */
- else if( goal_state==TAP_RESET )
- {
- jtag_add_tlr();
- }
- else if( tap_is_state_stable(cur_state) && tap_is_state_stable(goal_state) )
- {
- unsigned tms_bits = tap_get_tms_path(cur_state, goal_state);
- unsigned tms_count = tap_get_tms_path_len(cur_state, goal_state);
- tap_state_t moves[8];
- assert(tms_count < DIM(moves));
-
- for (unsigned i = 0; i < tms_count; i++, tms_bits >>= 1)
- {
- bool bit = tms_bits & 1;
-
- cur_state = tap_state_transition(cur_state, bit);
- moves[i] = cur_state;
- }
-
- jtag_add_pathmove(tms_count, moves);
- }
- else if( tap_state_transition(cur_state, true) == goal_state
- || tap_state_transition(cur_state, false) == goal_state )
- {
- jtag_add_pathmove(1, &goal_state);
- }
-
- else
- return ERROR_FAIL;
-
- return ERROR_OK;
-}
-
enum reset_types jtag_get_reset_config(void)
{
return jtag_reset_config;
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index dcdad8e17..9ce73471d 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -507,6 +507,39 @@ extern void jtag_add_tlr(void);
*/
extern void jtag_add_pathmove(int num_states, const tap_state_t* path);
+/**
+ * jtag_add_statemove() moves from the current state to @a goal_state.
+ *
+ * @param goal_state The final TAP state.
+ * @return ERROR_OK on success, or an error code on failure.
+ *
+ * Moves from the current state to the goal \a state.
+ *
+ * This needs to be handled according to the xsvf spec, see the XSTATE
+ * command description. From the XSVF spec, pertaining to XSTATE:
+ *
+ * For special states known as stable states (Test-Logic-Reset,
+ * Run-Test/Idle, Pause-DR, Pause- IR), an XSVF interpreter follows
+ * predefined TAP state paths when the starting state is a stable state
+ * and when the XSTATE specifies a new stable state. See the STATE
+ * command in the [Ref 5] for the TAP state paths between stable
+ * states.
+ *
+ * For non-stable states, XSTATE should specify a state that is only one
+ * TAP state transition distance from the current TAP state to avoid
+ * undefined TAP state paths. A sequence of multiple XSTATE commands can
+ * be issued to transition the TAP through a specific state path.
+ *
+ * @note Unless @c tms_bits holds a path that agrees with [Ref 5] in the
+ * above spec, then this code is not fully conformant to the xsvf spec.
+ * This puts a burden on tap_get_tms_path() function from the xsvf spec.
+ * If in doubt, you should confirm that that burden is being met.
+ *
+ * Otherwise, @a goal_state must be immediately reachable in one clock
+ * cycle, and does not need to be a stable state.
+ */
+extern int jtag_add_statemove(tap_state_t goal_state);
+
/**
* Goes to TAP_IDLE (if we're not already there), cycle
* precisely num_cycles in the TAP_IDLE state, after which move
@@ -674,39 +707,6 @@ extern void jtag_add_dr_out(jtag_tap_t* tap,
tap_state_t end_state);
-/**
- * jtag_add_statemove() moves from the current state to @a goal_state.
- *
- * @param goal_state The final TAP state.
- * @return ERROR_OK on success, or an error code on failure.
- *
- * Moves from the current state to the goal \a state.
- *
- * This needs to be handled according to the xsvf spec, see the XSTATE
- * command description. From the XSVF spec, pertaining to XSTATE:
- *
- * For special states known as stable states (Test-Logic-Reset,
- * Run-Test/Idle, Pause-DR, Pause- IR), an XSVF interpreter follows
- * predefined TAP state paths when the starting state is a stable state
- * and when the XSTATE specifies a new stable state. See the STATE
- * command in the [Ref 5] for the TAP state paths between stable
- * states.
- *
- * For non-stable states, XSTATE should specify a state that is only one
- * TAP state transition distance from the current TAP state to avoid
- * undefined TAP state paths. A sequence of multiple XSTATE commands can
- * be issued to transition the TAP through a specific state path.
- *
- * @note Unless @c tms_bits holds a path that agrees with [Ref 5] in the
- * above spec, then this code is not fully conformant to the xsvf spec.
- * This puts a burden on tap_get_tms_path() function from the xsvf spec.
- * If in doubt, you should confirm that that burden is being met.
- *
- * Otherwise, @a goal_state must be immediately reachable in one clock
- * cycle, and does not need to be a stable state.
- */
-extern int jtag_add_statemove(tap_state_t goal_state);
-
/// @returns the number of times the scan queue has been flushed
int jtag_get_flush_queue_count(void);
--
GitLab