Don't include <helper/jim.h> from target.h ... not everything
which touches targets needs to be able to talk to Jim. Also,
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 strategy helps prevent the growth
of problematic layering by minimizing entanglement.
---
src/target/target.c | 5 +++--
src/target/target.h | 3 +--
src/target/target_request.c | 5 +++--
src/target/testee.c | 4 +++-
4 files changed, 10 insertions(+), 7 deletions(-)
--- 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);
--- 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;
--- 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;
--- 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[] = {
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
