From 67caf323f74937e11c0f5f95c2ee57d2786ac02b Mon Sep 17 00:00:00 2001 From: zwelch Date: Wed, 3 Jun 2009 01:26:01 +0000 Subject: [PATCH] Remove interface.h from public JTAG header, include it where required. git-svn-id: svn://svn.berlios.de/openocd/trunk@2016 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/amt_jtagaccel.c | 2 +- src/jtag/arm-jtag-ew.c | 2 +- src/jtag/at91rm9200.c | 2 +- src/jtag/bitbang.c | 1 + src/jtag/bitq.c | 1 + src/jtag/dummy.c | 2 +- src/jtag/ep93xx.c | 2 +- src/jtag/ft2232.c | 2 +- src/jtag/gw16012.c | 2 +- src/jtag/jlink.c | 2 +- src/jtag/jtag.c | 1 + src/jtag/jtag.h | 2 -- src/jtag/jtag_driver.c | 2 +- src/jtag/parport.c | 2 +- src/jtag/presto.c | 2 +- src/jtag/rlink/rlink.c | 2 +- src/jtag/usbprog.c | 2 +- src/jtag/vsllink.c | 2 +- src/jtag/zy1000.c | 1 + src/xsvf/xsvf.c | 1 - 20 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c index 694a4a7c7..39fed2cc2 100644 --- a/src/jtag/amt_jtagaccel.c +++ b/src/jtag/amt_jtagaccel.c @@ -22,7 +22,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #if PARPORT_USE_PPDEV == 1 diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c index 4dc854ac1..e90c740b4 100644 --- a/src/jtag/arm-jtag-ew.c +++ b/src/jtag/arm-jtag-ew.c @@ -25,7 +25,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c index d32497884..32e9c5506 100644 --- a/src/jtag/at91rm9200.c +++ b/src/jtag/at91rm9200.c @@ -22,7 +22,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include "bitbang.h" #include diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c index ae07a903b..75e413dcd 100644 --- a/src/jtag/bitbang.c +++ b/src/jtag/bitbang.c @@ -27,6 +27,7 @@ #include "bitbang.h" #define INCLUDE_JTAG_INTERFACE_H #include "jtag.h" +#include "interface.h" /** * Function bitbang_stableclocks diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c index 40b704b9e..b034a934e 100644 --- a/src/jtag/bitq.c +++ b/src/jtag/bitq.c @@ -23,6 +23,7 @@ #define INCLUDE_JTAG_INTERFACE_H #include "bitq.h" +#include "interface.h" bitq_interface_t* bitq_interface; /* low level bit queue interface */ diff --git a/src/jtag/dummy.c b/src/jtag/dummy.c index cc799faa9..0eab32d6f 100644 --- a/src/jtag/dummy.c +++ b/src/jtag/dummy.c @@ -22,7 +22,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include "bitbang.h" diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c index 0ac4c2f0a..55d1eeeae 100644 --- a/src/jtag/ep93xx.c +++ b/src/jtag/ep93xx.c @@ -22,7 +22,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include "bitbang.h" #define TDO_BIT 1 diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c index d177c6c2d..18ecdd030 100644 --- a/src/jtag/ft2232.c +++ b/src/jtag/ft2232.c @@ -41,7 +41,7 @@ /* project specific includes */ #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include "time_support.h" #if IS_CYGWIN == 1 diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c index ddb8a4f96..441234c19 100644 --- a/src/jtag/gw16012.c +++ b/src/jtag/gw16012.c @@ -22,7 +22,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #if 1 diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c index 33dcd618d..eaa4bba8d 100644 --- a/src/jtag/jlink.c +++ b/src/jtag/jlink.c @@ -26,7 +26,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index c8babdce9..d8b30e9f7 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -31,6 +31,7 @@ #define INCLUDE_JTAG_INTERFACE_H #include "jtag.h" #include "minidriver.h" +#include "interface.h" #ifdef HAVE_STRINGS_H #include diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index d4b9cb718..0c2f13352 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -224,8 +224,6 @@ extern void cmd_queue_free(void); extern void jtag_queue_command(jtag_command_t *cmd); extern void jtag_command_queue_reset(void); -#include "interface.h" - #endif // INCLUDE_JTAG_INTERFACE_H /* forward declaration */ diff --git a/src/jtag/jtag_driver.c b/src/jtag/jtag_driver.c index c0b9eaaa5..2319429c2 100644 --- a/src/jtag/jtag_driver.c +++ b/src/jtag/jtag_driver.c @@ -32,7 +32,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include "minidriver.h" #include "command.h" diff --git a/src/jtag/parport.c b/src/jtag/parport.c index 4bb5e7437..175a3c940 100644 --- a/src/jtag/parport.c +++ b/src/jtag/parport.c @@ -25,7 +25,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include "bitbang.h" /* -ino: 060521-1036 */ diff --git a/src/jtag/presto.c b/src/jtag/presto.c index 56543e6ab..532e798f9 100644 --- a/src/jtag/presto.c +++ b/src/jtag/presto.c @@ -26,7 +26,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.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 adb5f34f5..beef497f4 100644 --- a/src/jtag/rlink/rlink.c +++ b/src/jtag/rlink/rlink.c @@ -29,7 +29,7 @@ /* project specific includes */ #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include "rlink.h" #include "st7.h" #include "ep1_cmd.h" diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c index 6281715cc..09272866a 100644 --- a/src/jtag/usbprog.c +++ b/src/jtag/usbprog.c @@ -35,7 +35,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c index 4af92e0f3..cc2b271df 100644 --- a/src/jtag/vsllink.c +++ b/src/jtag/vsllink.c @@ -27,7 +27,7 @@ #endif #define INCLUDE_JTAG_INTERFACE_H -#include "jtag.h" +#include "interface.h" #include diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c index 73a40f2ed..4852a56f5 100644 --- a/src/jtag/zy1000.c +++ b/src/jtag/zy1000.c @@ -23,6 +23,7 @@ #define INCLUDE_JTAG_INTERFACE_H #include "embeddedice.h" #include "minidriver.h" +#include "interface.h" #include "bitbang.h" #include // low level i/o diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index 6d3559118..0ec9f4dca 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -41,7 +41,6 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "xsvf.h" #include "jtag.h"