target: less implicit inclusion of "command.h"

Lots of files still include it, often through needless
duplicate inclusion of "log.h"; sigh.

This cleans up the inclusion graph a bunch, so there are
fewer inclusion paths, but it doesn't change much otherwise.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/src/ecosboard.c b/src/ecosboard.c
index e38316cb7f6045fcf2b7db608311552a674eaa5e..95d41cb6e5f8dd57b9760dd2826500ae584b3572 100644 (file)
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -21,18 +21,15 @@
 #include "config.h"
 #endif
 
-#include "log.h"
 #include "types.h"
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
 #include "svf.h"
 #include "target.h"
-#include "flash.h"
 #include "nand.h"
 #include "pld.h"
 
-#include "command.h"
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"

diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index ad45bd5aaf655cff013ab8a206becd8b74fff0d7..0f2be3c1b86e4b156ec8e3c592fce51c44b8e8bb 100644 (file)
--- a/src/flash/at91sam3.c
+++ b/src/flash/at91sam3.c
@@ -60,7 +60,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
-#include "log.h"
 #include "types.h"
 #include "flash.h"
 #include "target.h"

diff --git a/src/helper/log.c b/src/helper/log.c
index c6906543b3b56afe29f016cc541989be7651c096..5a65c87e5c8c8b25c2603313d40042a4e6bd697d 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -27,7 +27,6 @@
 #include "config.h"
 #endif
 
-#include "log.h"
 #include "time_support.h"
 // @todo the inclusion of server.h here is a layering violation
 #include "server.h"

diff --git a/src/helper/options.c b/src/helper/options.c
index 3ffc6736e86ea6ececbbb2b1e42c897a6c58b056..e26782ff937473cde80cf5bc265b373b249356f2 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "configuration.h"
-#include "log.h"
 // @todo the inclusion of server.h here is a layering violation
 #include "server.h"
 

diff --git a/src/openocd.c b/src/openocd.c
index 234b01c2f3141f10a2e67d876de0ae23f75d3b4d..e35a0ae596a89296cb1e54c92f3ab250d2fed574 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -33,7 +33,6 @@
 #include "xsvf.h"
 #include "svf.h"
 #include "target.h"
-#include "flash.h"
 #include "nand.h"
 #include "pld.h"
 #include "mflash.h"

diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c
index 46cd5587311fb116dc43db806d5f5cafefe7fe27..120d5b927331e300aa7588d6512579fc86451d67 100644 (file)
--- a/src/target/arm_simulator.c
+++ b/src/target/arm_simulator.c
@@ -27,7 +27,6 @@
 #include "armv4_5.h"
 #include "arm_disassembler.h"
 #include "arm_simulator.h"
-#include "log.h"
 #include "binarybuffer.h"
 
 

diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index 83b38b6510bcaba933db9f67f7ec82e06fce9ef5..6c0b881ad69041446f19b0b369cb9df82c64eb31 100644 (file)
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -28,7 +28,6 @@
 
 #include "register.h"
 #include "target.h"
-#include "log.h"
 #include "etm.h"
 
 typedef enum armv4_5_mode

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index c94d3b0f3b8aea6c76dd520db8dbf461f1fa825d..7b33053da491bc55258d9b4cadfdca8cb8899a90 100644 (file)
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -27,7 +27,6 @@
 
 #include "target.h"
 #include "register.h"
-#include "log.h"
 #include "binarybuffer.h"
 #include "command.h"
 

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 5cdffd864a74f5165e485fecdbf2f2620289bd8b..625c3a9ae92666038933a8b3877617b31280e01c 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -21,7 +21,6 @@
 
 #include "register.h"
 #include "target.h"
-#include "log.h"
 #include "arm_adi_v5.h"
 #include "armv4_5.h"
 #include "armv4_5_mmu.h"

diff --git a/src/target/target.h b/src/target/target.h
index 75bc4f0223e5603dd9af4389b427334cc61ca7a2..51fb299cf66ef444dbaadf350e910f0810b533c2 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -27,8 +27,8 @@
 #define TARGET_H
 
 #include <stddef.h>
-
-#include "command.h"
+#include "types.h"
+#include "jim.h"
 
 struct reg;
 struct trace;
@@ -230,7 +230,7 @@ enum target_event
 
 struct target_event_action {
        enum target_event event;
-       Jim_Obj *body;
+       struct Jim_Obj *body;
        int has_percent;
        struct target_event_action *next;
  };