Minor behavior fixes for the two JTAG reset events (C/internal,

and Tcl/external):

 - Reorder so *both* paths (TCK/TMS or TRST) can enable TAPs with
   ICEpick ... first C code flags TAPs that got disabled, then call
   any Tcl code that might want to re-enable them.

 - Always call the C/internal handlers when JTAG operations can be
   issued; previously that wasn't done when TRST was used.

Plus some small cleanups (whitespace, strings, better messaging
during debug and on some errors) to reset-related code.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2730 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 97179192e5681336701047587b4d3fc59a6e093f..6a314ece1d868dfc27932c887a688f06daf2f9d3 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -446,7 +446,7 @@ void jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields,
                tap_state_t state)
 {
        assert(state != TAP_RESET);
-       
+
        jtag_prelude(state);
 
        int retval;
@@ -458,7 +458,7 @@ void jtag_add_plain_dr_scan(int in_num_fields, const scan_field_t *in_fields,
                tap_state_t state)
 {
        assert(state != TAP_RESET);
-       
+
        jtag_prelude(state);
 
        int retval;
@@ -471,7 +471,6 @@ void jtag_add_dr_out(jtag_tap_t* tap,
                tap_state_t end_state)
 {
        assert(end_state != TAP_RESET);
-       
        assert(end_state != TAP_INVALID);
 
        cmd_queue_cur_state = end_state;
@@ -486,9 +485,9 @@ void jtag_add_tlr(void)
        jtag_prelude(TAP_RESET);
        jtag_set_error(interface_jtag_add_tlr());
 
-       jtag_notify_reset();
-
+       /* NOTE: order here matches TRST path in jtag_add_reset() */
        jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
+       jtag_notify_reset();
 }
 
 void jtag_add_pathmove(int num_states, const tap_state_t *path)
@@ -684,21 +683,19 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
        } else if (jtag_trst != new_trst) {
                jtag_trst = new_trst;
                if (jtag_trst) {
-                       /* we just asserted nTRST, so we're now in TAP_RESET;
-                        * inform possible listeners about this
-                        *
-                        * REVISIT asserting TRST is less significant than
-                        * being in TAP_RESET ... both entries (TRST, TLR)
-                        * should trigger a callback.
-                        */
                        LOG_DEBUG("TRST line asserted");
                        tap_set_state(TAP_RESET);
-                       jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
                } else {
                        LOG_DEBUG("TRST line released");
                        if (jtag_ntrst_delay)
                                jtag_add_sleep(jtag_ntrst_delay * 1000);
 
+                       /* We just asserted nTRST, so we're now in TAP_RESET.
+                        * Inform possible listeners about this, now that
+                        * JTAG instructions and data can be shifted.  This
+                        * sequence must match jtag_add_tlr().
+                        */
+                       jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
                        jtag_notify_reset();
                }
        }
@@ -823,7 +820,8 @@ static int jtag_reset_callback(enum jtag_event event, void *priv)
 {
        jtag_tap_t *tap = priv;
 
-       LOG_DEBUG("-");
+       LOG_DEBUG("TAP %s event %s", tap->dotted_name,
+                       jtag_event_strings[event]);
 
        if (event == JTAG_TRST_ASSERTED)
        {

diff --git a/src/target/target.c b/src/target/target.c
index 0bce8279e2bb9148e3177f84af23432bd3ec5a4a..16e36816b22c18b5a4b89aaff23af54f028d3d64 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -4028,7 +4028,8 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                break;
        case TS_CMD_RESET:
                if (goi.argc != 2) {
-                       Jim_WrongNumArgs(interp, 2, argv, "t | f|assert | deassert BOOL");
+                       Jim_WrongNumArgs(interp, 2, argv,
+                                       "([tT]|[fF]|assert|deassert) BOOL");
                        return JIM_ERR;
                }
                e = Jim_GetOpt_Nvp(&goi, nvp_assert, &n);