From: Zachary T Welch Date: Thu, 3 Dec 2009 12:14:30 +0000 (-0800) Subject: change #include "types.h" to X-Git-Tag: v0.4.0-rc1~192 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=df0e90ec8c728be50f1457ecc513d78de044f5a4 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. --- diff --git a/src/ecosboard.c b/src/ecosboard.c index c93cea05bc..5d93936804 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 1fd0d7742f..e0dcdb3b20 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 b27ea941c1..5f7e8d72fe 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 e75d9d7eb6..0f270e6f48 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 6275eaf1e9..ae0ee9a101 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 8beeb7244b..55046085de 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 325b441ff9..597bafc012 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 a029674f7a..2b3ea73a6f 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 b53be5ceb6..0217060616 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 da395addc7..32d3548d76 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 722d225cdd..2b40d861f0 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 774dd2c2f9..156c037e1e 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 616627a421..daca371170 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 1a82b671ce..c529b45841 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 a65f20e373..ee4d9d1359 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 a7c5bb3927..c5f9be2b21 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 7b26b740e5..355c860121 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 43ac65fc1d..7319069542 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 15cf66be85..67041b3162 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 c554c73100..5fbedc4b6a 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;