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

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index 694a4a7c75bbaae97dab760c2a58ed56695bec26..39fed2cc25fb66fa405a0d5d47a73fc2c7e9e62a 100644 (file)
--- 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 4dc854ac13d77a929c8d8f33776a91ee052ecae4..e90c740b42d02d370a7ef26664533e690f266471 100644 (file)
--- 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 <usb.h>
 
 

diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c
index d324978845fde7bde529d1f7a7027f36370f2e70..32e9c55062fcabf561a0ce77b4967df1fbe9cfae 100644 (file)
--- 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 <sys/mman.h>

diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c
index ae07a903b1ccd11613d5d61ead6cad15dd99a41a..75e413dcd1c9628ac063440f0a4acdb4fd66b807 100644 (file)
--- 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 40b704b9ed04f8d5b396af094f09a81395eed4da..b034a934ee74eefb4f08901bed629705ff2b1e01 100644 (file)
--- 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 cc799faa9478a1f55b4d564ad91c3b7ddc183728..0eab32d6f1b421cf546ee6535945459aaf2d5c16 100644 (file)
--- 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 0ac4c2f0ab8a698b47cb849d771317ba9236a4f1..55d1eeeaed8b4f0f055fb3a767b2b25c14e9929d 100644 (file)
--- 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 d177c6c2ddcd06c83c4188857fcc9998290cd1a1..18ecdd030f14a695c4aaff0d3596bd9dbcb3b970 100644 (file)
--- 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 ddb8a4f96c538b327a25a68810d04ad9a9b60514..441234c19b24c9785fc49b0cba605139e895b74f 100644 (file)
--- 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 33dcd618dc246698d9c6a385dbae8c2dee8da709..eaa4bba8d38ca61cd8adbeb545b1b8ce61af6af8 100644 (file)
--- 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 <usb.h>
 

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index c8babdce96bdd2d7adb29c95540a2e8d563526ee..d8b30e9f70d541d706972ec99698f4061ffd6353 100644 (file)
--- 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 <strings.h>

diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index d4b9cb718442b6932e820fb7e7ff5b297b2c128f..0c2f1335211fdbf2aac8ace2786dbd91b1e1eff8 100644 (file)
--- 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 c0b9eaaa58337a21303dd82db16100c939a36954..2319429c2628fc4b473bb5afcd459cc18a99dbd3 100644 (file)
--- 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 4bb5e7437c710ad7952f14f2f0af93c782812a52..175a3c940feb9f1ead30d57953eea8236a59aa88 100644 (file)
--- 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 56543e6ab8033459bf091899a9000279f5f55fdf..532e798f967ca361228a73b91d220602a912a657 100644 (file)
--- 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 adb5f34f542618458469a2216668df10dd1d4e16..beef497f45e8d4ba4ff765b3062106e0aeb1e404 100644 (file)
--- 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 6281715cc2d81b166b45e6983f653b54ec1a6aa9..09272866a79e6e85c764e73cec750c8636b6a8f1 100644 (file)
--- 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 <usb.h>
 

diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index 4af92e0f3059bee266f88125204b56437aca7f93..cc2b271dfa2e612fd9b193b3a769cc2aa6b66d67 100644 (file)
--- 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 <usb.h>
 

diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c
index 73a40f2ed8c5910b1ec3efd0f11cb1d6e7230100..4852a56f56ca9cc056446d3a2f9403c0266ccf91 100644 (file)
--- 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 <cyg/hal/hal_io.h>             // low level i/o

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 6d355911810f3994a33bf7dd177ae15d70ffbee8..0ec9f4dca23a37a1498094f09da8abbc70e29a22 100644 (file)
--- 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"