target: don't implicitly include "algorithm.h"
authorDavid Brownell <dbrownell@users.sourceforge.net>
Mon, 16 Nov 2009 08:35:05 +0000 (00:35 -0800)
committerDavid Brownell <dbrownell@users.sourceforge.net>
Mon, 16 Nov 2009 08:35:05 +0000 (00:35 -0800)
Most files in the tree seem to have ended up including this,
and *quite* needlessly ... only code implementing or using
downloadable algorithms actually needs these declarations.

So take it out of the header files which included it, and put
it in files which use it ... reduce needless interdependencies.

Also: "algorithm.h" doesn't need to include "types.h" again;
it already comes from a different header.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
16 files changed:
src/flash/aduc702x.c
src/flash/arm_nandio.c
src/flash/cfi.c
src/flash/ecos.c
src/flash/lpc2000.c
src/flash/lpc2900.c
src/flash/stellaris.c
src/flash/stm32x.c
src/flash/str7x.c
src/flash/str9x.c
src/target/algorithm.h
src/target/arm11.c
src/target/arm7_9_common.c
src/target/armv4_5.c
src/target/armv7m.c
src/target/target.h

index c2a1884..643705c 100644 (file)
@@ -27,6 +27,7 @@
 #include "armv4_5.h"
 #include "binarybuffer.h"
 #include "time_support.h"
+#include "algorithm.h"
 
 
 static int aduc702x_build_sector_list(struct flash_bank *bank);
index 63eb041..81697fa 100644 (file)
@@ -26,6 +26,7 @@
 
 #include "arm_nandio.h"
 #include "armv4_5.h"
+#include "algorithm.h"
 
 
 /*
@@ -43,8 +44,8 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
 {
        struct target           *target = nand->target;
        struct armv4_5_algorithm        algo;
-       struct arm      *armv4_5 = target->arch_info;
-       struct reg_param                reg_params[3];
+       struct arm              *armv4_5 = target->arch_info;
+       struct reg_param        reg_params[3];
        uint32_t                target_buf;
        uint32_t                exit = 0;
        int                     retval;
index 17f5c32..c0ad50d 100644 (file)
@@ -27,6 +27,7 @@
 #include "non_cfi.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 #define CFI_MAX_BUS_WIDTH      4
index 0525fbe..c12ed9d 100644 (file)
@@ -24,6 +24,7 @@
 #include "flash.h"
 #include "embeddedice.h"
 #include "image.h"
+#include "algorithm.h"
 
 
 #if 0
index df1f082..09bb13f 100644 (file)
@@ -29,6 +29,7 @@
 #include "armv4_5.h"
 #include "armv7m.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 /* flash programming support for NXP LPC17xx and LPC2xxx devices
index 556a151..35f1507 100644 (file)
@@ -27,6 +27,7 @@
 #include "flash.h"
 #include "binarybuffer.h"
 #include "armv4_5.h"
+#include "algorithm.h"
 
 
 /* 1024 bytes */
index 56762d1..7b94675 100644 (file)
@@ -31,6 +31,7 @@
 #include "stellaris.h"
 #include "armv7m.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 #define DID0_VER(did0) ((did0 >> 28)&0x07)
index 7ac06a6..7072715 100644 (file)
@@ -27,6 +27,7 @@
 #include "stm32x.h"
 #include "armv7m.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 static int stm32x_mass_erase(struct flash_bank *bank);
index 71709bb..19ee160 100644 (file)
@@ -27,6 +27,7 @@
 #include "str7x.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 struct str7x_mem_layout mem_layout_str7bank0[] = {
index 1506cb5..870871c 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "str9x.h"
 #include "arm966e.h"
+#include "algorithm.h"
 
 
 static uint32_t bank1start = 0x00080000;
index 80f081d..abb8ecf 100644 (file)
@@ -20,8 +20,6 @@
 #ifndef ALGORITHM_H
 #define ALGORITHM_H
 
-#include "types.h"
-
 enum param_direction
 {
        PARAM_IN,
index f4e2c0d..cdeb420 100644 (file)
@@ -33,6 +33,7 @@
 #include "arm_simulator.h"
 #include "time_support.h"
 #include "target_type.h"
+#include "algorithm.h"
 
 
 #if 0
index b07111e..76c79c3 100644 (file)
@@ -36,6 +36,7 @@
 #include "arm7_9_common.h"
 #include "time_support.h"
 #include "arm_simulator.h"
+#include "algorithm.h"
 
 
 /**
index 47b32ad..e6e0bd7 100644 (file)
@@ -31,6 +31,7 @@
 #include "breakpoints.h"
 #include "arm_disassembler.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 char* armv4_5_core_reg_list[] =
index 6c6a9ec..3f9e7f5 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "breakpoints.h"
 #include "armv7m.h"
+#include "algorithm.h"
 
 #define ARRAY_SIZE(x)  ((int)(sizeof(x)/sizeof((x)[0])))
 
index 06105ee..75bc4f0 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <stddef.h>
 
-#include "algorithm.h"
 #include "command.h"
 
 struct reg;
@@ -36,6 +35,8 @@ struct trace;
 struct command_context;
 struct breakpoint;
 struct watchpoint;
+struct mem_param;
+struct reg_param;
 
 
 /**