From a0c10dd29b84e7e9238fa6652c8f7cea3c14fc14 Mon Sep 17 00:00:00 2001 From: zwelch Date: Tue, 16 Jun 2009 12:17:18 +0000 Subject: David Brownell : Extend the internal JTAG event handlers to cover enable/disable, and use those events to make sure that targets get "examined" if they were disabled when the scan chain was first set up: - Remove "enum jtag_tap_event", merge with "enum jtag_event", so C code can now listen for TAP enable/disable events. - Report those events so they can trigger callbacks. - During startup, make target_examine() register a handler to catch ENABLE events for any then-disabled targets. This fixes bugs like "can't halt target after enabling its TAP". One class of unresolved bugs: if the target has an ETM hooked up to an ETB, nothing activates the ETB. But starting up the ETM without access to the ETB registers fails... git-svn-id: svn://svn.berlios.de/openocd/trunk@2251 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/tcl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/jtag/tcl.c') diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index aa55809f..ec74a9e1 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -256,7 +256,7 @@ static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap) jteap = tap->event_action; /* replace existing? */ while (jteap) { - if (jteap->event == (enum jtag_tap_event)n->value) { + if (jteap->event == (enum jtag_event)n->value) { break; } jteap = jteap->next; @@ -460,7 +460,7 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi ) return JIM_ERR; } -static void jtag_tap_handle_event( jtag_tap_t * tap, enum jtag_tap_event e) +static void jtag_tap_handle_event(jtag_tap_t *tap, enum jtag_event e) { jtag_tap_event_action_t * jteap; int done; @@ -594,6 +594,8 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv * - scan chain length grew by one (this) * - IDs and IR lengths are as expected */ + + jtag_call_event_callbacks(JTAG_TAP_EVENT_ENABLE); break; case JTAG_CMD_TAPDISABLE: if (!t->enabled) @@ -606,6 +608,8 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv * - scan chain length shrank by one (this) * - IDs and IR lengths are as expected */ + + jtag_call_event_callbacks(JTAG_TAP_EVENT_DISABLE); break; } e = t->enabled; -- cgit v1.2.3