diff options
-rw-r--r-- | src/jtag/amt_jtagaccel.c | 2 | ||||
-rw-r--r-- | src/jtag/arm-jtag-ew.c | 2 | ||||
-rw-r--r-- | src/jtag/at91rm9200.c | 1 | ||||
-rw-r--r-- | src/jtag/bitbang.c | 3 | ||||
-rw-r--r-- | src/jtag/bitq.c | 1 | ||||
-rw-r--r-- | src/jtag/bitq.h | 2 | ||||
-rw-r--r-- | src/jtag/dummy.c | 1 | ||||
-rw-r--r-- | src/jtag/ep93xx.c | 1 | ||||
-rw-r--r-- | src/jtag/ft2232.c | 2 | ||||
-rw-r--r-- | src/jtag/gw16012.c | 2 | ||||
-rw-r--r-- | src/jtag/jlink.c | 2 | ||||
-rw-r--r-- | src/jtag/jtag.c | 1 | ||||
-rw-r--r-- | src/jtag/jtag.h | 4 | ||||
-rw-r--r-- | src/jtag/jtag_driver.c | 1 | ||||
-rw-r--r-- | src/jtag/minidriver.h | 2 | ||||
-rw-r--r-- | src/jtag/parport.c | 1 | ||||
-rw-r--r-- | src/jtag/presto.c | 1 | ||||
-rw-r--r-- | src/jtag/rlink/rlink.c | 2 | ||||
-rw-r--r-- | src/jtag/usbprog.c | 2 | ||||
-rw-r--r-- | src/jtag/vsllink.c | 2 | ||||
-rw-r--r-- | 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 39fed2cc..b19fae17 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 e90c740b..ebe60d97 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 <usb.h> diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c index 32e9c550..d0d16448 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 75e413dc..9f7c14cd 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 b034a934..c319ed81 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 2ee3f6b6..6b441bf5 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 0eab32d6..9d4a436b 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 55d1eeea..e4daa7e6 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 b6b812d9..95a28117 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 441234c1..a89a5f7e 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 eaa4bba8..f7b8d622 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 <usb.h> diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index d8b30e9f..8eef69e8 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 bc9470e1..04eefaad 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 2319429c..70d0f837 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 7e9589d4..83230cd1 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 175a3c94..51442304 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 532e798f..3bac4a95 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 beef497f..f47e189c 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 09272866..487e9b16 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 <usb.h> diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c index cc2b271d..e703a35a 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 <usb.h> diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c index 4852a56f..2cdd2fdc 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" |