Menu
▾
▴
openocd-commit
|
From: David B. <dbr...@us...> - 2009-12-13 21:54:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 6f929dbd93e1b2c0373f389060bf64e60e8194ab (commit)
via 38e376d232ecb3d6a436a20c09019d1a13b0d42b (commit)
from 0a9d7cab6d76d1203d46e51140ad97d0b5cace56 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6f929dbd93e1b2c0373f389060bf64e60e8194ab
Author: David Brownell <dbr...@us...>
Date: Sun Dec 13 12:52:23 2009 -0800
target files shouldn't #include <target/...h>
Make these ".h" files adopt the same policy the ".c" files already
follow: don't use <subsystem/...h> syntax for private interfaces.
If we ever get reviewed/supported "public" interfaces they should
come exclusively from some include/... directory; that'll be the
time to switch to <...> syntax for any subsystem's own interfaces.
Signed-off-by: David Brownell <dbr...@us...>
diff --git a/src/target/arm.h b/src/target/arm.h
index 36763b4..988266e 100644
--- a/src/target/arm.h
+++ b/src/target/arm.h
@@ -26,8 +26,8 @@
#ifndef ARM_H
#define ARM_H
-#include <target/target.h>
#include <helper/command.h>
+#include "target.h"
/**
diff --git a/src/target/arm11.h b/src/target/arm11.h
index bce5bd9..dd2f3a2 100644
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -23,8 +23,8 @@
#ifndef ARM11_H
#define ARM11_H
-#include <target/arm.h>
-#include <target/arm_dpm.h>
+#include "arm.h"
+#include "arm_dpm.h"
#define ARM11_TAP_DEFAULT TAP_INVALID
diff --git a/src/target/arm11_dbgtap.h b/src/target/arm11_dbgtap.h
index 7f87e3a..45052b9 100644
--- a/src/target/arm11_dbgtap.h
+++ b/src/target/arm11_dbgtap.h
@@ -1,7 +1,7 @@
#ifndef ARM11_DBGTAP_H
#define ARM11_DBGTAP_H
-#include <target/arm11.h>
+#include "arm11.h"
/* ARM11 internals */
diff --git a/src/target/arm720t.h b/src/target/arm720t.h
index b13cff8..f0ab444 100644
--- a/src/target/arm720t.h
+++ b/src/target/arm720t.h
@@ -20,8 +20,8 @@
#ifndef ARM720T_H
#define ARM720T_H
-#include <target/arm7tdmi.h>
-#include <target/armv4_5_mmu.h>
+#include "arm7tdmi.h"
+#include "armv4_5_mmu.h"
#define ARM720T_COMMON_MAGIC 0xa720a720
diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index bce17ef..021238e 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -29,8 +29,8 @@
#ifndef ARM7_9_COMMON_H
#define ARM7_9_COMMON_H
-#include <target/arm.h>
-#include <target/arm_jtag.h>
+#include "arm.h"
+#include "arm_jtag.h"
#define ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */
diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index ce771e2..b6bbe59 100644
--- a/src/target/arm7tdmi.h
+++ b/src/target/arm7tdmi.h
@@ -23,7 +23,7 @@
#ifndef ARM7TDMI_H
#define ARM7TDMI_H
-#include <target/embeddedice.h>
+#include "embeddedice.h"
int arm7tdmi_init_arch_info(struct target *target,
struct arm7_9_common *arm7_9, struct jtag_tap *tap);
diff --git a/src/target/arm920t.h b/src/target/arm920t.h
index 0eb14fc..a75f01a 100644
--- a/src/target/arm920t.h
+++ b/src/target/arm920t.h
@@ -20,8 +20,8 @@
#ifndef ARM920T_H
#define ARM920T_H
-#include <target/arm9tdmi.h>
-#include <target/armv4_5_mmu.h>
+#include "arm9tdmi.h"
+#include "armv4_5_mmu.h"
#define ARM920T_COMMON_MAGIC 0xa920a920
diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 604ab08..274733b 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -20,8 +20,8 @@
#ifndef ARM926EJS_H
#define ARM926EJS_H
-#include <target/arm9tdmi.h>
-#include <target/armv4_5_mmu.h>
+#include "arm9tdmi.h"
+#include "armv4_5_mmu.h"
#define ARM926EJS_COMMON_MAGIC 0xa926a926
diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index 6c16970..24dcec3 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -23,7 +23,7 @@
#ifndef ARM966E_H
#define ARM966E_H
-#include <target/arm9tdmi.h>
+#include "arm9tdmi.h"
#define ARM966E_COMMON_MAGIC 0x20f920f9
diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index ea43690..aff9fc5 100644
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -23,7 +23,7 @@
#ifndef ARM9TDMI_H
#define ARM9TDMI_H
-#include <target/embeddedice.h>
+#include "embeddedice.h"
int arm9tdmi_init_target(struct command_context *cmd_ctx,
struct target *target);
diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index c268f96..a78193c 100644
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -23,7 +23,7 @@
#ifndef ARM_ADI_V5_H
#define ARM_ADI_V5_H
-#include <target/arm_jtag.h>
+#include "arm_jtag.h"
#define DAP_IR_DPACC 0xA
#define DAP_IR_APACC 0xB
diff --git a/src/target/armv4_5_mmu.h b/src/target/armv4_5_mmu.h
index 428a373..6b9ed34 100644
--- a/src/target/armv4_5_mmu.h
+++ b/src/target/armv4_5_mmu.h
@@ -20,7 +20,7 @@
#ifndef ARMV4_5_MMU_H
#define ARMV4_5_MMU_H
-#include <target/armv4_5_cache.h>
+#include "armv4_5_cache.h"
struct target;
diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 663e5d9..581813a 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -19,11 +19,11 @@
#ifndef ARMV7A_H
#define ARMV7A_H
-#include <target/arm_adi_v5.h>
-#include <target/arm.h>
-#include <target/armv4_5_mmu.h>
-#include <target/armv4_5_cache.h>
-#include <target/arm_dpm.h>
+#include "arm_adi_v5.h"
+#include "arm.h"
+#include "armv4_5_mmu.h"
+#include "armv4_5_cache.h"
+#include "arm_dpm.h"
enum
{
diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 07090b4..ac559b9 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -26,8 +26,8 @@
#ifndef ARMV7M_COMMON_H
#define ARMV7M_COMMON_H
-#include <target/arm_adi_v5.h>
-#include <target/arm.h>
+#include "arm_adi_v5.h"
+#include "arm.h"
/* define for enabling armv7 gdb workarounds */
#if 1
diff --git a/src/target/cortex_a8.h b/src/target/cortex_a8.h
index 82a34a7..cc2e009 100644
--- a/src/target/cortex_a8.h
+++ b/src/target/cortex_a8.h
@@ -29,7 +29,7 @@
#ifndef CORTEX_A8_H
#define CORTEX_A8_H
-#include <target/armv7a.h>
+#include "armv7a.h"
#define CORTEX_A8_COMMON_MAGIC 0x411fc082
diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h
index c31c3f5..7ce8901 100644
--- a/src/target/cortex_m3.h
+++ b/src/target/cortex_m3.h
@@ -26,7 +26,7 @@
#ifndef CORTEX_M3_H
#define CORTEX_M3_H
-#include <target/armv7m.h>
+#include "armv7m.h"
#define CORTEX_M3_COMMON_MAGIC 0x1A451A45
diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 693391c..cd48ce6 100644
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -26,7 +26,7 @@
#ifndef EMBEDDED_ICE_H
#define EMBEDDED_ICE_H
-#include <target/arm7_9_common.h>
+#include "arm7_9_common.h"
enum
{
diff --git a/src/target/etm.h b/src/target/etm.h
index 5aea657..5b4d5e1 100644
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -23,8 +23,8 @@
#ifndef ETM_H
#define ETM_H
-#include <target/trace.h>
-#include <target/arm_jtag.h>
+#include "trace.h"
+#include "arm_jtag.h"
struct image;
diff --git a/src/target/etm_dummy.h b/src/target/etm_dummy.h
index 95980f8..2673e4f 100644
--- a/src/target/etm_dummy.h
+++ b/src/target/etm_dummy.h
@@ -20,7 +20,7 @@
#ifndef ETM_DUMMY_H
#define ETM_DUMMY_H
-#include <target/etm.h>
+#include "etm.h"
extern struct etm_capture_driver etm_dummy_capture_driver;
diff --git a/src/target/mips32.h b/src/target/mips32.h
index 98186af..7d1928e 100644
--- a/src/target/mips32.h
+++ b/src/target/mips32.h
@@ -23,8 +23,8 @@
#ifndef MIPS32_H
#define MIPS32_H
-#include <target/target.h>
-#include <target/mips32_pracc.h>
+#include "target.h"
+#include "mips32_pracc.h"
#define MIPS32_COMMON_MAGIC 0xB320B320
diff --git a/src/target/mips32_dmaacc.h b/src/target/mips32_dmaacc.h
index e614c12..c1aa07d 100644
--- a/src/target/mips32_dmaacc.h
+++ b/src/target/mips32_dmaacc.h
@@ -25,7 +25,7 @@
#ifndef MIPS32_DMAACC_H
#define MIPS32_DMAACC_H
-#include <target/mips_ejtag.h>
+#include "mips_ejtag.h"
#define EJTAG_CTRL_DMA_BYTE 0x00000000
#define EJTAG_CTRL_DMA_HALFWORD 0x00000080
diff --git a/src/target/mips32_pracc.h b/src/target/mips32_pracc.h
index eceea5d..5d1cf3d 100644
--- a/src/target/mips32_pracc.h
+++ b/src/target/mips32_pracc.h
@@ -22,7 +22,7 @@
#ifndef MIPS32_PRACC_H
#define MIPS32_PRACC_H
-#include <target/mips_ejtag.h>
+#include "mips_ejtag.h"
#define MIPS32_PRACC_TEXT 0xFF200200
//#define MIPS32_PRACC_STACK 0xFF2FFFFC
diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index ae3a5df..b9615bc 100644
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -22,6 +22,7 @@
#endif
#include "arm.h"
+#include "etm.h"
#include "oocd_trace.h"
/*
diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
index 7c334f2..6646933 100644
--- a/src/target/oocd_trace.h
+++ b/src/target/oocd_trace.h
@@ -20,8 +20,6 @@
#ifndef OOCD_TRACE_H
#define OOCD_TRACE_H
-#include <target/etm.h>
-
#include <termios.h>
/* registers */
diff --git a/src/target/xscale.h b/src/target/xscale.h
index 97038d8..f20074f 100644
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -23,9 +23,9 @@
#ifndef XSCALE_H
#define XSCALE_H
-#include <target/arm.h>
-#include <target/armv4_5_mmu.h>
-#include <target/trace.h>
+#include "arm.h"
+#include "armv4_5_mmu.h"
+#include "trace.h"
#define XSCALE_COMMON_MAGIC 0x58534341
commit 38e376d232ecb3d6a436a20c09019d1a13b0d42b
Author: David Brownell <dbr...@us...>
Date: Sun Dec 13 12:52:23 2009 -0800
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 <dbr...@us...>
diff --git a/src/target/target.c b/src/target/target.c
index 70130d9..740db0f 100644
--- 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 fededb9..4151c22 100644
--- 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 fc0ba1a..d22b8a2 100644
--- 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 991c64e..280111a 100644
--- 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[] = {
-----------------------------------------------------------------------
Summary of changes:
src/target/arm.h | 2 +-
src/target/arm11.h | 4 ++--
src/target/arm11_dbgtap.h | 2 +-
src/target/arm720t.h | 4 ++--
src/target/arm7_9_common.h | 4 ++--
src/target/arm7tdmi.h | 2 +-
src/target/arm920t.h | 4 ++--
src/target/arm926ejs.h | 4 ++--
src/target/arm966e.h | 2 +-
src/target/arm9tdmi.h | 2 +-
src/target/arm_adi_v5.h | 2 +-
src/target/armv4_5_mmu.h | 2 +-
src/target/armv7a.h | 10 +++++-----
src/target/armv7m.h | 4 ++--
src/target/cortex_a8.h | 2 +-
src/target/cortex_m3.h | 2 +-
src/target/embeddedice.h | 2 +-
src/target/etm.h | 4 ++--
src/target/etm_dummy.h | 2 +-
src/target/mips32.h | 4 ++--
src/target/mips32_dmaacc.h | 2 +-
src/target/mips32_pracc.h | 2 +-
src/target/oocd_trace.c | 1 +
src/target/oocd_trace.h | 2 --
src/target/target.c | 5 +++--
src/target/target.h | 3 +--
src/target/target_request.c | 5 +++--
src/target/testee.c | 4 +++-
src/target/xscale.h | 6 +++---
29 files changed, 48 insertions(+), 46 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X