change #include "types.h" to <helper/types.h>

Changes from the flat namespace to heirarchical one.  Instead of writing:

	#include "types.h"

the following form should be used.

	#include <helper/types.h>

The exception is from .c files in the same directory.

diff --git a/src/ecosboard.c b/src/ecosboard.c
index c93cea05bcbb8d24eaf00dc55e8ce02bae1614b8..5d93936804a4494f9d35db31e46b7612796489c1 100644 (file)
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "types.h"
+#include <helper/types.h>

 #include "jtag.h"
 #include <helper/ioutil.h>
 #include <helper/configuration.h>
 #include "jtag.h"
 #include <helper/ioutil.h>
 #include <helper/configuration.h>

diff --git a/src/flash/common.h b/src/flash/common.h
index 1fd0d7742f0b8dbe6a4b692dfde0b007db902cc2..e0dcdb3b206599e1ad48430afca85e241aa7c595 100644 (file)
--- a/src/flash/common.h
+++ b/src/flash/common.h
@@ -19,7 +19,7 @@
 #ifndef FLASH_COMMON_H
 #define FLASH_COMMON_H
 
 #ifndef FLASH_COMMON_H
 #define FLASH_COMMON_H
 

-#include "types.h"
+#include <helper/types.h>

 
 /**
  * Parses the optional '.index' portion of a flash bank identifier.
 
 /**
  * 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 b27ea941c1391ad478ca5d78a87386a0bc810113..5f7e8d72fef687db93c29a0d69814b48cd961ec4 100644 (file)
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -60,7 +60,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>

-#include "types.h"
+#include <helper/types.h>

 #include "flash.h"
 #include <helper/membuf.h>
 #include "at91sam3.h"
 #include "flash.h"
 #include <helper/membuf.h>
 #include "at91sam3.h"

diff --git a/src/flash/nor/avrf.h b/src/flash/nor/avrf.h
index e75d9d7eb60d9f7b570e295ec30dcdc36432791f..0f270e6f487775316d50c18940159e28887f8f88 100644 (file)
--- a/src/flash/nor/avrf.h
+++ b/src/flash/nor/avrf.h
@@ -20,7 +20,7 @@
 #ifndef AVRF_H
 #define AVRF_H
 
 #ifndef AVRF_H
 #define AVRF_H
 

-#include "types.h"
+#include <helper/types.h>

 
 struct avrf_type
 {
 
 struct avrf_type
 {

diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index 6275eaf1e9d1f56ba1521f599a55619748738c63..ae0ee9a101b2452b30658129769060a0ae49c71b 100644 (file)
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -23,7 +23,7 @@
 #ifndef BINARYBUFFER_H
 #define BINARYBUFFER_H
 
 #ifndef BINARYBUFFER_H
 #define BINARYBUFFER_H
 

-#include "types.h"
+#include <helper/types.h>

 
 /** @file
  * Support functions to access arbitrary bits in a byte array
 
 /** @file
  * Support functions to access arbitrary bits in a byte array

diff --git a/src/helper/command.h b/src/helper/command.h
index 8beeb7244bb57486482464111e58919fe12d202a..55046085dea8885beb058abd0ac7ea6a58fda4c6 100644 (file)
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -23,7 +23,7 @@
 #ifndef COMMAND_H
 #define COMMAND_H
 
 #ifndef COMMAND_H
 #define COMMAND_H
 

-#include "types.h"
+#include <helper/types.h>

 
 /* Integrate the JIM TCL interpretor into the command processing. */
 #if BUILD_ECOSBOARD
 
 /* 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 325b441ff9884191b438db8ac9be1697214f2d9f..597bafc0124ae5c53934bb9f866d61f9f6b57284 100644 (file)
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -26,7 +26,7 @@
 #ifndef FILEIO_H
 #define FILEIO_H
 
 #ifndef FILEIO_H
 #define FILEIO_H
 

-#include "types.h"
+#include <helper/types.h>

 
 #define FILEIO_MAX_ERROR_STRING                (128)
 
 
 #define FILEIO_MAX_ERROR_STRING                (128)
 

diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index a029674f7a05f22373dcca579ffb2083cbcd6ac1..2b3ea73a6fba0f50bee4a2836dc3ab34c1039f08 100644 (file)
--- 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
 
 
 #ifndef HAVE_ELF_H
 

-#include "types.h"
+#include <helper/types.h>

 
 typedef uint32_t       Elf32_Addr;
 typedef uint16_t       Elf32_Half;
 
 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 b53be5ceb62c68421fffea9d21811695d82d8c44..02170606161d4dbd82fb76a6030dff38202c09c7 100644 (file)
--- 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.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

-#include "types.h"
+#include <helper/types.h>

 
 struct rlink_speed_table {
        uint8_t const *dtc;
 
 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 da395addc7cc8ccad00ab6812bb716a488f0431f..32d3548d765bcefb0d927450c03dd90c209c29d9 100644 (file)
--- 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
 
 #ifndef JTAG_USB_COMMON_H
 #define JTAG_USB_COMMON_H
 

-#include "types.h"
+#include <helper/types.h>

 
 #include <usb.h>
 
 
 #include <usb.h>
 

diff --git a/src/pld/xilinx_bit.h b/src/pld/xilinx_bit.h
index 722d225cddc7854a304ea96476122166ed17016a..2b40d861f024d5281264ecf6d32d9a1fa61b9272 100644 (file)
--- a/src/pld/xilinx_bit.h
+++ b/src/pld/xilinx_bit.h
@@ -20,7 +20,7 @@
 #ifndef XILINX_BIT_H
 #define XILINX_BIT_H
 
 #ifndef XILINX_BIT_H
 #define XILINX_BIT_H
 

-#include "types.h"
+#include <helper/types.h>

 
 struct xilinx_bit_file
 {
 
 struct xilinx_bit_file
 {

diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h
index 774dd2c2f968105f13efa85864815bae8b31aff0..156c037e1eda42bc77ffe51b69e02535e2971580 100644 (file)
--- a/src/target/arm_disassembler.h
+++ b/src/target/arm_disassembler.h
@@ -20,7 +20,7 @@
 #ifndef ARM_DISASSEMBLER_H
 #define ARM_DISASSEMBLER_H
 
 #ifndef ARM_DISASSEMBLER_H
 #define ARM_DISASSEMBLER_H
 

-#include "types.h"
+#include <helper/types.h>

 
 enum arm_instruction_type
 {
 
 enum arm_instruction_type
 {

diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index 616627a42140f5c541fc407f912295b261adb9e9..daca371170a872fdb880116d53e391286d8e315e 100644 (file)
--- a/src/target/arm_simulator.h
+++ b/src/target/arm_simulator.h
@@ -20,7 +20,7 @@
 #ifndef ARM_SIMULATOR_H
 #define ARM_SIMULATOR_H
 
 #ifndef ARM_SIMULATOR_H
 #define ARM_SIMULATOR_H
 

-#include "types.h"
+#include <helper/types.h>

 
 struct target;
 
 
 struct target;
 

diff --git a/src/target/armv4_5_cache.h b/src/target/armv4_5_cache.h
index 1a82b671cee2ec435889a85bfeb3401996c0b9ca..c529b458413345f80f668de6b51eb1a84ec5b933 100644 (file)
--- 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
 
 #ifndef ARMV4_5_CACHE_H
 #define ARMV4_5_CACHE_H
 

-#include "types.h"
+#include <helper/types.h>

 
 struct command_context;
 
 
 struct command_context;
 

diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index a65f20e373a9a8454cd7709b51a82163c26047c5..ee4d9d13596a18fc154c8606dccff7f7ade67cae 100644 (file)
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -20,7 +20,7 @@
 #ifndef BREAKPOINTS_H
 #define BREAKPOINTS_H
 
 #ifndef BREAKPOINTS_H
 #define BREAKPOINTS_H
 

-#include "types.h"
+#include <helper/types.h>

 
 struct target;
 
 
 struct target;
 

diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h
index a7c5bb3927a511e2687b6ce3d26a255978c84e41..c5f9be2b2144317084faa5591e54213aea85268f 100644 (file)
--- a/src/target/mips_m4k.h
+++ b/src/target/mips_m4k.h
@@ -23,7 +23,7 @@
 #ifndef MIPS_M4K_H
 #define MIPS_M4K_H
 
 #ifndef MIPS_M4K_H
 #define MIPS_M4K_H
 

-#include "types.h"
+#include <helper/types.h>

 
 struct target;
 
 
 struct target;
 

diff --git a/src/target/register.c b/src/target/register.c
index 7b26b740e578f31a8b22548833f79061a0e727e6..355c860121372c45c6cd6a3d9420fd90d0d606c8 100644 (file)
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "types.h"
+#include <helper/types.h>

 #include "register.h"
 #include <helper/log.h>
 
 #include "register.h"
 #include <helper/log.h>
 

diff --git a/src/target/target.h b/src/target/target.h
index 43ac65fc1d55f4c136df1d01f53dc984e8c9f820..73190695427780d5fe38221e4ef23ad94cceb55d 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -26,7 +26,7 @@
 #ifndef TARGET_H
 #define TARGET_H
 
 #ifndef TARGET_H
 #define TARGET_H
 

-#include "types.h"
+#include <helper/types.h>

 #include <helper/jim.h>
 
 struct reg;
 #include <helper/jim.h>
 
 struct reg;

diff --git a/src/target/target_type.h b/src/target/target_type.h
index 15cf66be85bf18ef8c576d342c112e82ecefe764..67041b31625a68e2a605d3e90ef09fedf2e99eed 100644 (file)
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -26,7 +26,7 @@
 #ifndef TARGET_TYPE_H
 #define TARGET_TYPE_H
 
 #ifndef TARGET_TYPE_H
 #define TARGET_TYPE_H
 

-#include "types.h"
+#include <helper/types.h>

 
 struct target;
 
 
 struct target;
 

diff --git a/src/target/trace.h b/src/target/trace.h
index c554c731000459a6282a6e9db88c71ed8eb7677d..5fbedc4b6a3f0b4928ed702a050d761c68744750 100644 (file)
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -20,7 +20,7 @@
 #ifndef TRACE_H
 #define TRACE_H
 
 #ifndef TRACE_H
 #define TRACE_H
 

-#include "types.h"
+#include <helper/types.h>

 
 struct target;
 struct command_context;
 
 struct target;
 struct command_context;