Freddie Chopin <freddie_chopin@op.pl> move files about to where they belong

[openocd.git] / src / flash / at91sam7.c

diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c
index efc604194254dc70675302ea415cb2e4dc9870c6..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);
@@ -322,11 +312,11 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
        u16 bnk, sec;
        u16 arch;
        u32 cidr;
-       u8 banks_num;
-       u16 num_nvmbits;
-       u16 sectors_num;
-       u16 pages_per_sector;
-       u16 page_size;
+       u8 banks_num = 0;
+       u16 num_nvmbits = 0;
+       u16 sectors_num = 0;
+       u16 pages_per_sector = 0;
+       u16 page_size = 0;
        u32 ext_freq;
        u32 bank_size;
        u32 base_address = 0;
@@ -937,7 +927,8 @@ static int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
 static int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
        u32 cmd;
-       u32 sector, pagen;
+       int sector;
+       u32 pagen;
 
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;