diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-10-23 01:02:22 -0700 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-10-23 01:02:22 -0700 |
| commit | 79f71fad58f3cd1a59142b65c3b79b145943b6e6 (patch) | |
| tree | 16394038499fc1c5332a4294b40138a09691361c /src/jtag/jtag.h | |
| parent | 814183a5c41cad14b83c29c9473084e6d1a11d9b (diff) | |
| download | openocd+libswd-79f71fad58f3cd1a59142b65c3b79b145943b6e6.tar.gz openocd+libswd-79f71fad58f3cd1a59142b65c3b79b145943b6e6.tar.bz2 openocd+libswd-79f71fad58f3cd1a59142b65c3b79b145943b6e6.tar.xz openocd+libswd-79f71fad58f3cd1a59142b65c3b79b145943b6e6.zip | |
jtag: clean up TAP state name handling
Some cosmetic cleanup, and switch to a single table mapping
between state names and symbols (vs two routines which only
share that state with difficulty).
Get rid of TAP_NUM_STATES, and some related knowledge about
how TAP numbers are assigned. Later on, this will help us
get rid of more such hardwired knowlege.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/jtag/jtag.h')
| -rw-r--r-- | src/jtag/jtag.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 1dae00fa..ca09f923 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -57,13 +57,17 @@ * * These definitions were gleaned from the ARM7TDMI-S Technical * Reference Manual and validated against several other ARM core - * technical manuals. tap_get_tms_path() is sensitive to this numbering - * and ordering of the TAP states; furthermore, some interfaces require - * specific numbers be used, as they are handed-off directly to their - * hardware implementations. + * technical manuals. + * + * FIXME some interfaces require specific numbers be used, as they + * are handed-off directly to their hardware implementations. + * Fix those drivers to map as appropriate ... then pick some + * sane set of numbers here (where 0/uninitialized == INVALID). */ typedef enum tap_state { + TAP_INVALID = -1, + #if BUILD_ZY1000 /* These are the old numbers. Leave as-is for now... */ TAP_RESET = 0, TAP_IDLE = 8, @@ -72,7 +76,6 @@ typedef enum tap_state TAP_IRSELECT = 9, TAP_IRCAPTURE = 10, TAP_IRSHIFT = 11, TAP_IREXIT1 = 12, TAP_IRPAUSE = 13, TAP_IREXIT2 = 14, TAP_IRUPDATE = 15, - TAP_NUM_STATES = 16, TAP_INVALID = -1, #else /* Proper ARM recommended numbers */ TAP_DREXIT2 = 0x0, @@ -92,9 +95,6 @@ typedef enum tap_state TAP_IRCAPTURE = 0xe, TAP_RESET = 0x0f, - TAP_NUM_STATES = 0x10, - - TAP_INVALID = -1, #endif } tap_state_t; |