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

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

	#include "binarybuffer.h"

the following form should be used.

	#include <helper/binarybuffer.h>

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

diff --git a/src/flash/arm_nandio.h b/src/flash/arm_nandio.h
index 115a13aaf517d7743feb4214d3d502636ff08f29..6788e36b687c93299041c684d72c6b6633e115c8 100644 (file)
--- a/src/flash/arm_nandio.h
+++ b/src/flash/arm_nandio.h
@@ -2,7 +2,7 @@
 #define __ARM_NANDIO_H
 
 #include "nand.h"
 #define __ARM_NANDIO_H
 
 #include "nand.h"

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

 
 /**
  * The arm_nand_data struct is used for defining NAND I/O operations on an ARM
 
 /**
  * The arm_nand_data struct is used for defining NAND I/O operations on an ARM

diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c
index 643705cae287c0df6cf1cc0ec31626c1ab99ca0b..109b48665df27bd4cca31bb1b65edbe8aed90cb5 100644 (file)
--- a/src/flash/nor/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
@@ -25,7 +25,7 @@
 
 #include "flash.h"
 #include "armv4_5.h"
 
 #include "flash.h"
 #include "armv4_5.h"

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

 #include "time_support.h"
 #include "algorithm.h"
 
 #include "time_support.h"
 #include "algorithm.h"
 

diff --git a/src/flash/nor/at91sam7.c b/src/flash/nor/at91sam7.c
index f9b87babb23708da4c6542e43a36d408eb5c8271..3201737da9b0e86cce2d1d49a957c3b204f61d15 100644 (file)
--- a/src/flash/nor/at91sam7.c
+++ b/src/flash/nor/at91sam7.c
@@ -50,7 +50,7 @@
 #endif
 
 #include "at91sam7.h"
 #endif
 
 #include "at91sam7.h"

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

 
 static int at91sam7_protect_check(struct flash_bank *bank);
 static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
 
 static int at91sam7_protect_check(struct flash_bank *bank);
 static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count);

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 6dbffb9e1cb3a1c5e17ba50d460332773ad93e0b..cf83271def961cc9dd6e097e6198d2b210cea898 100644 (file)
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -26,7 +26,7 @@
 #include "cfi.h"
 #include "non_cfi.h"
 #include "armv4_5.h"
 #include "cfi.h"
 #include "non_cfi.h"
 #include "armv4_5.h"

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

 #include "algorithm.h"
 
 
 #include "algorithm.h"
 
 

diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c
index 418b5b0345dff8bff3c3421dc24d92b79a3dc0a4..981cfac1d1c459f69b8ec57880af79f3256564f5 100644 (file)
--- a/src/flash/nor/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
@@ -27,7 +27,7 @@
 
 #include "lpc2000.h"
 #include "armv7m.h"
 
 #include "lpc2000.h"
 #include "armv7m.h"

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

 #include "algorithm.h"
 
 
 #include "algorithm.h"
 
 

diff --git a/src/flash/nor/lpc288x.c b/src/flash/nor/lpc288x.c
index 446fc9da58677787236e61117056b83554a3fe74..252a8133f7069eced7f35e37c9e8dc10ed26a7a6 100644 (file)
--- a/src/flash/nor/lpc288x.c
+++ b/src/flash/nor/lpc288x.c
@@ -32,7 +32,7 @@
 #endif
 
 #include "lpc288x.h"
 #endif
 
 #include "lpc288x.h"

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

 
 
 #define LOAD_TIMER_ERASE       0
 
 
 #define LOAD_TIMER_ERASE       0

diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index 81e2def466260604ae7b3a643dc297713ec1f395..bb467c547b7dedc7b8edcd04d7383e5c98d88fa6 100644 (file)
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -25,7 +25,7 @@
 
 #include "image.h"
 #include "flash.h"
 
 #include "image.h"
 #include "flash.h"

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

 #include "armv4_5.h"
 #include "algorithm.h"
 
 #include "armv4_5.h"
 #include "algorithm.h"
 

diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index 771f0a7123c65b53a76242d2f60bd613ad489ef6..71bd5baf34d673e259a3083c363ec6a223628e6c 100644 (file)
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -30,7 +30,7 @@
 
 #include "stellaris.h"
 #include "armv7m.h"
 
 #include "stellaris.h"
 #include "armv7m.h"

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

 #include "algorithm.h"
 
 
 #include "algorithm.h"
 
 

diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c
index 2f51aa55a9463ec4b6cf435ff441c4ec0bbd45ac..98684285fa9c2fd123ce7ec42280324d305e8e30 100644 (file)
--- a/src/flash/nor/stm32x.c
+++ b/src/flash/nor/stm32x.c
@@ -26,7 +26,7 @@
 
 #include "stm32x.h"
 #include "armv7m.h"
 
 #include "stm32x.h"
 #include "armv7m.h"

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

 #include "algorithm.h"
 
 
 #include "algorithm.h"
 
 

diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index 7edffac9e222523944bb497e1c17bcbccfc3da5e..17a58c9928a216172ba00f0ee4fa834176967e92 100644 (file)
--- a/src/flash/nor/str7x.c
+++ b/src/flash/nor/str7x.c
@@ -26,7 +26,7 @@
 
 #include "str7x.h"
 #include "armv4_5.h"
 
 #include "str7x.h"
 #include "armv4_5.h"

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

 #include "algorithm.h"
 
 
 #include "algorithm.h"
 
 

diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index ee967752377ed4fe0e618b593b4b9f27873df882..694e2f7e09b3e95488f8efc3e6cd202499105ded 100644 (file)
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -23,7 +23,7 @@
 #ifndef JTAG_H
 #define JTAG_H
 
 #ifndef JTAG_H
 #define JTAG_H
 

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

 #include "log.h"
 
 #ifdef _DEBUG_JTAG_IO_
 #include "log.h"
 
 #ifdef _DEBUG_JTAG_IO_

diff --git a/src/target/algorithm.c b/src/target/algorithm.c
index 76cf48bc589ffec25651ea9d56017518ae3d609a..57383aea74ec2448791ae7cc9689206291918190 100644 (file)
--- a/src/target/algorithm.c
+++ b/src/target/algorithm.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "algorithm.h"
 #endif
 
 #include "algorithm.h"

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

 
 
 void init_mem_param(struct mem_param *param, uint32_t address, uint32_t size, enum param_direction direction)
 
 
 void init_mem_param(struct mem_param *param, uint32_t address, uint32_t size, enum param_direction direction)

diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c
index 73aac962507f1d8f940b7efec14b9847d782c5f1..b96a08a180cf30f2f26e8bac3bb655832b1d790a 100644 (file)
--- a/src/target/arm_simulator.c
+++ b/src/target/arm_simulator.c
@@ -27,7 +27,7 @@
 #include "armv4_5.h"
 #include "arm_disassembler.h"
 #include "arm_simulator.h"
 #include "armv4_5.h"
 #include "arm_disassembler.h"
 #include "arm_simulator.h"

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

 #include "register.h"
 #include "log.h"
 
 #include "register.h"
 #include "log.h"
 

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 941934466edb858952d1223e395046ff412452b9..80c06ef31d355a7c4f5f523b928935a4066ea06c 100644 (file)
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -31,7 +31,7 @@
 #include "arm_jtag.h"
 #include "breakpoints.h"
 #include "arm_disassembler.h"
 #include "arm_jtag.h"
 #include "breakpoints.h"
 #include "arm_disassembler.h"

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

 #include "algorithm.h"
 #include "register.h"
 
 #include "algorithm.h"
 #include "register.h"
 

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 06bc748984c4c8eac129720dcca2fe810af94be7..1aa0d8ac79d191fb5693d61f42d59985d6452815 100644 (file)
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -26,7 +26,7 @@
 #include "arm_disassembler.h"
 
 #include "register.h"
 #include "arm_disassembler.h"
 
 #include "register.h"

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

 #include "command.h"
 
 #include <stdlib.h>
 #include "command.h"
 
 #include <stdlib.h>

diff --git a/src/target/target_request.c b/src/target/target_request.c
index 9e78178a3247fce95637c1ae259c87f4c0106407..c66cd04c1afe3ef5f7a3c800b4230fb45037f3a2 100644 (file)
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -30,7 +30,7 @@
 #include "target.h"
 #include "target_request.h"
 #include "target_type.h"
 #include "target.h"
 #include "target_request.h"
 #include "target_type.h"

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

 #include "trace.h"
 #include "log.h"
 
 #include "trace.h"
 #include "log.h"