From cb4a475f6c26ff197cd9d601b0b9f86653d961a2 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Thu, 3 Dec 2009 04:14:31 -0800 Subject: [PATCH] change #include "jtag.h" to Changes from the flat namespace to heirarchical one. Instead of writing: #include "jtag.h" the following form should be used. #include The exception is from .c files in the same directory. --- src/ecosboard.c | 2 +- src/flash/nor/str9xpec.h | 2 +- src/jtag/commands.h | 2 +- src/jtag/interface.h | 2 +- src/openocd.c | 2 +- src/pld/virtex2.h | 2 +- src/server/gdb_server.c | 2 +- src/svf/svf.c | 2 +- src/svf/svf.h | 2 +- src/target/arm_dpm.c | 2 +- src/target/arm_jtag.h | 2 +- src/target/avrt.h | 2 +- src/target/mips_ejtag.h | 2 +- src/target/target.c | 2 +- src/xsvf/xsvf.c | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/ecosboard.c b/src/ecosboard.c index 5d939368..b42a777c 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -22,7 +22,7 @@ #endif #include -#include "jtag.h" +#include #include #include #include "xsvf.h" diff --git a/src/flash/nor/str9xpec.h b/src/flash/nor/str9xpec.h index 1c8d41b1..1d5ce943 100644 --- a/src/flash/nor/str9xpec.h +++ b/src/flash/nor/str9xpec.h @@ -24,7 +24,7 @@ #define STR9XPEC_H #include "flash.h" -#include "jtag.h" +#include struct str9xpec_flash_controller { diff --git a/src/jtag/commands.h b/src/jtag/commands.h index 967a8349..86ded152 100644 --- a/src/jtag/commands.h +++ b/src/jtag/commands.h @@ -26,7 +26,7 @@ #ifndef JTAG_COMMANDS_H #define JTAG_COMMANDS_H -#include "jtag.h" +#include /** * The inferred type of a scan_command_s structure, indicating whether diff --git a/src/jtag/interface.h b/src/jtag/interface.h index d55782ad..a264d69f 100644 --- a/src/jtag/interface.h +++ b/src/jtag/interface.h @@ -26,7 +26,7 @@ #ifndef OPENOCD_JTAG_INTERFACE_H #define OPENOCD_JTAG_INTERFACE_H -#include "jtag.h" +#include /* @file * The "Cable Helper API" is what the cable drivers can use to help diff --git a/src/openocd.c b/src/openocd.c index 24535152..38eb57b0 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -29,7 +29,7 @@ #endif #include "openocd.h" -#include "jtag.h" +#include #include #include #include "xsvf.h" diff --git a/src/pld/virtex2.h b/src/pld/virtex2.h index 8e076045..4cefdf44 100644 --- a/src/pld/virtex2.h +++ b/src/pld/virtex2.h @@ -20,7 +20,7 @@ #ifndef VIRTEX2_H #define VIRTEX2_H -#include "jtag.h" +#include struct virtex2_pld_device { diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 7fb36e41..ef8d7f22 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -34,7 +34,7 @@ #include "flash.h" #include "gdb_server.h" #include "image.h" -#include "jtag.h" +#include #if 0 diff --git a/src/svf/svf.c b/src/svf/svf.c index 65495729..e6d842b7 100644 --- a/src/svf/svf.c +++ b/src/svf/svf.c @@ -31,7 +31,7 @@ #include "config.h" #endif -#include "jtag.h" +#include #include "svf.h" #include diff --git a/src/svf/svf.h b/src/svf/svf.h index f22fc3a8..0fd38fb6 100644 --- a/src/svf/svf.h +++ b/src/svf/svf.h @@ -20,7 +20,7 @@ #ifndef SVF_H #define SVF_H -#include "jtag.h" +#include int svf_register_commands(struct command_context *cmd_ctx); diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c index 434c63e1..ca3930fc 100644 --- a/src/target/arm_dpm.c +++ b/src/target/arm_dpm.c @@ -23,7 +23,7 @@ #include "armv4_5.h" /* REVISIT to become arm.h */ #include "arm_dpm.h" -#include "jtag.h" +#include #include "register.h" #include "breakpoints.h" #include "target_type.h" diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h index d9e7f2aa..6f03fc6e 100644 --- a/src/target/arm_jtag.h +++ b/src/target/arm_jtag.h @@ -23,7 +23,7 @@ #ifndef ARM_JTAG #define ARM_JTAG -#include "jtag.h" +#include struct arm_jtag { diff --git a/src/target/avrt.h b/src/target/avrt.h index 145f836f..221296a9 100644 --- a/src/target/avrt.h +++ b/src/target/avrt.h @@ -20,7 +20,7 @@ #ifndef AVRT_H #define AVRT_H -#include "jtag.h" +#include struct mcu_jtag { diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h index 6a653d4f..93b4a6ae 100644 --- a/src/target/mips_ejtag.h +++ b/src/target/mips_ejtag.h @@ -23,7 +23,7 @@ #ifndef MIPS_EJTAG #define MIPS_EJTAG -#include "jtag.h" +#include /* tap instructions */ #define EJTAG_INST_IDCODE 0x01 diff --git a/src/target/target.c b/src/target/target.c index e4260195..597046fa 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -41,7 +41,7 @@ #include "register.h" #include "trace.h" #include "image.h" -#include "jtag.h" +#include static int target_array2mem(Jim_Interp *interp, struct target *target, int argc, Jim_Obj *const *argv); diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index f5c89d44..5cacbed8 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -41,7 +41,7 @@ #endif #include "xsvf.h" -#include "jtag.h" +#include #include "svf.h" -- 2.39.5