From df0e90ec8c728be50f1457ecc513d78de044f5a4 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Thu, 3 Dec 2009 04:14:30 -0800 Subject: [PATCH] change #include "types.h" to Changes from the flat namespace to heirarchical one. Instead of writing: #include "types.h" the following form should be used. #include The exception is from .c files in the same directory. --- src/ecosboard.c | 2 +- src/flash/common.h | 2 +- src/flash/nor/at91sam3.c | 2 +- src/flash/nor/avrf.h | 2 +- src/helper/binarybuffer.h | 2 +- src/helper/command.h | 2 +- src/helper/fileio.h | 2 +- src/helper/replacements.h | 2 +- src/jtag/drivers/rlink.h | 2 +- src/jtag/drivers/usb_common.h | 2 +- src/pld/xilinx_bit.h | 2 +- src/target/arm_disassembler.h | 2 +- src/target/arm_simulator.h | 2 +- src/target/armv4_5_cache.h | 2 +- src/target/breakpoints.h | 2 +- src/target/mips_m4k.h | 2 +- src/target/register.c | 2 +- src/target/target.h | 2 +- src/target/target_type.h | 2 +- src/target/trace.h | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ecosboard.c b/src/ecosboard.c index c93cea05..5d939368 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -21,7 +21,7 @@ #include "config.h" #endif -#include "types.h" +#include #include "jtag.h" #include #include diff --git a/src/flash/common.h b/src/flash/common.h index 1fd0d774..e0dcdb3b 100644 --- a/src/flash/common.h +++ b/src/flash/common.h @@ -19,7 +19,7 @@ #ifndef FLASH_COMMON_H #define FLASH_COMMON_H -#include "types.h" +#include /** * Parses the optional '.index' portion of a flash bank identifier. diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c index b27ea941..5f7e8d72 100644 --- a/src/flash/nor/at91sam3.c +++ b/src/flash/nor/at91sam3.c @@ -60,7 +60,7 @@ #include #include #include -#include "types.h" +#include #include "flash.h" #include #include "at91sam3.h" diff --git a/src/flash/nor/avrf.h b/src/flash/nor/avrf.h index e75d9d7e..0f270e6f 100644 --- a/src/flash/nor/avrf.h +++ b/src/flash/nor/avrf.h @@ -20,7 +20,7 @@ #ifndef AVRF_H #define AVRF_H -#include "types.h" +#include struct avrf_type { diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h index 6275eaf1..ae0ee9a1 100644 --- a/src/helper/binarybuffer.h +++ b/src/helper/binarybuffer.h @@ -23,7 +23,7 @@ #ifndef BINARYBUFFER_H #define BINARYBUFFER_H -#include "types.h" +#include /** @file * Support functions to access arbitrary bits in a byte array diff --git a/src/helper/command.h b/src/helper/command.h index 8beeb724..55046085 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -23,7 +23,7 @@ #ifndef COMMAND_H #define COMMAND_H -#include "types.h" +#include /* Integrate the JIM TCL interpretor into the command processing. */ #if BUILD_ECOSBOARD diff --git a/src/helper/fileio.h b/src/helper/fileio.h index 325b441f..597bafc0 100644 --- a/src/helper/fileio.h +++ b/src/helper/fileio.h @@ -26,7 +26,7 @@ #ifndef FILEIO_H #define FILEIO_H -#include "types.h" +#include #define FILEIO_MAX_ERROR_STRING (128) diff --git a/src/helper/replacements.h b/src/helper/replacements.h index a029674f..2b3ea73a 100644 --- a/src/helper/replacements.h +++ b/src/helper/replacements.h @@ -211,7 +211,7 @@ static __inline int socket_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set #ifndef HAVE_ELF_H -#include "types.h" +#include typedef uint32_t Elf32_Addr; typedef uint16_t Elf32_Half; diff --git a/src/jtag/drivers/rlink.h b/src/jtag/drivers/rlink.h index b53be5ce..02170606 100644 --- a/src/jtag/drivers/rlink.h +++ b/src/jtag/drivers/rlink.h @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "types.h" +#include struct rlink_speed_table { uint8_t const *dtc; diff --git a/src/jtag/drivers/usb_common.h b/src/jtag/drivers/usb_common.h index da395add..32d3548d 100644 --- a/src/jtag/drivers/usb_common.h +++ b/src/jtag/drivers/usb_common.h @@ -20,7 +20,7 @@ #ifndef JTAG_USB_COMMON_H #define JTAG_USB_COMMON_H -#include "types.h" +#include #include diff --git a/src/pld/xilinx_bit.h b/src/pld/xilinx_bit.h index 722d225c..2b40d861 100644 --- a/src/pld/xilinx_bit.h +++ b/src/pld/xilinx_bit.h @@ -20,7 +20,7 @@ #ifndef XILINX_BIT_H #define XILINX_BIT_H -#include "types.h" +#include struct xilinx_bit_file { diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h index 774dd2c2..156c037e 100644 --- a/src/target/arm_disassembler.h +++ b/src/target/arm_disassembler.h @@ -20,7 +20,7 @@ #ifndef ARM_DISASSEMBLER_H #define ARM_DISASSEMBLER_H -#include "types.h" +#include enum arm_instruction_type { diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h index 616627a4..daca3711 100644 --- a/src/target/arm_simulator.h +++ b/src/target/arm_simulator.h @@ -20,7 +20,7 @@ #ifndef ARM_SIMULATOR_H #define ARM_SIMULATOR_H -#include "types.h" +#include struct target; diff --git a/src/target/armv4_5_cache.h b/src/target/armv4_5_cache.h index 1a82b671..c529b458 100644 --- a/src/target/armv4_5_cache.h +++ b/src/target/armv4_5_cache.h @@ -20,7 +20,7 @@ #ifndef ARMV4_5_CACHE_H #define ARMV4_5_CACHE_H -#include "types.h" +#include struct command_context; diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h index a65f20e3..ee4d9d13 100644 --- a/src/target/breakpoints.h +++ b/src/target/breakpoints.h @@ -20,7 +20,7 @@ #ifndef BREAKPOINTS_H #define BREAKPOINTS_H -#include "types.h" +#include struct target; diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h index a7c5bb39..c5f9be2b 100644 --- a/src/target/mips_m4k.h +++ b/src/target/mips_m4k.h @@ -23,7 +23,7 @@ #ifndef MIPS_M4K_H #define MIPS_M4K_H -#include "types.h" +#include struct target; diff --git a/src/target/register.c b/src/target/register.c index 7b26b740..355c8601 100644 --- a/src/target/register.c +++ b/src/target/register.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#include "types.h" +#include #include "register.h" #include diff --git a/src/target/target.h b/src/target/target.h index 43ac65fc..73190695 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -26,7 +26,7 @@ #ifndef TARGET_H #define TARGET_H -#include "types.h" +#include #include struct reg; diff --git a/src/target/target_type.h b/src/target/target_type.h index 15cf66be..67041b31 100644 --- a/src/target/target_type.h +++ b/src/target/target_type.h @@ -26,7 +26,7 @@ #ifndef TARGET_TYPE_H #define TARGET_TYPE_H -#include "types.h" +#include struct target; diff --git a/src/target/trace.h b/src/target/trace.h index c554c731..5fbedc4b 100644 --- a/src/target/trace.h +++ b/src/target/trace.h @@ -20,7 +20,7 @@ #ifndef TRACE_H #define TRACE_H -#include "types.h" +#include struct target; struct command_context; -- 2.39.5