Menu
▾
▴
[Openocd-svn] r2029 - in trunk/src/jtag: . rlink
|
From: <zw...@ma...> - 2009-06-03 08:29:34
|
Author: zwelch
Date: 2009-06-03 08:29:09 +0200 (Wed, 03 Jun 2009)
New Revision: 2029
Modified:
trunk/src/jtag/amt_jtagaccel.c
trunk/src/jtag/arm-jtag-ew.c
trunk/src/jtag/at91rm9200.c
trunk/src/jtag/bitbang.c
trunk/src/jtag/bitq.c
trunk/src/jtag/bitq.h
trunk/src/jtag/dummy.c
trunk/src/jtag/ep93xx.c
trunk/src/jtag/ft2232.c
trunk/src/jtag/gw16012.c
trunk/src/jtag/jlink.c
trunk/src/jtag/jtag.c
trunk/src/jtag/jtag.h
trunk/src/jtag/jtag_driver.c
trunk/src/jtag/minidriver.h
trunk/src/jtag/parport.c
trunk/src/jtag/presto.c
trunk/src/jtag/rlink/rlink.c
trunk/src/jtag/usbprog.c
trunk/src/jtag/vsllink.c
trunk/src/jtag/zy1000.c
Log:
Finish JTAG header file modularization; command factoring follows.
Modified: trunk/src/jtag/amt_jtagaccel.c
===================================================================
--- trunk/src/jtag/amt_jtagaccel.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/amt_jtagaccel.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -21,8 +21,8 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
+#include "commands.h"
#if PARPORT_USE_PPDEV == 1
Modified: trunk/src/jtag/arm-jtag-ew.c
===================================================================
--- trunk/src/jtag/arm-jtag-ew.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/arm-jtag-ew.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -24,8 +24,8 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
+#include "commands.h"
#include <usb.h>
Modified: trunk/src/jtag/at91rm9200.c
===================================================================
--- trunk/src/jtag/at91rm9200.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/at91rm9200.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -21,7 +21,6 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
#include "bitbang.h"
Modified: trunk/src/jtag/bitbang.c
===================================================================
--- trunk/src/jtag/bitbang.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/bitbang.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -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
Modified: trunk/src/jtag/bitq.c
===================================================================
--- trunk/src/jtag/bitq.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/bitq.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -21,7 +21,6 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "bitq.h"
#include "interface.h"
Modified: trunk/src/jtag/bitq.h
===================================================================
--- trunk/src/jtag/bitq.h 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/bitq.h 2009-06-03 06:29:09 UTC (rev 2029)
@@ -20,7 +20,7 @@
#ifndef BITQ_H
#define BITQ_H
-#include "jtag.h"
+#include "commands.h"
typedef struct bitq_interface_s
{
Modified: trunk/src/jtag/dummy.c
===================================================================
--- trunk/src/jtag/dummy.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/dummy.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -21,7 +21,6 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
#include "bitbang.h"
Modified: trunk/src/jtag/ep93xx.c
===================================================================
--- trunk/src/jtag/ep93xx.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/ep93xx.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -21,7 +21,6 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
#include "bitbang.h"
Modified: trunk/src/jtag/ft2232.c
===================================================================
--- trunk/src/jtag/ft2232.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/ft2232.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -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
Modified: trunk/src/jtag/gw16012.c
===================================================================
--- trunk/src/jtag/gw16012.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/gw16012.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -21,8 +21,8 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
+#include "commands.h"
#if 1
Modified: trunk/src/jtag/jlink.c
===================================================================
--- trunk/src/jtag/jlink.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/jlink.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -25,8 +25,8 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
+#include "commands.h"
#include <usb.h>
Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/jtag.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -28,7 +28,6 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include "minidriver.h"
#include "interface.h"
Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/jtag.h 2009-06-03 06:29:09 UTC (rev 2029)
@@ -552,10 +552,6 @@
*/
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);
Modified: trunk/src/jtag/jtag_driver.c
===================================================================
--- trunk/src/jtag/jtag_driver.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/jtag_driver.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -31,7 +31,6 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
#include "minidriver.h"
#include "command.h"
Modified: trunk/src/jtag/minidriver.h
===================================================================
--- trunk/src/jtag/minidriver.h 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/minidriver.h 2009-06-03 06:29:09 UTC (rev 2029)
@@ -68,6 +68,8 @@
#else
+#include "commands.h"
+
static inline void interface_jtag_alloc_in_value32(scan_field_t *field)
{
field->in_value = (u8 *)cmd_queue_alloc(4);
Modified: trunk/src/jtag/parport.c
===================================================================
--- trunk/src/jtag/parport.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/parport.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -24,7 +24,6 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
#include "bitbang.h"
Modified: trunk/src/jtag/presto.c
===================================================================
--- trunk/src/jtag/presto.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/presto.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -25,7 +25,6 @@
#include "windows.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
#include "time_support.h"
#include "bitq.h"
Modified: trunk/src/jtag/rlink/rlink.c
===================================================================
--- trunk/src/jtag/rlink/rlink.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/rlink/rlink.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -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"
Modified: trunk/src/jtag/usbprog.c
===================================================================
--- trunk/src/jtag/usbprog.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/usbprog.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -34,8 +34,8 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
+#include "commands.h"
#include <usb.h>
Modified: trunk/src/jtag/vsllink.c
===================================================================
--- trunk/src/jtag/vsllink.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/vsllink.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -26,8 +26,8 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "interface.h"
+#include "commands.h"
#include <usb.h>
Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c 2009-06-03 06:27:57 UTC (rev 2028)
+++ trunk/src/jtag/zy1000.c 2009-06-03 06:29:09 UTC (rev 2029)
@@ -20,7 +20,6 @@
#include "config.h"
#endif
-#define INCLUDE_JTAG_INTERFACE_H
#include "embeddedice.h"
#include "minidriver.h"
#include "interface.h"
|
