From: Zachary T Welch Date: Thu, 3 Dec 2009 12:14:35 +0000 (-0800) Subject: change #include "algorithm.h" to X-Git-Tag: v0.4.0-rc1~187 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2958665f6b1239705a7dcc2b275810c394023f0f;p=openocd change #include "algorithm.h" to Changes from the flat namespace to heirarchical one. Instead of writing: #include "algorithm.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.c b/src/flash/arm_nandio.c index f774b619..4647c794 100644 --- a/src/flash/arm_nandio.c +++ b/src/flash/arm_nandio.c @@ -26,7 +26,7 @@ #include "arm_nandio.h" #include "armv4_5.h" -#include "algorithm.h" +#include /** * Copies code to a working area. This will allocate room for the code plus the diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c index f7aa7468..402da1f4 100644 --- a/src/flash/nor/aduc702x.c +++ b/src/flash/nor/aduc702x.c @@ -27,7 +27,7 @@ #include "armv4_5.h" #include #include -#include "algorithm.h" +#include static int aduc702x_build_sector_list(struct flash_bank *bank); diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c index cf83271d..043d7420 100644 --- a/src/flash/nor/cfi.c +++ b/src/flash/nor/cfi.c @@ -27,7 +27,7 @@ #include "non_cfi.h" #include "armv4_5.h" #include -#include "algorithm.h" +#include #define CFI_MAX_BUS_WIDTH 4 diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c index 7a0b26f3..f689e152 100644 --- a/src/flash/nor/ecos.c +++ b/src/flash/nor/ecos.c @@ -24,7 +24,7 @@ #include "flash.h" #include "embeddedice.h" #include "image.h" -#include "algorithm.h" +#include #if 0 diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c index 981cfac1..9479a9fe 100644 --- a/src/flash/nor/lpc2000.c +++ b/src/flash/nor/lpc2000.c @@ -28,7 +28,7 @@ #include "lpc2000.h" #include "armv7m.h" #include -#include "algorithm.h" +#include /* flash programming support for NXP LPC17xx and LPC2xxx devices diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c index bb467c54..9cbb9e4b 100644 --- a/src/flash/nor/lpc2900.c +++ b/src/flash/nor/lpc2900.c @@ -27,7 +27,7 @@ #include "flash.h" #include #include "armv4_5.h" -#include "algorithm.h" +#include /* 1024 bytes */ diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c index 71bd5baf..90b0ac65 100644 --- a/src/flash/nor/stellaris.c +++ b/src/flash/nor/stellaris.c @@ -31,7 +31,7 @@ #include "stellaris.h" #include "armv7m.h" #include -#include "algorithm.h" +#include #define DID0_VER(did0) ((did0 >> 28)&0x07) diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c index 98684285..581b6505 100644 --- a/src/flash/nor/stm32x.c +++ b/src/flash/nor/stm32x.c @@ -27,7 +27,7 @@ #include "stm32x.h" #include "armv7m.h" #include -#include "algorithm.h" +#include static int stm32x_mass_erase(struct flash_bank *bank); diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c index 17a58c99..4da3f07e 100644 --- a/src/flash/nor/str7x.c +++ b/src/flash/nor/str7x.c @@ -27,7 +27,7 @@ #include "str7x.h" #include "armv4_5.h" #include -#include "algorithm.h" +#include struct str7x_mem_layout mem_layout_str7bank0[] = { diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c index 98f15e75..7b345809 100644 --- a/src/flash/nor/str9x.c +++ b/src/flash/nor/str9x.c @@ -29,7 +29,7 @@ #include "str9x.h" #include "arm966e.h" -#include "algorithm.h" +#include static uint32_t bank1start = 0x00080000;