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>

diff --git a/src/target/arm11.c b/src/target/arm11.c
index e4d26931c3a738efacccb1b8a7540a794a46d3a9..750c1f5902dce37873815e5ee6b8a12f98a7cf43 100644 (file)
--- 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 7010eab5c19efca222a3bc82205b956e533139a5..bdbcc8f3890ecdf921aaeebd137031fe0d5c7d3d 100644 (file)
--- 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 780ccf9273d9616ffd0899f2209a5c8b96d54f50..27a9b8dbfc565a2911b98cdbfcfb11f417dd3823 100644 (file)
--- 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 e5a2bb71385542b76f61e1bcd0b835b8a8927004..266bf800234a3bce150252770ff9761b89c34567 100644 (file)
--- 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 9fa1ac09a5a1982436a55e828d5c0653d5844e0a..0d890b80be9532609f18e9d941ebddfadc9f646c 100644 (file)
--- 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 ea46488c90e838a4cd3a7523e53b232af522c3c7..ffcd7c029061e798166606e03bc8c3416ba4f0c6 100644 (file)
--- 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 21c375c35a1d28a35275710251116f016fb36178..196df6c9232e0b2557276cf032194809a0677b03 100644 (file)
--- 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 936c9e60f8e20692f1116927b99647997b64b4d9..5a0ffed553c512ba73a952a965c4119bdb84e19d 100644 (file)
--- 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 d6fd63e4ba9a33d5c5beda14c4f7152f7125b0db..c554c731000459a6282a6e9db88c71ed8eb7677d 100644 (file)
--- 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,