From e733ac36bf52283ff70fa352447fd85d41580e49 Mon Sep 17 00:00:00 2001 From: zwelch Date: Tue, 2 Jun 2009 06:21:49 +0000 Subject: [PATCH] More JTAG interface driver cleanup: - Make interface_jtag_execute_queue call new helper function. - Add default_interface_jtag_execute_queue to wrap jtag interface access. This patch may look useless on its own, but it helps to isolate the core JTAG variables from the interface_jtag_* routines, so the later can be moved into jtag_driver.c in a pending patch. git-svn-id: svn://svn.berlios.de/openocd/trunk@1993 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/jtag.c | 7 ++++++- src/jtag/jtag.h | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index d55888ca8..cc7082de9 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -1570,7 +1570,7 @@ int interface_jtag_execute_queue(void) return ERROR_FAIL; } - retval = jtag->execute_queue(); + retval = default_interface_jtag_execute_queue(); if (retval == ERROR_OK) { @@ -1592,6 +1592,11 @@ int interface_jtag_execute_queue(void) } #endif +int default_interface_jtag_execute_queue(void) +{ + return jtag->execute_queue(); +} + void jtag_execute_queue_noclear(void) { /* each flush can take as much as 1-2ms on high bandwidth low latency interfaces. diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 4a1be9fc2..668486332 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -869,6 +869,13 @@ extern int interface_jtag_add_sleep(u32 us); extern int interface_jtag_add_clocks(int num_cycles); extern int interface_jtag_execute_queue(void); +/** + * Calls the interface callback to execute the queue. This routine + * is used by the JTAG driver layer and should not be called directly. + */ +extern int default_interface_jtag_execute_queue(void); + + #endif // INCLUDE_JTAG_MINIDRIVER_H /* this allows JTAG devices to implement the entire jtag_xxx() layer in hw/sw */