From 1186f7efa72a86a7000dce60b090bd4f822cdceb Mon Sep 17 00:00:00 2001 From: David Brownell Date: Mon, 16 Nov 2009 00:35:11 -0800 Subject: [PATCH] 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 --- src/ecosboard.c | 3 --- src/flash/at91sam3.c | 1 - src/helper/log.c | 1 - src/helper/options.c | 1 - src/openocd.c | 1 - src/target/arm_simulator.c | 1 - src/target/armv4_5.h | 1 - src/target/armv7a.c | 1 - src/target/armv7a.h | 1 - src/target/target.h | 6 +++--- 10 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/ecosboard.c b/src/ecosboard.c index e38316cb7f..95d41cb6e5 100644 --- 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 ad45bd5aaf..0f2be3c1b8 100644 --- a/src/flash/at91sam3.c +++ b/src/flash/at91sam3.c @@ -60,7 +60,6 @@ #include #include #include -#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 c6906543b3..5a65c87e5c 100644 --- 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 3ffc6736e8..e26782ff93 100644 --- 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 234b01c2f3..e35a0ae596 100644 --- 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 46cd558731..120d5b9273 100644 --- 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 83b38b6510..6c0b881ad6 100644 --- 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 c94d3b0f3b..7b33053da4 100644 --- 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 5cdffd864a..625c3a9ae9 100644 --- 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 75bc4f0223..51fb299cf6 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -27,8 +27,8 @@ #define TARGET_H #include - -#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; }; -- 2.30.2