From 9a98e83b49fe3541cb0d79924b13c2d86484aee2 Mon Sep 17 00:00:00 2001
From: David Brownell <dbrownell@users.sourceforge.net>
Date: Mon, 16 Nov 2009 10:19:33 -0800
Subject: [PATCH] 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>
---
 src/target/arm11.c         | 2 +-
 src/target/arm11_dbgtap.c  | 1 +
 src/target/arm7_9_common.c | 1 +
 src/target/arm7_9_common.h | 1 +
 src/target/armv4_5.c       | 1 +
 src/target/armv4_5.h       | 2 +-
 src/target/etb.c           | 1 +
 src/target/etm.c           | 1 +
 src/target/trace.h         | 5 +++++
 9 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/target/arm11.c b/src/target/arm11.c
index e4d26931c3..750c1f5902 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 7010eab5c1..bdbcc8f389 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 780ccf9273..27a9b8dbfc 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 e5a2bb7138..266bf80023 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 9fa1ac09a5..0d890b80be 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 ea46488c90..ffcd7c0290 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 21c375c35a..196df6c923 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 936c9e60f8..5a0ffed553 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 d6fd63e4ba..c554c73100 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,
-- 
2.30.2