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 <dbrownell@users.sourceforge.net>

diff --git a/src/target/arm.h b/src/target/arm.h
index 36763b4a0539d36c296055d0517340934ff702b0..988266e3cf9bdb6fa164325d8dc3f653b7a318c8 100644 (file)
--- 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 bce5bd9cd36b00139e2ec55fd6745868eaac2881..dd2f3a2163383845ab69a5c949a886f4ba622b78 100644 (file)
--- 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 7f87e3a07a9ae5a68b3c68f13bfad49175ee05bc..45052b9993f4ac8ff7c0b84287fc06e72516b68f 100644 (file)
--- 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 b13cff8fa20321be5a4ebae1bd5d16a6bfc2b066..f0ab44477642ea6b8a385f1f0e39da82beefb9ac 100644 (file)
--- 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 bce17ef694245e996376ba5ee02bef0094209c5d..021238e06f166255ce5dab6deebcf0bfa95b6e88 100644 (file)
--- 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 ce771e2663a83fd8d4e22be42b83bb2e1d84c593..b6bbe59a5f8c5d06112c17c8ca55feb12e920d90 100644 (file)
--- 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 0eb14fc7149411c701c360da570f5783aa6de56a..a75f01ab16805e4f36687e61fa46e2957eaaa57c 100644 (file)
--- 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 604ab0803f6220dc64343f9f1c339913f86b1f1c..274733bfd29ddc464a95558d4a1ad9a1f8ec500e 100644 (file)
--- 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 6c169700e56950d5cff52de9941699286f2624bf..24dcec306401afe677c0368786df51f6e7e28429 100644 (file)
--- 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 ea436900806839bf4a6e13282b4e43ca9637f81d..aff9fc5f41aa0af9e91c89d95680f995674051fc 100644 (file)
--- 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 c268f969039e5f7190233b57acc2cb1849ca453d..a78193c6d0dd8ed076b4216d5001b7917621c5ba 100644 (file)
--- 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 428a3731328cd654dc7a932fb221e33f8c8c224b..6b9ed34c0ac5d4fc1ad224b45edbb0357fa94309 100644 (file)
--- 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 663e5d92d14237eeca437fd5c6646e7da99ef0d7..581813a345ade6c3c90d0ea236e1acee14892582 100644 (file)
--- 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 07090b411bb556b95f77abb8d3a591ea882e1a87..ac559b9e942318a93eea6aadaa5a2cf0dedadf7b 100644 (file)
--- 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 82a34a762f7956c77feb4a6bed90cd3acf0cf7ac..cc2e0090d91f12099f69da7a1e41b61e6a60864a 100644 (file)
--- 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 c31c3f5dc821373ebc67f1bb7e9f67e5230221cc..7ce89014bbbc8eec7ca5705ed769892203f543a5 100644 (file)
--- 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 693391cc787d0c765396bbb6eb2fd572302a6031..cd48ce69713f457475d9e7f070afd4c07bf940f3 100644 (file)
--- 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 5aea65714134648d860e0f15daac1d012dfa90ae..5b4d5e15159ce8d95c50c3d0ebaca45aed3d38d9 100644 (file)
--- 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 95980f8433b3b055c5f6d9584327de3d6740991c..2673e4f56c3c2b88fa263fa1fc790a6ed2020a7d 100644 (file)
--- 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 98186aff93cf507e8432ca15d14f31b8b428d5a8..7d1928e5b057781d7b657aaaa33864fd4b425952 100644 (file)
--- 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 e614c1241b228b7aae8af08da6c6faacbf70716f..c1aa07dd74597626dee77881d5ec34a7f079cdcd 100644 (file)
--- 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 eceea5d2961e46dc50b10cc9712bbeef02b171f4..5d1cf3dd6f1b1bbc98172d8338e2533ece8d7b5a 100644 (file)
--- 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 ae3a5dff767ae93ff005c025d642ef57570ce937..b9615bc5cd438bc8dc38abbd72f22b8b1e0a034b 100644 (file)
--- 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 7c334f248d6d53aed929f6bf24575dbd62a7076a..664693385970f2c72b1f077979dde5f3c2f63b6f 100644 (file)
--- 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 97038d8c6e8e256eef1ddd8fe8cfdd0d43232d40..f20074fdb9ec1ea77772db34350e23872d3617bf 100644 (file)
--- 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