Finish JTAG header file modularization; command factoring follows.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2029 b42882b7-edfa-0310-969c-e2dbd0fdcd60

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

diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c
index 32e9c55062fcabf561a0ce77b4967df1fbe9cfae..d0d1644875a2a613a76def6808ec945b7670b469 100644 (file)
--- 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 75e413dcd1c9628ac063440f0a4acdb4fd66b807..9f7c14cdad8317bb0930f77c25c5474884cdcd68 100644 (file)
--- 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 b034a934ee74eefb4f08901bed629705ff2b1e01..c319ed8148d77f9829fe51186639385c99c85e90 100644 (file)
--- 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 2ee3f6b66e9a309917d0da6ab231b9658272c5ca..6b441bf587b718faecde25319bd13688bd93bca7 100644 (file)
--- 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 0eab32d6f1b421cf546ee6535945459aaf2d5c16..9d4a436b597dfc8da0e04e2c5af9ece950c92706 100644 (file)
--- 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 55d1eeeaed8b4f0f055fb3a767b2b25c14e9929d..e4daa7e6a82a0327c5a6b08de172b771bf45160a 100644 (file)
--- 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 b6b812d90e84de915bfdc7a82c3e5bdb9b976947..95a28117090cf492763b996021664686a7582605 100644 (file)
--- 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 441234c19b24c9785fc49b0cba605139e895b74f..a89a5f7e3212143ba6251936e0948ca61ee01e6b 100644 (file)
--- 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 eaa4bba8d38ca61cd8adbeb545b1b8ce61af6af8..f7b8d6220ec4e1202c7b32724dc1ad08628d4ece 100644 (file)
--- 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 <usb.h>
 

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index d8b30e9f70d541d706972ec99698f4061ffd6353..8eef69e800f1d13ddbe69567dbc978009d042109 100644 (file)
--- 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 bc9470e1bb84769934595f7ccd38a6e2534b3584..04eefaadb38e251b0e0bced471f475d71401fe92 100644 (file)
--- 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 2319429c2628fc4b473bb5afcd459cc18a99dbd3..70d0f83755b88ea8f8180f64bd5ce6dc4db1efbf 100644 (file)
--- 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 7e9589d45613b46a22b8addb158ead111ba893f2..83230cd16f1b04e1a6248f872d43948066583388 100644 (file)
--- 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 175a3c940feb9f1ead30d57953eea8236a59aa88..51442304c959d725759b0d192bbb5e0346926a94 100644 (file)
--- 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 532e798f967ca361228a73b91d220602a912a657..3bac4a9553b7b2b57f19b3a71a8d19fe534459a2 100644 (file)
--- 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 beef497f45e8d4ba4ff765b3062106e0aeb1e404..f47e189c3bfe97bbdc983e6e8bef1059ae104224 100644 (file)
--- 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 09272866a79e6e85c764e73cec750c8636b6a8f1..487e9b1611d83e1fd7911e947bd493b398838a47 100644 (file)
--- 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 <usb.h>
 

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

diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c
index 4852a56f56ca9cc056446d3a2f9403c0266ccf91..2cdd2fdc23bdfe3b069db02b03b7789233a974e1 100644 (file)
--- 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"