David Brownell <david-b@pacbell.net>:

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

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index c1e97dbbe29eb20defdd3ff4336acdb6b6979f0c..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;
 
@@ -194,6 +183,7 @@ static int str9x_protect_check(struct flash_bank_s *bank)
        int i;
        u32 adr;
        u32 status = 0;
+       u16 hstatus = 0;
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -212,10 +202,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
                        {
                                return retval;
                        }
-                       if ((retval=target_read_u16(target, adr, (u16*)&status))!=ERROR_OK)
+                       if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
                        {
                                return retval;
                        }
+                       status = hstatus;
                }
                else
                {
@@ -237,10 +228,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
                {
                        return retval;
                }
-               if ((retval=target_read_u16(target, adr, (u16*)&status))!=ERROR_OK)
+               if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
                {
                        return retval;
                }
+               status = hstatus;
        }
        
        /* read array command */
@@ -509,7 +501,7 @@ static int str9x_write(struct flash_bank_s *bank,
        u32 address = bank->base + offset;
        u32 bytes_written = 0;
        u8 status;
-       u32 retval;
+       int retval;
        u32 check_address = offset;
        u32 bank_adr;
        int i;