From a3e84343e202eb70ebce0ec1e8b15d7f9ce57f00 Mon Sep 17 00:00:00 2001 From: zwelch Date: Wed, 3 Jun 2009 06:29:09 +0000 Subject: [PATCH] Finish JTAG header file modularization; command factoring follows. git-svn-id: svn://svn.berlios.de/openocd/trunk@2029 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/amt_jtagaccel.c | 2 +- src/jtag/arm-jtag-ew.c | 2 +- src/jtag/at91rm9200.c | 1 - src/jtag/bitbang.c | 3 +-- src/jtag/bitq.c | 1 - src/jtag/bitq.h | 2 +- src/jtag/dummy.c | 1 - src/jtag/ep93xx.c | 1 - src/jtag/ft2232.c | 2 +- src/jtag/gw16012.c | 2 +- src/jtag/jlink.c | 2 +- src/jtag/jtag.c | 1 - src/jtag/jtag.h | 4 ---- src/jtag/jtag_driver.c | 1 - src/jtag/minidriver.h | 2 ++ src/jtag/parport.c | 1 - src/jtag/presto.c | 1 - src/jtag/rlink/rlink.c | 2 +- src/jtag/usbprog.c | 2 +- src/jtag/vsllink.c | 2 +- src/jtag/zy1000.c | 1 - 21 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c index 39fed2cc25..b19fae17eb 100644 --- a/src/jtag/amt_jtagaccel.c +++ b/src/jtag/amt_jtagaccel.c @@ -21,8 +21,8 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" +#include "commands.h" #if PARPORT_USE_PPDEV == 1 diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c index e90c740b42..ebe60d9734 100644 --- a/src/jtag/arm-jtag-ew.c +++ b/src/jtag/arm-jtag-ew.c @@ -24,8 +24,8 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" +#include "commands.h" #include diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c index 32e9c55062..d0d1644875 100644 --- a/src/jtag/at91rm9200.c +++ b/src/jtag/at91rm9200.c @@ -21,7 +21,6 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" #include "bitbang.h" diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c index 75e413dcd1..9f7c14cdad 100644 --- a/src/jtag/bitbang.c +++ b/src/jtag/bitbang.c @@ -25,9 +25,8 @@ #endif #include "bitbang.h" -#define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" #include "interface.h" +#include "commands.h" /** * Function bitbang_stableclocks diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c index b034a934ee..c319ed8148 100644 --- a/src/jtag/bitq.c +++ b/src/jtag/bitq.c @@ -21,7 +21,6 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "bitq.h" #include "interface.h" diff --git a/src/jtag/bitq.h b/src/jtag/bitq.h index 2ee3f6b66e..6b441bf587 100644 --- a/src/jtag/bitq.h +++ b/src/jtag/bitq.h @@ -20,7 +20,7 @@ #ifndef BITQ_H #define BITQ_H -#include "jtag.h" +#include "commands.h" typedef struct bitq_interface_s { diff --git a/src/jtag/dummy.c b/src/jtag/dummy.c index 0eab32d6f1..9d4a436b59 100644 --- a/src/jtag/dummy.c +++ b/src/jtag/dummy.c @@ -21,7 +21,6 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" #include "bitbang.h" diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c index 55d1eeeaed..e4daa7e6a8 100644 --- a/src/jtag/ep93xx.c +++ b/src/jtag/ep93xx.c @@ -21,7 +21,6 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" #include "bitbang.h" diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c index b6b812d90e..95a2811709 100644 --- a/src/jtag/ft2232.c +++ b/src/jtag/ft2232.c @@ -40,8 +40,8 @@ #endif /* project specific includes */ -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" +#include "commands.h" #include "time_support.h" #if IS_CYGWIN == 1 diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c index 441234c19b..a89a5f7e32 100644 --- a/src/jtag/gw16012.c +++ b/src/jtag/gw16012.c @@ -21,8 +21,8 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" +#include "commands.h" #if 1 diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c index eaa4bba8d3..f7b8d6220e 100644 --- a/src/jtag/jlink.c +++ b/src/jtag/jlink.c @@ -25,8 +25,8 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" +#include "commands.h" #include diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index d8b30e9f70..8eef69e800 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -28,7 +28,6 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "jtag.h" #include "minidriver.h" #include "interface.h" diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index bc9470e1bb..04eefaadb3 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -552,10 +552,6 @@ extern int jtag_srst_asserted(int* srst_asserted); */ extern void jtag_check_value_mask(scan_field_t *field, u8 *value, u8 *mask); -#ifdef INCLUDE_JTAG_INTERFACE_H -#include "commands.h" -#endif // INCLUDE_JTAG_INTERFACE_H - extern void jtag_sleep(u32 us); extern int jtag_call_event_callbacks(enum jtag_event event); extern int jtag_register_event_callback(int (* callback)(enum jtag_event event, void* priv), void* priv); diff --git a/src/jtag/jtag_driver.c b/src/jtag/jtag_driver.c index 2319429c26..70d0f83755 100644 --- a/src/jtag/jtag_driver.c +++ b/src/jtag/jtag_driver.c @@ -31,7 +31,6 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" #include "minidriver.h" #include "command.h" diff --git a/src/jtag/minidriver.h b/src/jtag/minidriver.h index 7e9589d456..83230cd16f 100644 --- a/src/jtag/minidriver.h +++ b/src/jtag/minidriver.h @@ -68,6 +68,8 @@ static inline void interface_jtag_add_scan_check_alloc(scan_field_t *field) #else +#include "commands.h" + static inline void interface_jtag_alloc_in_value32(scan_field_t *field) { field->in_value = (u8 *)cmd_queue_alloc(4); diff --git a/src/jtag/parport.c b/src/jtag/parport.c index 175a3c940f..51442304c9 100644 --- a/src/jtag/parport.c +++ b/src/jtag/parport.c @@ -24,7 +24,6 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" #include "bitbang.h" diff --git a/src/jtag/presto.c b/src/jtag/presto.c index 532e798f96..3bac4a9553 100644 --- a/src/jtag/presto.c +++ b/src/jtag/presto.c @@ -25,7 +25,6 @@ #include "windows.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" #include "time_support.h" #include "bitq.h" diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c index beef497f45..f47e189c3b 100644 --- a/src/jtag/rlink/rlink.c +++ b/src/jtag/rlink/rlink.c @@ -28,8 +28,8 @@ #endif /* project specific includes */ -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" +#include "commands.h" #include "rlink.h" #include "st7.h" #include "ep1_cmd.h" diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c index 09272866a7..487e9b1611 100644 --- a/src/jtag/usbprog.c +++ b/src/jtag/usbprog.c @@ -34,8 +34,8 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" +#include "commands.h" #include diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c index cc2b271dfa..e703a35a7c 100644 --- a/src/jtag/vsllink.c +++ b/src/jtag/vsllink.c @@ -26,8 +26,8 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" +#include "commands.h" #include diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c index 4852a56f56..2cdd2fdc23 100644 --- a/src/jtag/zy1000.c +++ b/src/jtag/zy1000.c @@ -20,7 +20,6 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "embeddedice.h" #include "minidriver.h" #include "interface.h" -- 2.30.2