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.
---
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/xscale.h | 6 +++---
25 files changed, 38 insertions(+), 39 deletions(-)
--- 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"
/**
--- 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
--- 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 */
--- 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
--- 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 /**< */
--- 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);
--- 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
--- 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
--- 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
--- 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);
--- 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
--- 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;
--- 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
{
--- 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
--- 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
--- 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
--- 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
{
--- 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;
--- 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;
--- 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
--- 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
--- 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
--- 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"
/*
--- 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 */
--- 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
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
