From: Zachary T Welch Date: Thu, 3 Dec 2009 12:14:25 +0000 (-0800) Subject: change #include "binarybuffer.h" to X-Git-Tag: v0.4.0-rc1~202 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d1bc4375e99ce52b72988494f35beca364234bae;p=openocd change #include "binarybuffer.h" to Changes from the flat namespace to heirarchical one. Instead of writing: #include "binarybuffer.h" the following form should be used. #include 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 115a13aa..6788e36b 100644 --- a/src/flash/arm_nandio.h +++ b/src/flash/arm_nandio.h @@ -2,7 +2,7 @@ #define __ARM_NANDIO_H #include "nand.h" -#include "binarybuffer.h" +#include /** * 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 643705ca..109b4866 100644 --- a/src/flash/nor/aduc702x.c +++ b/src/flash/nor/aduc702x.c @@ -25,7 +25,7 @@ #include "flash.h" #include "armv4_5.h" -#include "binarybuffer.h" +#include #include "time_support.h" #include "algorithm.h" diff --git a/src/flash/nor/at91sam7.c b/src/flash/nor/at91sam7.c index f9b87bab..3201737d 100644 --- a/src/flash/nor/at91sam7.c +++ b/src/flash/nor/at91sam7.c @@ -50,7 +50,7 @@ #endif #include "at91sam7.h" -#include "binarybuffer.h" +#include 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 6dbffb9e..cf83271d 100644 --- 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 "binarybuffer.h" +#include #include "algorithm.h" diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c index 418b5b03..981cfac1 100644 --- a/src/flash/nor/lpc2000.c +++ b/src/flash/nor/lpc2000.c @@ -27,7 +27,7 @@ #include "lpc2000.h" #include "armv7m.h" -#include "binarybuffer.h" +#include #include "algorithm.h" diff --git a/src/flash/nor/lpc288x.c b/src/flash/nor/lpc288x.c index 446fc9da..252a8133 100644 --- a/src/flash/nor/lpc288x.c +++ b/src/flash/nor/lpc288x.c @@ -32,7 +32,7 @@ #endif #include "lpc288x.h" -#include "binarybuffer.h" +#include #define LOAD_TIMER_ERASE 0 diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c index 81e2def4..bb467c54 100644 --- a/src/flash/nor/lpc2900.c +++ b/src/flash/nor/lpc2900.c @@ -25,7 +25,7 @@ #include "image.h" #include "flash.h" -#include "binarybuffer.h" +#include #include "armv4_5.h" #include "algorithm.h" diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c index 771f0a71..71bd5baf 100644 --- a/src/flash/nor/stellaris.c +++ b/src/flash/nor/stellaris.c @@ -30,7 +30,7 @@ #include "stellaris.h" #include "armv7m.h" -#include "binarybuffer.h" +#include #include "algorithm.h" diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c index 2f51aa55..98684285 100644 --- a/src/flash/nor/stm32x.c +++ b/src/flash/nor/stm32x.c @@ -26,7 +26,7 @@ #include "stm32x.h" #include "armv7m.h" -#include "binarybuffer.h" +#include #include "algorithm.h" diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c index 7edffac9..17a58c99 100644 --- a/src/flash/nor/str7x.c +++ b/src/flash/nor/str7x.c @@ -26,7 +26,7 @@ #include "str7x.h" #include "armv4_5.h" -#include "binarybuffer.h" +#include #include "algorithm.h" diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index ee967752..694e2f7e 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -23,7 +23,7 @@ #ifndef JTAG_H #define JTAG_H -#include "binarybuffer.h" +#include #include "log.h" #ifdef _DEBUG_JTAG_IO_ diff --git a/src/target/algorithm.c b/src/target/algorithm.c index 76cf48bc..57383aea 100644 --- a/src/target/algorithm.c +++ b/src/target/algorithm.c @@ -22,7 +22,7 @@ #endif #include "algorithm.h" -#include "binarybuffer.h" +#include 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 73aac962..b96a08a1 100644 --- 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 "binarybuffer.h" +#include #include "register.h" #include "log.h" diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index 94193446..80c06ef3 100644 --- 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 "binarybuffer.h" +#include #include "algorithm.h" #include "register.h" diff --git a/src/target/armv7a.c b/src/target/armv7a.c index 06bc7489..1aa0d8ac 100644 --- a/src/target/armv7a.c +++ b/src/target/armv7a.c @@ -26,7 +26,7 @@ #include "arm_disassembler.h" #include "register.h" -#include "binarybuffer.h" +#include #include "command.h" #include diff --git a/src/target/target_request.c b/src/target/target_request.c index 9e78178a..c66cd04c 100644 --- 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 "binarybuffer.h" +#include #include "trace.h" #include "log.h"