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
__archive__
zwelch 2009-05-11 04:30:41 +00:00
parent 0643263d68
commit fbcb57baf8
27 changed files with 20 additions and 242 deletions

View File

@ -23,18 +23,11 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "time_support.h"
#include "flash.h" #include "flash.h"
#include "target.h"
#include "log.h"
#include "armv4_5.h" #include "armv4_5.h"
#include "algorithm.h"
#include "binarybuffer.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_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); static int aduc702x_register_commands(struct command_context_s *cmd_ctx);

View File

@ -39,19 +39,9 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "at91sam7.h" #include "at91sam7.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "binarybuffer.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_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); static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

View File

@ -21,18 +21,10 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "avrf.h" #include "avrf.h"
#include "avrt.h" #include "avrt.h"
#include "flash.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 */ /* AVR_JTAG_Instructions */
#define AVR_JTAG_INS_LEN 4 #define AVR_JTAG_INS_LEN 4

View File

@ -23,22 +23,11 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "cfi.h" #include "cfi.h"
#include "non_cfi.h" #include "non_cfi.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "armv4_5.h" #include "armv4_5.h"
#include "algorithm.h"
#include "binarybuffer.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_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); static int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

View File

@ -21,20 +21,10 @@
#include "config.h" #include "config.h"
#endif #endif
#include <string.h>
#include "replacements.h"
#include "flash.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_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); static int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

View File

@ -28,22 +28,9 @@
#endif #endif
#include "flash.h" #include "flash.h"
#include "command.h"
#include "target.h"
#include "time_support.h"
#include "fileio.h"
#include "image.h" #include "image.h"
#include "log.h" #include "time_support.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 <inttypes.h> #include <inttypes.h>
/* command handlers */ /* command handlers */

View File

@ -23,16 +23,9 @@
#endif #endif
#include "lpc2000.h" #include "lpc2000.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "armv4_5.h" #include "armv4_5.h"
#include "algorithm.h"
#include "binarybuffer.h" #include "binarybuffer.h"
#include <stdlib.h>
#include <string.h>
/* flash programming support for Philips LPC2xxx devices /* flash programming support for Philips LPC2xxx devices
* currently supported devices: * currently supported devices:

View File

@ -31,19 +31,9 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "lpc288x.h" #include "lpc288x.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "binarybuffer.h" #include "binarybuffer.h"
#include "types.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#define LOAD_TIMER_ERASE 0 #define LOAD_TIMER_ERASE 0
#define LOAD_TIMER_WRITE 1 #define LOAD_TIMER_WRITE 1

View File

@ -22,15 +22,7 @@
#endif #endif
#include "lpc3180_nand_controller.h" #include "lpc3180_nand_controller.h"
#include "replacements.h"
#include "log.h"
#include <stdlib.h>
#include <string.h>
#include "nand.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_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); static int lpc3180_register_commands(struct command_context_s *cmd_ctx);

View File

@ -21,20 +21,11 @@
#include "config.h" #include "config.h"
#endif #endif
#include <ctype.h> #include "mflash.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 "time_support.h" #include "time_support.h"
#include "fileio.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_to_output (mflash_gpio_num_t gpio);
static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, u8 val); static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, u8 val);

View File

@ -24,20 +24,12 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "log.h"
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <errno.h>
#include "nand.h" #include "nand.h"
#include "flash.h"
#include "time_support.h" #include "time_support.h"
#include "fileio.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_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); static int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);

View File

@ -41,10 +41,6 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include <inttypes.h>
#include "nand.h" #include "nand.h"
/* /*

View File

@ -23,13 +23,9 @@
#include "config.h" #include "config.h"
#endif #endif
#include <stdlib.h>
#include "log.h"
#include "flash.h"
#include "cfi.h"
#include "non_cfi.h" #include "non_cfi.h"
#include "cfi.h"
#define KB 1024 #define KB 1024
#define MB (1024*1024) #define MB (1024*1024)

View File

@ -21,21 +21,10 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "ocl.h" #include "ocl.h"
#include "flash.h" #include "flash.h"
#include "target.h"
#include "log.h"
#include "binarybuffer.h"
#include "types.h"
#include "embeddedice.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_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); static int ocl_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

View File

@ -26,17 +26,11 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "log.h"
#include <stdlib.h>
#include <string.h>
#include "nand.h" #include "nand.h"
#include "target.h"
#include "armv4_5.h" #include "armv4_5.h"
#include "binarybuffer.h" #include "binarybuffer.h"
typedef struct orion_nand_controller_s typedef struct orion_nand_controller_s
{ {
struct target_s *target; struct target_s *target;

View File

@ -27,18 +27,9 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "pic32mx.h" #include "pic32mx.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "mips32.h" #include "mips32.h"
#include "algorithm.h"
#include "binarybuffer.h"
#include <stdlib.h>
#include <string.h>
static static
struct pic32mx_devs_s { struct pic32mx_devs_s {

View File

@ -28,15 +28,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "log.h"
#include <stdlib.h>
#include <string.h>
#include "nand.h"
#include "s3c24xx_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_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); static int s3c2410_init(struct nand_device_s *device);

View File

@ -28,15 +28,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "log.h"
#include <stdlib.h>
#include <string.h>
#include "nand.h"
#include "s3c24xx_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_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); static int s3c2412_init(struct nand_device_s *device);

View File

@ -28,15 +28,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "log.h"
#include <stdlib.h>
#include <string.h>
#include "nand.h"
#include "s3c24xx_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_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); static int s3c2440_init(struct nand_device_s *device);

View File

@ -28,15 +28,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "log.h"
#include <stdlib.h>
#include <string.h>
#include "nand.h"
#include "s3c24xx_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_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); static int s3c2443_init(struct nand_device_s *device);

View File

@ -28,15 +28,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "log.h"
#include <stdlib.h>
#include <string.h>
#include "nand.h"
#include "s3c24xx_nand.h" #include "s3c24xx_nand.h"
#include "target.h"
s3c24xx_nand_controller_t * s3c24xx_nand_controller_t *
s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,

View File

@ -28,20 +28,10 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "stellaris.h" #include "stellaris.h"
#include "cortex_m3.h" #include "armv7m.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "binarybuffer.h" #include "binarybuffer.h"
#include "types.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#define DID0_VER(did0) ((did0>>28)&0x07) #define DID0_VER(did0) ((did0>>28)&0x07)
static int stellaris_register_commands(struct command_context_s *cmd_ctx); static int stellaris_register_commands(struct command_context_s *cmd_ctx);

View File

@ -24,18 +24,10 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "stm32x.h" #include "stm32x.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "armv7m.h" #include "armv7m.h"
#include "algorithm.h"
#include "binarybuffer.h" #include "binarybuffer.h"
#include <stdlib.h>
#include <string.h>
static int stm32x_register_commands(struct command_context_s *cmd_ctx); 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); static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

View File

@ -24,19 +24,10 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "str7x.h" #include "str7x.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "armv4_5.h" #include "armv4_5.h"
#include "algorithm.h"
#include "binarybuffer.h" #include "binarybuffer.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
str7x_mem_layout_t mem_layout_str7bank0[] = { str7x_mem_layout_t mem_layout_str7bank0[] = {
{0x00000000, 0x02000, 0x01}, {0x00000000, 0x02000, 0x01},

View File

@ -27,20 +27,9 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "str9x.h" #include "str9x.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "armv4_5.h"
#include "arm966e.h" #include "arm966e.h"
#include "algorithm.h"
#include "binarybuffer.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
static u32 bank1start = 0x00080000; static u32 bank1start = 0x00080000;

View File

@ -24,21 +24,9 @@
#include "config.h" #include "config.h"
#endif #endif
#include "replacements.h"
#include "str9xpec.h" #include "str9xpec.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "armv4_5.h"
#include "arm7_9_common.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_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); static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);

View File

@ -21,10 +21,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include "log.h"
#include "tms470.h" #include "tms470.h"
#include <string.h>
#include <unistd.h>
static int tms470_register_commands(struct command_context_s *cmd_ctx); 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); static int tms470_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);