Menu
▾
▴
[Openocd-svn] r1984 - in trunk/src: jtag jtag/rlink xsvf
|
From: <zw...@ma...> - 2009-06-02 01:01:52
|
Author: zwelch
Date: 2009-06-02 01:01:24 +0200 (Tue, 02 Jun 2009)
New Revision: 1984
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/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/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
trunk/src/xsvf/xsvf.c
Log:
Encapsulate JTAG Cable API and interface structure, plan for new header file.
Modified: trunk/src/jtag/amt_jtagaccel.c
===================================================================
--- trunk/src/jtag/amt_jtagaccel.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/amt_jtagaccel.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -21,6 +21,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
Modified: trunk/src/jtag/arm-jtag-ew.c
===================================================================
--- trunk/src/jtag/arm-jtag-ew.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/arm-jtag-ew.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include <usb.h>
Modified: trunk/src/jtag/at91rm9200.c
===================================================================
--- trunk/src/jtag/at91rm9200.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/at91rm9200.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -21,6 +21,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include "bitbang.h"
Modified: trunk/src/jtag/bitbang.c
===================================================================
--- trunk/src/jtag/bitbang.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/bitbang.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -25,6 +25,7 @@
#endif
#include "bitbang.h"
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
/**
Modified: trunk/src/jtag/bitq.c
===================================================================
--- trunk/src/jtag/bitq.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/bitq.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -21,6 +21,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "bitq.h"
Modified: trunk/src/jtag/dummy.c
===================================================================
--- trunk/src/jtag/dummy.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/dummy.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -21,6 +21,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include "bitbang.h"
Modified: trunk/src/jtag/ep93xx.c
===================================================================
--- trunk/src/jtag/ep93xx.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/ep93xx.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -21,6 +21,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include "bitbang.h"
Modified: trunk/src/jtag/ft2232.c
===================================================================
--- trunk/src/jtag/ft2232.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/ft2232.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -40,6 +40,7 @@
#endif
/* project specific includes */
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include "time_support.h"
Modified: trunk/src/jtag/gw16012.c
===================================================================
--- trunk/src/jtag/gw16012.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/gw16012.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -21,6 +21,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
Modified: trunk/src/jtag/jlink.c
===================================================================
--- trunk/src/jtag/jlink.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/jlink.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -25,6 +25,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include <usb.h>
Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/jtag.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -29,6 +29,7 @@
#endif
#define INCLUDE_JTAG_MINIDRIVER_H
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#ifdef HAVE_STRINGS_H
Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/jtag.h 2009-06-01 23:01:24 UTC (rev 1984)
@@ -105,6 +105,8 @@
//extern tap_transition_t tap_transitions[16]; /* describe the TAP state diagram */
+#ifdef INCLUDE_JTAG_INTERFACE_H
+
/*-----<Cable Helper API>-------------------------------------------*/
/* The "Cable Helper API" is what the cable drivers can use to help implement
@@ -254,7 +256,9 @@
/*-----</Cable Helper API>------------------------------------------*/
+#endif // INCLUDE_JTAG_INTERFACE_H
+
extern tap_state_t cmd_queue_end_state; /* finish DR scans in dr_end_state */
extern tap_state_t cmd_queue_cur_state; /* current TAP state */
@@ -428,6 +432,8 @@
LINE_PUSH_PULL = 0x1,
};
+#ifdef INCLUDE_JTAG_INTERFACE_H
+
typedef struct jtag_interface_s
{
char* name;
@@ -477,6 +483,8 @@
int (*srst_asserted)(int* srst_asserted);
} jtag_interface_t;
+#endif // INCLUDE_JTAG_INTERFACE_H
+
enum jtag_event {
JTAG_TRST_ASSERTED
};
Modified: trunk/src/jtag/parport.c
===================================================================
--- trunk/src/jtag/parport.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/parport.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include "bitbang.h"
Modified: trunk/src/jtag/presto.c
===================================================================
--- trunk/src/jtag/presto.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/presto.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -25,6 +25,7 @@
#include "windows.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include "time_support.h"
#include "bitq.h"
Modified: trunk/src/jtag/rlink/rlink.c
===================================================================
--- trunk/src/jtag/rlink/rlink.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/rlink/rlink.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -28,6 +28,7 @@
#endif
/* project specific includes */
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include "rlink.h"
#include "st7.h"
Modified: trunk/src/jtag/usbprog.c
===================================================================
--- trunk/src/jtag/usbprog.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/usbprog.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -34,6 +34,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include <usb.h>
Modified: trunk/src/jtag/vsllink.c
===================================================================
--- trunk/src/jtag/vsllink.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/vsllink.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -26,6 +26,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h"
#include <usb.h>
Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/jtag/zy1000.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -21,6 +21,7 @@
#endif
#define INCLUDE_JTAG_MINIDRIVER_H
+#define INCLUDE_JTAG_INTERFACE_H
#include "embeddedice.h"
#include "bitbang.h"
Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c 2009-06-01 22:54:42 UTC (rev 1983)
+++ trunk/src/xsvf/xsvf.c 2009-06-01 23:01:24 UTC (rev 1984)
@@ -41,6 +41,7 @@
#include "config.h"
#endif
+#define INCLUDE_JTAG_INTERFACE_H
#include "xsvf.h"
#include "jtag.h"
|
