From ac5fb035211c9e63b2fb2c520317dd24516dc86f Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 11 Mar 2008 11:03:40 +0000
Subject: [PATCH] JTAG_END_STATE is now retired. It is no longer queued.
git-svn-id: svn://svn.berlios.de/openocd/trunk@493 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/jtag/jtag.c | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index f539e296d..d55dc2477 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -37,7 +37,7 @@
/* note that this is not marked as static as it must be available from outside jtag.c for those
that implement the jtag_xxx() minidriver layer
*/
-static int jtag_error=ERROR_OK;
+int jtag_error=ERROR_OK;
char* tap_state_strings[16] =
@@ -141,6 +141,11 @@ jtag_event_callback_t *jtag_event_callbacks;
/* jtag interfaces (parport, FTDI-USB, TI-USB, ...)
*/
+
+#if BUILD_ECOSBOARD == 1
+ extern jtag_interface_t eCosBoard_interface;
+#endif
+
#if BUILD_PARPORT == 1
extern jtag_interface_t parport_interface;
#endif
@@ -178,6 +183,9 @@ jtag_event_callback_t *jtag_event_callbacks;
#endif
jtag_interface_t *jtag_interfaces[] = {
+#if BUILD_ECOSBOARD == 1
+ &eCosBoard_interface,
+#endif
#if BUILD_PARPORT == 1
&parport_interface,
#endif
@@ -1066,29 +1074,9 @@ int MINIDRIVER(interface_jtag_add_reset)(int req_trst, int req_srst)
return ERROR_OK;
}
-int MINIDRIVER(interface_jtag_add_end_state)(enum tap_state state)
-{
- jtag_command_t **last_cmd = jtag_get_last_command_p();
-
- /* allocate memory for a new list member */
- *last_cmd = cmd_queue_alloc(sizeof(jtag_command_t));
- (*last_cmd)->next = NULL;
- last_comand_pointer = &((*last_cmd)->next);
- (*last_cmd)->type = JTAG_END_STATE;
-
- (*last_cmd)->cmd.end_state = cmd_queue_alloc(sizeof(end_state_command_t));
- (*last_cmd)->cmd.end_state->end_state = state;
-
- return ERROR_OK;
-}
-
void jtag_add_end_state(enum tap_state state)
{
- if (state != -1)
- cmd_queue_end_state = state;
- int retval = interface_jtag_add_end_state(cmd_queue_end_state);
- if (retval!=ERROR_OK)
- jtag_error=retval;
+ cmd_queue_end_state = state;
}
int MINIDRIVER(interface_jtag_add_sleep)(u32 us)
--
GitLab