From 7f6bab0c4c36d7a64f933904e5add9bc6b36d78c Mon Sep 17 00:00:00 2001 From: Øyvind Harboe Date: Thu, 18 Mar 2010 18:53:39 +0100 Subject: jtag: retire jtag_get/set_end_state() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Voila! This get rids of mysteries about what what state the TAP is in. Signed-off-by: Øyvind Harboe --- src/jtag/core.c | 20 -------------------- src/jtag/jtag.h | 20 -------------------- 2 files changed, 40 deletions(-) (limited to 'src/jtag') diff --git a/src/jtag/core.c b/src/jtag/core.c index a09472a7..65ca8245 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -86,7 +86,6 @@ static struct jtag_tap *__jtag_all_taps = NULL; static unsigned jtag_num_taps = 0; static enum reset_types jtag_reset_config = RESET_NONE; -static tap_state_t cmd_queue_end_state = TAP_RESET; tap_state_t cmd_queue_cur_state = TAP_RESET; static bool jtag_verify_capture_ir = true; @@ -717,7 +716,6 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst) */ if (trst_with_tlr) { LOG_DEBUG("JTAG reset with TLR instead of TRST"); - jtag_set_end_state(TAP_RESET); jtag_add_tlr(); } else if (jtag_trst != new_trst) { @@ -743,24 +741,6 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst) } } -/* DEPRECATED! store such global state outside JTAG layer */ -void jtag_set_end_state(tap_state_t state) -{ - if ((state == TAP_DRSHIFT)||(state == TAP_IRSHIFT)) - { - LOG_ERROR("BUG: TAP_DRSHIFT/IRSHIFT can't be end state. Calling code should use a larger scan field"); - } - - if (state != TAP_INVALID) - cmd_queue_end_state = state; -} - -/* DEPRECATED! store such global state outside JTAG layer */ -tap_state_t jtag_get_end_state(void) -{ - return cmd_queue_end_state; -} - void jtag_add_sleep(uint32_t us) { /// @todo Here, keep_alive() appears to be a layering violation!!! diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index a92c986d..a6d16e93 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -550,26 +550,6 @@ void jtag_add_runtest(int num_cycles, tap_state_t endstate); */ void jtag_add_reset(int req_tlr_or_trst, int srst); - -/** - * DEPRECATED! store such global state outside JTAG layer - * - * Function jtag_set_end_state - * - * Set a global variable to \a state if \a state != TAP_INVALID. - * - */ -void jtag_set_end_state(tap_state_t state); - -/** - * DEPRECATED! store such global state outside JTAG layer - * - * Function jtag_get_end_state - * - * Return the value of the global variable for end state - */ -tap_state_t jtag_get_end_state(void); - void jtag_add_sleep(uint32_t us); int jtag_add_tms_seq(unsigned nbits, const uint8_t *seq, enum tap_state t); -- cgit v1.2.3