target: further shrink Jim-awareness

Don't include <helper/jim.h> from target.h ... not everything
which touches targets needs to be able to talk to Jim.  Plus,
most files include this header by another path.

Also, switch the affected files to use the classic sequence
for #included files:  all <framework/headers.h> first, then
the "local_headers.h".  This helps prevent growth of problematic
layering, by minimizing entanglement.

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

diff --git a/src/target/target.c b/src/target/target.c
index 70130d9127d68fe59c7f3267066d410ea5501a22..740db0f189200195a2e461fe3c016c6d64652dd7 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -33,15 +33,16 @@
 #include "config.h"
 #endif
 
+#include <helper/time_support.h>
+#include <jtag/jtag.h>
+
 #include "target.h"
 #include "target_type.h"
 #include "target_request.h"
 #include "breakpoints.h"
-#include <helper/time_support.h>
 #include "register.h"
 #include "trace.h"
 #include "image.h"
-#include <jtag/jtag.h>
 
 
 static int target_array2mem(Jim_Interp *interp, struct target *target, int argc, Jim_Obj *const *argv);

diff --git a/src/target/target.h b/src/target/target.h
index fededb95651890dff987417a4a5ae43f711f9306..4151c228b6b0479b9cdb1ea0c835803bac38bbd1 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -27,7 +27,6 @@
 #define TARGET_H
 
 #include <helper/types.h>
-#include <helper/jim.h>
 
 struct reg;
 struct trace;
@@ -214,7 +213,7 @@ enum target_event
 
 struct target_event_action {
        enum target_event event;
-       Jim_Interp *interp;
+       struct Jim_Interp *interp;
        struct Jim_Obj *body;
        int has_percent;
        struct target_event_action *next;

diff --git a/src/target/target_request.c b/src/target/target_request.c
index fc0ba1ac0a615955042eac099d58a8fe25249498..d22b8a2b9e7447cabd838bc008e2531f309176f9 100644 (file)
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -27,12 +27,13 @@
 #include "config.h"
 #endif
 
+#include <helper/log.h>
+#include <helper/binarybuffer.h>
+
 #include "target.h"
 #include "target_request.h"
 #include "target_type.h"
-#include <helper/binarybuffer.h>
 #include "trace.h"
-#include <helper/log.h>
 
 
 static int charmsg_mode = 0;

diff --git a/src/target/testee.c b/src/target/testee.c
index 991c64e85f4cffef1524c7095cfefa7b65126070..280111a434e0ca2ffc2f6eed575e60ba893a6c93 100644 (file)
--- a/src/target/testee.c
+++ b/src/target/testee.c
@@ -20,9 +20,11 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include <helper/log.h>
+
 #include "target.h"
 #include "target_type.h"
-#include <helper/log.h>
 #include "hello.h"
 
 static const struct command_registration testee_command_handlers[] = {