David Brownell <david-b@pacbell.net>:

[openocd.git] / src / jtag / core.c

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 0d786e164bc5af520d8de56354699bb8afcc46d8..0cec11ad35134abc429c282b70aff583c42066de 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -243,24 +243,30 @@ int jtag_register_event_callback(jtag_event_handler_t callback, void *priv)
        return ERROR_OK;
 }
 
-int jtag_unregister_event_callback(jtag_event_handler_t callback)
+int jtag_unregister_event_callback(jtag_event_handler_t callback, void *priv)
 {
-       jtag_event_callback_t **callbacks_p = &jtag_event_callbacks;
+       jtag_event_callback_t **callbacks_p;
+       jtag_event_callback_t **next;
 
        if (callback == NULL)
        {
                return ERROR_INVALID_ARGUMENTS;
        }
 
-       while (*callbacks_p)
+       for (callbacks_p = &jtag_event_callbacks;
+                       *callbacks_p != NULL;
+                       callbacks_p = next)
        {
-               jtag_event_callback_t **next = &((*callbacks_p)->next);
+               next = &((*callbacks_p)->next);
+
+               if ((*callbacks_p)->priv != priv)
+                       continue;
+
                if ((*callbacks_p)->callback == callback)
                {
                        free(*callbacks_p);
                        *callbacks_p = *next;
                }
-               callbacks_p = next;
        }
 
        return ERROR_OK;
@@ -786,6 +792,8 @@ static int jtag_reset_callback(enum jtag_event event, void *priv)
 
        if (event == JTAG_TRST_ASSERTED)
        {
+               tap->enabled = !tap->disabled_after_reset;
+
                buf_set_ones(tap->cur_instr, tap->ir_length);
                tap->bypass = 1;
        }
@@ -1092,6 +1100,8 @@ void jtag_tap_init(jtag_tap_t *tap)
 
 void jtag_tap_free(jtag_tap_t *tap)
 {
+       jtag_unregister_event_callback(&jtag_reset_callback, tap);
+
        /// @todo is anything missing? no memory leaks please 
        free((void *)tap->expected_ids);
        free((void *)tap->chip);