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.
---
 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(-)

--- 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"
--- 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"
--- 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"
--- 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"
 
--- 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"
--- 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"
 
 
--- 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
--- 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"
 
--- 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"
--- 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;
  };
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to