Audit and eliminate redundant #include directives in src/flash sources.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1712 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/flash/aduc702x.c b/src/flash/aduc702x.c
index 5b80e0c69da21ec92acb041d350dd71752c2050d..2a9c1c266ebcc60dd89fb9b19a8ad0a88cc132ee 100644 (file)
--- a/src/flash/aduc702x.c
+++ b/src/flash/aduc702x.c
@@ -23,18 +23,11 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "time_support.h"
 #include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv4_5.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
+#include "time_support.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static int aduc702x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 static int aduc702x_register_commands(struct command_context_s *cmd_ctx);

diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c
index 8bb572f94670048ffb5dca1303012b90f43a7739..c840d5057d5223b097d54cddbd351db47391b72a 100644 (file)
--- a/src/flash/at91sam7.c
+++ b/src/flash/at91sam7.c
@@ -39,19 +39,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "at91sam7.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "binarybuffer.h"
-#include "types.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static int at91sam7_register_commands(struct command_context_s *cmd_ctx);
 static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

diff --git a/src/flash/avrf.c b/src/flash/avrf.c
index 9d32e6d19a26fc42e6141794e0ed7ac65a4dcbf8..307e54e891ed60eaa5e8d6458527096ab1497075 100644 (file)
--- a/src/flash/avrf.c
+++ b/src/flash/avrf.c
@@ -21,18 +21,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "avrf.h"
 #include "avrt.h"
 #include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "algorithm.h"
-#include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 /* AVR_JTAG_Instructions */
 #define AVR_JTAG_INS_LEN                                                       4

diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index edc4645f8c8f4dafe4e066e39e288f4b848de133..0eb44d6b215f2703bf756ab4da61ef8542ae5cb3 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -23,22 +23,11 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "cfi.h"
 #include "non_cfi.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv4_5.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
-#include "types.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static int cfi_register_commands(struct command_context_s *cmd_ctx);
 static int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

diff --git a/src/flash/ecos.c b/src/flash/ecos.c
index bc31fdd464f0238a55bda1cb6b2564ba8855e62f..3c2b456b6c47a9ae1bf17b1ff06504023467e5f3 100644 (file)
--- a/src/flash/ecos.c
+++ b/src/flash/ecos.c
@@ -21,20 +21,10 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-
-#include "replacements.h"
-
 #include "flash.h"
+#include "embeddedice.h"
+#include "image.h"
 
-#include "target.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "binarybuffer.h"
-#include "../target/embeddedice.h"
-#include "types.h"
 
 static int ecosflash_register_commands(struct command_context_s *cmd_ctx);
 static int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 0ad6c7a6a3e1869c47c6c5082a6a1cece57f4baa..4f4d272a4b77f8d240439240d4e627c099531640 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -28,22 +28,9 @@
 #endif
 
 #include "flash.h"
-#include "command.h"
-#include "target.h"
-#include "time_support.h"
-#include "fileio.h"
 #include "image.h"
-#include "log.h"
-#include "armv4_5.h"
-#include "algorithm.h"
-#include "binarybuffer.h"
-#include "armv7m.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <errno.h>
+#include "time_support.h"
+
 #include <inttypes.h>
 
 /* command handlers */

diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index db0602f1728653393c772eb7b6dca61df2fa85d8..2708d5352d0a3d40f69420eb1ba296c5f7339d42 100644 (file)
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -23,16 +23,9 @@
 #endif
 
 #include "lpc2000.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv4_5.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 /* flash programming support for Philips LPC2xxx devices
  * currently supported devices:

diff --git a/src/flash/lpc288x.c b/src/flash/lpc288x.c
index 1f47896452856892dc55eba0f2ac54ebfb8bfb58..505dd1e396192de836e51ccd10e5f92a0899648c 100644 (file)
--- a/src/flash/lpc288x.c
+++ b/src/flash/lpc288x.c
@@ -31,19 +31,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "lpc288x.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "binarybuffer.h"
-#include "types.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #define LOAD_TIMER_ERASE       0
 #define LOAD_TIMER_WRITE       1

diff --git a/src/flash/lpc3180_nand_controller.c b/src/flash/lpc3180_nand_controller.c
index c24e30aa1e4a51bc24e03acf2365fb632346f64b..ffe7ce2b825b0544cdb1f39ecda05f6cb646ce1a 100644 (file)
--- a/src/flash/lpc3180_nand_controller.c
+++ b/src/flash/lpc3180_nand_controller.c
@@ -22,15 +22,7 @@
 #endif
 
 #include "lpc3180_nand_controller.h"
-
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
 #include "nand.h"
-#include "target.h"
 
 static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int lpc3180_register_commands(struct command_context_s *cmd_ctx);

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 451d942b1e7717b0ea599b4a9c4ac402755f445c..8913e1662aea1da556d4cd6588c945f843c5499d 100644 (file)
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -21,20 +21,11 @@
 #include "config.h"
 #endif
 
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <inttypes.h>
-
-#include "command.h"
-#include "log.h"
-#include "target.h"
+#include "mflash.h"
 #include "time_support.h"
 #include "fileio.h"
-#include "mflash.h"
+#include "log.h"
+
 
 static int s3c2440_set_gpio_to_output (mflash_gpio_num_t gpio);
 static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, u8 val);

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 67f1537485fabb3849c6bc94fa8406657f5593a1..8efed037c6073153fea0a4edf8ab0ee8340b8fbe 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -24,20 +24,12 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
-#include <errno.h>
-
 #include "nand.h"
-#include "flash.h"
 #include "time_support.h"
 #include "fileio.h"
-#include "image.h"
+
+#include <inttypes.h>
+
 
 static int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);

diff --git a/src/flash/nand_ecc.c b/src/flash/nand_ecc.c
index 91dd8c6b8f44f3c6eef299bb7d255856b92266c8..c1a18835f7f063f29797db642c7e5f6e30f00f0f 100644 (file)
--- a/src/flash/nand_ecc.c
+++ b/src/flash/nand_ecc.c
@@ -41,10 +41,6 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
-#include <inttypes.h>
-
 #include "nand.h"
 
 /*

diff --git a/src/flash/non_cfi.c b/src/flash/non_cfi.c
index 20aa9f1e1f095185624b43225e6ff6fcca8242ae..3e86e0da30ed80cd9d639d906eb81c7793f2b607 100644 (file)
--- a/src/flash/non_cfi.c
+++ b/src/flash/non_cfi.c
@@ -23,13 +23,9 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-
-#include "log.h"
-
-#include "flash.h"
-#include "cfi.h"
 #include "non_cfi.h"
+#include "cfi.h"
+
 
 #define KB 1024
 #define MB (1024*1024)

diff --git a/src/flash/ocl.c b/src/flash/ocl.c
index ec8c20dcecf4c8b2287d3b11e4c64d95fa04dab7..e2099a1191a41d8fe780a0da960b13cedb7fb95c 100644 (file)
--- a/src/flash/ocl.c
+++ b/src/flash/ocl.c
@@ -21,21 +21,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "ocl.h"
-
 #include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "binarybuffer.h"
-#include "types.h"
 #include "embeddedice.h"
-#include "arm7_9_common.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static int ocl_register_commands(struct command_context_s *cmd_ctx);
 static int ocl_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

diff --git a/src/flash/orion_nand.c b/src/flash/orion_nand.c
index 678eb94c758a1a3974819b598a91ee6c8338a5ad..fb5a34037d22f0647305472c76853baed588eaad 100644 (file)
--- a/src/flash/orion_nand.c
+++ b/src/flash/orion_nand.c
@@ -26,17 +26,11 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
 #include "nand.h"
-#include "target.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
 
+
 typedef struct orion_nand_controller_s
 {
        struct target_s *target;

diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c
index 94ec74589ceeb2d5dba90f67e2fa6a2870d03ee9..2a5ce64186a2ce2e512236d73868288b8d5ce20d 100644 (file)
--- a/src/flash/pic32mx.c
+++ b/src/flash/pic32mx.c
@@ -27,18 +27,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "pic32mx.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "mips32.h"
-#include "algorithm.h"
-#include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 static
 struct pic32mx_devs_s {

diff --git a/src/flash/s3c2410_nand.c b/src/flash/s3c2410_nand.c
index 8d218f8fb078fcb03861e42ea0694e216bcd809f..951677c5201dfa10cd2a80ec1fdf4de9f1c22e29 100644 (file)
--- a/src/flash/s3c2410_nand.c
+++ b/src/flash/s3c2410_nand.c
@@ -28,15 +28,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
+
 
 static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int s3c2410_init(struct nand_device_s *device);

diff --git a/src/flash/s3c2412_nand.c b/src/flash/s3c2412_nand.c
index 11e54e71b22815500b87cfbdc188120e1dec43a2..271b3c40c1fdfdbcd7b488a9977e3c9f11003bd3 100644 (file)
--- a/src/flash/s3c2412_nand.c
+++ b/src/flash/s3c2412_nand.c
@@ -28,15 +28,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
+
 
 static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int s3c2412_init(struct nand_device_s *device);

diff --git a/src/flash/s3c2440_nand.c b/src/flash/s3c2440_nand.c
index 862a013d47438cbb524d3935dba77f34594c3ab4..61aace65e02da2da886b896ab70ce5e513321ba1 100644 (file)
--- a/src/flash/s3c2440_nand.c
+++ b/src/flash/s3c2440_nand.c
@@ -28,15 +28,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
+
 
 static int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int s3c2440_init(struct nand_device_s *device);

diff --git a/src/flash/s3c2443_nand.c b/src/flash/s3c2443_nand.c
index aa12966c09febd051c37434640320d9313cfef5d..7dc3aa3a33d4ae1351cffa1f0cf2ddb4c26243a1 100644 (file)
--- a/src/flash/s3c2443_nand.c
+++ b/src/flash/s3c2443_nand.c
@@ -28,15 +28,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
+
 
 static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
 static int s3c2443_init(struct nand_device_s *device);

diff --git a/src/flash/s3c24xx_nand.c b/src/flash/s3c24xx_nand.c
index 380f320f0994f200100a3be8a4e9149d3a963842..ecd48eea8708331e81eb70cd223a07f2e431ab43 100644 (file)
--- a/src/flash/s3c24xx_nand.c
+++ b/src/flash/s3c24xx_nand.c
@@ -28,15 +28,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
+
 
 s3c24xx_nand_controller_t *
 s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,

diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index 61e30f5dc38d0efe0147f93d0fbb10825b16a963..38ded4f1ae4bebaee3ec91f25616dc268719cffc 100644 (file)
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -28,20 +28,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "stellaris.h"
-#include "cortex_m3.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
+#include "armv7m.h"
 #include "binarybuffer.h"
-#include "types.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #define DID0_VER(did0) ((did0>>28)&0x07)
 static int stellaris_register_commands(struct command_context_s *cmd_ctx);

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index e151fc573811ffd0bb6f6d4710eabeaa76c92865..2a3b764ca3d053055bbca1bcde6ba703b809d297 100644 (file)
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -24,18 +24,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "stm32x.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv7m.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 static int stm32x_register_commands(struct command_context_s *cmd_ctx);
 static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 1d9396beb65e85263f4ceecf9ee081890496f4f2..ffd01fa02bb4d8d6b0fea9c8d133683188a1214d 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -24,19 +24,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "str7x.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "armv4_5.h"
-#include "algorithm.h"
 #include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 str7x_mem_layout_t mem_layout_str7bank0[] = {
        {0x00000000, 0x02000, 0x01},

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index fbba4fec4b748dcafe5551cb734637fa20d52202..32445ae23af4b030c6a6b55bc1a1b97065861cfc 100644 (file)
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -27,20 +27,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "str9x.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "armv4_5.h"
 #include "arm966e.h"
-#include "algorithm.h"
-#include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static u32 bank1start = 0x00080000;
 

diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index f6ffa6e4f9d0d4548803ae1e2d474a15f8cde520..dc195c148fa1f5ef662a049a74f4ca0008e712b1 100644 (file)
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -24,21 +24,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "str9xpec.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "armv4_5.h"
 #include "arm7_9_common.h"
-#include "jtag.h"
-#include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
 
 static int str9xpec_register_commands(struct command_context_s *cmd_ctx);
 static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

diff --git a/src/flash/tms470.c b/src/flash/tms470.c
index 91f0cc0f26fe52daa81230eb08cba6841326bbd2..1d7497f1fdbad5c8f2106af03c4f607f5644bb10 100644 (file)
--- a/src/flash/tms470.c
+++ b/src/flash/tms470.c
@@ -21,10 +21,8 @@
 #include "config.h"
 #endif
 
-#include "log.h"
 #include "tms470.h"
-#include <string.h>
-#include <unistd.h>
+
 
 static int tms470_register_commands(struct command_context_s *cmd_ctx);
 static int tms470_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);