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

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

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index e9a582f26fb2347f38f83e6792778e0d26de1802..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);
@@ -120,6 +112,7 @@ static u32 stm32x_get_flash_status(flash_bank_t *bank)
 
 static u32 stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
 {
+       target_t *target = bank->target;
        u32 status;
        
        /* wait for busy to clear */
@@ -128,7 +121,11 @@ static u32 stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
                LOG_DEBUG("status: 0x%x", status);
                alive_sleep(1);
        }
-       
+       /* Clear but report errors */
+       if (status & (FLASH_WRPRTERR|FLASH_PGERR))
+       {
+               target_write_u32(target, STM32_FLASH_SR, FLASH_WRPRTERR|FLASH_PGERR);   
+       }
        return status;
 }
 
@@ -568,6 +565,8 @@ static int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset,
                if (buf_get_u32(reg_params[3].value, 0, 32) & FLASH_PGERR)
                {
                        LOG_ERROR("flash memory not erased before writing");
+                       /* Clear but report errors */
+                       target_write_u32(target, STM32_FLASH_SR, FLASH_PGERR);  
                        retval = ERROR_FLASH_OPERATION_FAILED;
                        break;
                }
@@ -575,6 +574,8 @@ static int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset,
                if (buf_get_u32(reg_params[3].value, 0, 32) & FLASH_WRPRTERR)
                {
                        LOG_ERROR("flash memory write protected");
+                       /* Clear but report errors */
+                       target_write_u32(target, STM32_FLASH_SR, FLASH_WRPRTERR);       
                        retval = ERROR_FLASH_OPERATION_FAILED;
                        break;
                }
@@ -603,7 +604,7 @@ static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 c
        u32 address = bank->base + offset;
        u32 bytes_written = 0;
        u8 status;
-       u32 retval;
+       int retval;
        
        if (bank->target->state != TARGET_HALTED)
        {
@@ -649,8 +650,11 @@ static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 c
 
        while (words_remaining > 0)
        {
+               u16 value;
+               memcpy(&value, buffer + bytes_written, sizeof(u16));
+
                target_write_u32(target, STM32_FLASH_CR, FLASH_PG);
-               target_write_u16(target, address, *(u16*)(buffer + bytes_written));
+               target_write_u16(target, address, value);
                
                status = stm32x_wait_status_busy(bank, 5);
                
@@ -672,18 +676,11 @@ static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 c
        
        if (bytes_remaining)
        {
-               u8 last_halfword[2] = {0xff, 0xff};
-               int i = 0;
-                               
-               while(bytes_remaining > 0)
-               {
-                       last_halfword[i++] = *(buffer + bytes_written); 
-                       bytes_remaining--;
-                       bytes_written++;
-               }
-               
+               u16 value = 0xffff;
+               memcpy(&value, buffer + bytes_written, bytes_remaining);
+
                target_write_u32(target, STM32_FLASH_CR, FLASH_PG);
-               target_write_u16(target, address, *(u16*)last_halfword);
+               target_write_u16(target, address, value);
                
                status = stm32x_wait_status_busy(bank, 5);