diff options
Diffstat (limited to 'src/jtag/dummy.c')
| -rw-r--r-- | src/jtag/dummy.c | 110 |
1 files changed, 2 insertions, 108 deletions
diff --git a/src/jtag/dummy.c b/src/jtag/dummy.c index 434a28de..0a64c214 100644 --- a/src/jtag/dummy.c +++ b/src/jtag/dummy.c @@ -34,9 +34,6 @@ static int dummy_clock; /* edge detector */ static int clock_count; /* count clocks in any stable state, only stable states */
-
-static tap_state_t tap_state_transition(tap_state_t cur_state, int tms);
-
static u32 dummy_data;
@@ -105,7 +102,7 @@ void dummy_write(int tck, int tms, int tdi) clock_count = 0;
}
- LOG_DEBUG("dummy_tap: %s", jtag_state_name(dummy_state) );
+ LOG_DEBUG("dummy_tap: %s", tap_state_name(dummy_state) );
#if defined(DEBUG)
if(dummy_state == TAP_DRCAPTURE)
@@ -131,7 +128,7 @@ void dummy_reset(int trst, int srst) if (trst || (srst && (jtag_reset_config & RESET_SRST_PULLS_TRST)))
dummy_state = TAP_RESET;
- LOG_DEBUG("reset to: %s", jtag_state_name(dummy_state) );
+ LOG_DEBUG("reset to: %s", tap_state_name(dummy_state) );
}
static int dummy_khz(int khz, int *jtag_speed)
@@ -187,106 +184,3 @@ void dummy_led(int on) {
}
-
-/**
- * Function tap_state_transition
- * takes a current TAP state and returns the next state according to the tms value.
- *
- * Even though there is code to duplicate this elsewhere, we do it here a little
- * differently just to get a second opinion, i.e. a verification, on state tracking
- * in that other logic. Plus array lookups without index checking are no favorite thing.
- * This is educational for developers new to TAP controllers.
- */
-static tap_state_t tap_state_transition(tap_state_t cur_state, int tms)
-{
- tap_state_t new_state;
-
- if (tms)
- {
- switch (cur_state)
- {
- case TAP_RESET:
- new_state = cur_state;
- break;
- case TAP_IDLE:
- case TAP_DRUPDATE:
- case TAP_IRUPDATE:
- new_state = TAP_DRSELECT;
- break;
- case TAP_DRSELECT:
- new_state = TAP_IRSELECT;
- break;
- case TAP_DRCAPTURE:
- case TAP_DRSHIFT:
- new_state = TAP_DREXIT1;
- break;
- case TAP_DREXIT1:
- case TAP_DREXIT2:
- new_state = TAP_DRUPDATE;
- break;
- case TAP_DRPAUSE:
- new_state = TAP_DREXIT2;
- break;
- case TAP_IRSELECT:
- new_state = TAP_RESET;
- break;
- case TAP_IRCAPTURE:
- case TAP_IRSHIFT:
- new_state = TAP_IREXIT1;
- break;
- case TAP_IREXIT1:
- case TAP_IREXIT2:
- new_state = TAP_IRUPDATE;
- break;
- case TAP_IRPAUSE:
- new_state = TAP_IREXIT2;
- break;
- default:
- LOG_ERROR( "fatal: invalid argument cur_state=%d", cur_state );
- exit(1);
- break;
- }
- }
- else
- {
- switch (cur_state)
- {
- case TAP_RESET:
- case TAP_IDLE:
- case TAP_DRUPDATE:
- case TAP_IRUPDATE:
- new_state = TAP_IDLE;
- break;
- case TAP_DRSELECT:
- new_state = TAP_DRCAPTURE;
- break;
- case TAP_DRCAPTURE:
- case TAP_DRSHIFT:
- case TAP_DREXIT2:
- new_state = TAP_DRSHIFT;
- break;
- case TAP_DREXIT1:
- case TAP_DRPAUSE:
- new_state = TAP_DRPAUSE;
- break;
- case TAP_IRSELECT:
- new_state = TAP_IRCAPTURE;
- break;
- case TAP_IRCAPTURE:
- case TAP_IRSHIFT:
- case TAP_IREXIT2:
- new_state = TAP_IRSHIFT;
- break;
- case TAP_IREXIT1:
- case TAP_IRPAUSE:
- new_state = TAP_IRPAUSE;
- break;
- default:
- LOG_ERROR( "fatal: invalid argument cur_state=%d", cur_state );
- exit(1);
- break;
- }
- }
-
- return new_state;
-}
|