summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-11-16 10:19:33 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-11-16 10:19:33 -0800
commit9a98e83b49fe3541cb0d79924b13c2d86484aee2 (patch)
tree1d0cec51bdc6646a04efe1066c4842b04a3a897e
parentdc1685ca25567fe75c8d50c825fb0303fbb66fac (diff)
downloadopenocd_libswd-9a98e83b49fe3541cb0d79924b13c2d86484aee2.tar.gz
openocd_libswd-9a98e83b49fe3541cb0d79924b13c2d86484aee2.tar.bz2
openocd_libswd-9a98e83b49fe3541cb0d79924b13c2d86484aee2.tar.xz
openocd_libswd-9a98e83b49fe3541cb0d79924b13c2d86484aee2.zip
target: less implicit inclusion of "etm.h"
Don't include it in more headers than necessary; just use it in the few files that actually need it. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-rw-r--r--src/target/arm11.c2
-rw-r--r--src/target/arm11_dbgtap.c1
-rw-r--r--src/target/arm7_9_common.c1
-rw-r--r--src/target/arm7_9_common.h1
-rw-r--r--src/target/armv4_5.c1
-rw-r--r--src/target/armv4_5.h2
-rw-r--r--src/target/etb.c1
-rw-r--r--src/target/etm.c1
-rw-r--r--src/target/trace.h5
9 files changed, 13 insertions, 2 deletions
diff --git a/src/target/arm11.c b/src/target/arm11.c
index e4d26931..750c1f59 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -26,10 +26,10 @@
#include "config.h"
#endif
+#include "etm.h"
#include "arm11.h"
#include "breakpoints.h"
#include "arm11_dbgtap.h"
-#include "armv4_5.h"
#include "arm_simulator.h"
#include "time_support.h"
#include "target_type.h"
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 7010eab5..bdbcc8f3 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include "arm_jtag.h"
#include "arm11_dbgtap.h"
#include "time_support.h"
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 780ccf92..27a9b8db 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -34,6 +34,7 @@
#include "embeddedice.h"
#include "target_request.h"
#include "arm7_9_common.h"
+#include "etm.h"
#include "time_support.h"
#include "arm_simulator.h"
#include "algorithm.h"
diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index e5a2bb71..266bf800 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -30,6 +30,7 @@
#define ARM7_9_COMMON_H
#include "armv4_5.h"
+#include "arm_jtag.h"
#define ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 9fa1ac09..0d890b80 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -28,6 +28,7 @@
#endif
#include "armv4_5.h"
+#include "arm_jtag.h"
#include "breakpoints.h"
#include "arm_disassembler.h"
#include "binarybuffer.h"
diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index ea46488c..ffcd7c02 100644
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -27,7 +27,7 @@
#define ARMV4_5_H
#include "target.h"
-#include "etm.h"
+#include "log.h"
typedef enum armv4_5_mode
{
diff --git a/src/target/etb.c b/src/target/etb.c
index 21c375c3..196df6c9 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -22,6 +22,7 @@
#endif
#include "armv4_5.h"
+#include "etm.h"
#include "etb.h"
#include "register.h"
diff --git a/src/target/etm.c b/src/target/etm.c
index 936c9e60..5a0ffed5 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -22,6 +22,7 @@
#endif
#include "armv4_5.h"
+#include "etm.h"
#include "etb.h"
#include "image.h"
#include "arm_disassembler.h"
diff --git a/src/target/trace.h b/src/target/trace.h
index d6fd63e4..c554c731 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -42,6 +42,11 @@ struct trace
int trace_history_overflowed;
};
+/**
+ * \todo This enum is one of the few things in this file related
+ * to *hardware* tracing ... split such "real" tracing out from
+ * the contrib/libdcc support.
+ */
typedef enum trace_status
{
TRACE_IDLE = 0x0,