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

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

diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index bf268b5867b7ee518e660d4718c52eec69a7970a..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);
@@ -59,7 +49,6 @@ static u32 stellaris_get_flash_status(flash_bank_t *bank);
 static void stellaris_set_flash_mode(flash_bank_t *bank,int mode);
 //static u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout);
 
-static int stellaris_read_part_info(struct flash_bank_s *bank);
 static int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int stellaris_mass_erase(struct flash_bank_s *bank);
 
@@ -570,12 +559,12 @@ static int stellaris_erase(struct flash_bank_s *bank, int first, int last)
                return ERROR_FLASH_OPERATION_FAILED;
        }       
        
-       if ((first < 0) || (last < first) || (last >= stellaris_info->num_pages))
+       if ((first < 0) || (last < first) || (last >= (int)stellaris_info->num_pages))
        {
                return ERROR_FLASH_SECTOR_INVALID;
        }
        
-       if ((first == 0) && (last == (stellaris_info->num_pages-1)))
+       if ((first == 0) && (last == ((int)stellaris_info->num_pages-1)))
        {
                return stellaris_mass_erase(bank);
        }
@@ -821,7 +810,7 @@ static int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u3
        u32 words_remaining = (count / 4);
        u32 bytes_remaining = (count & 0x00000003);
        u32 bytes_written = 0;
-       u32 retval;
+       int retval;
        
        if (bank->target->state != TARGET_HALTED)
        {