Rick Altherr <kc8apf@kc8apf.net> - fix flash write_bank output.

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

diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index b75ea9bb15533a27914f0dca464583d4a9c25082..830e380ab609e47fae221735e6364b8f3c239b82 100644 (file)
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -241,6 +241,7 @@ int lpc2000_build_sector_list(struct flash_bank_s *bank)
  */
 int lpc2000_iap_call(flash_bank_t *bank, int code, u32 param_table[5], u32 result_table[2])
 {
+       int retval;
        lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv;
        target_t *target = bank->target;
        mem_param_t mem_params[2];
@@ -263,7 +264,10 @@ int lpc2000_iap_call(flash_bank_t *bank, int code, u32 param_table[5], u32 resul
                /* write IAP code to working area */
                target_buffer_set_u32(target, jump_gate, ARMV4_5_BX(12));
                target_buffer_set_u32(target, jump_gate + 4, ARMV4_5_B(0xfffffe, 0));
-               target->type->write_memory(target, lpc2000_info->iap_working_area->address, 4, 2, jump_gate);
+               if((retval = target->type->write_memory(target, lpc2000_info->iap_working_area->address, 4, 2, jump_gate)) != ERROR_OK)
+               {
+                       return retval;
+               }
        }
        
        armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
@@ -418,6 +422,7 @@ int lpc2000_erase(struct flash_bank_s *bank, int first, int last)
        
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -480,26 +485,17 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        int status_code;
        int i;
        working_area_t *download_area;
-        int retval = ERROR_OK;
+       int retval = ERROR_OK;
                 
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-
-       /* allocate a working area */
-       if (target_alloc_working_area(target, lpc2000_info->cmd51_max_buffer, &download_area) != ERROR_OK)
-       {
-               LOG_ERROR("no working area specified, can't write LPC2000 internal flash");
-               return ERROR_FLASH_OPERATION_FAILED;
-       }
        
        if (offset + count > bank->size)
-        {
-               retval = ERROR_FLASH_DST_OUT_OF_BANK;
-                goto cleanup_working_area;
-       }
-
+               return ERROR_FLASH_DST_OUT_OF_BANK;
+               
        if (lpc2000_info->cmd51_can_256b)
                dst_min_alignment = 256;
        else
@@ -508,8 +504,7 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        if (offset % dst_min_alignment)
        {
                LOG_WARNING("offset 0x%x breaks required alignment 0x%x", offset, dst_min_alignment);
-               retval = ERROR_FLASH_DST_BREAKS_ALIGNMENT;
-                goto cleanup_working_area;
+               return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
        
        for (i = 0; i < bank->num_sectors; i++)
@@ -538,6 +533,13 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                buf_set_u32(buffer + 0x14, 0, 32, checksum);
        }
        
+       /* allocate a working area */
+       if (target_alloc_working_area(target, lpc2000_info->cmd51_max_buffer, &download_area) != ERROR_OK)
+       {
+               LOG_ERROR("no working area specified, can't write LPC2000 internal flash");
+               return ERROR_FLASH_OPERATION_FAILED;
+       }
+       
        while (bytes_remaining > 0)
        {
                u32 thisrun_bytes;
@@ -558,7 +560,7 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                {
                        case ERROR_FLASH_OPERATION_FAILED:
                                retval = ERROR_FLASH_OPERATION_FAILED;
-                                break;
+                               break;
                        case LPC2000_CMD_SUCCESS:
                                break;
                        case LPC2000_INVALID_SECTOR:
@@ -567,18 +569,19 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                        default:
                                LOG_WARNING("lpc2000 prepare sectors returned %i", status_code);
                                retval = ERROR_FLASH_OPERATION_FAILED;
-                                break;
+                               break;
                }
 
-                /* Exit if error occured */
-                if (retval != ERROR_OK)
-                  goto cleanup_working_area;
+               /* Exit if error occured */
+               if (retval != ERROR_OK)
+                       break;
                
                if (bytes_remaining >= thisrun_bytes)
                {                      
-                       if (retval = target_write_buffer(bank->target, download_area->address, thisrun_bytes, buffer + bytes_written) != ERROR_OK)
+                       if ((retval = target_write_buffer(bank->target, download_area->address, thisrun_bytes, buffer + bytes_written)) != ERROR_OK)
                        {
-                                goto cleanup_working_area;
+                               retval = ERROR_FLASH_OPERATION_FAILED;
+                               break;
                        }
                }
                else
@@ -604,7 +607,7 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                {
                        case ERROR_FLASH_OPERATION_FAILED:
                                retval = ERROR_FLASH_OPERATION_FAILED;
-                                break;
+                               break;
                        case LPC2000_CMD_SUCCESS:
                                break;
                        case LPC2000_INVALID_SECTOR:
@@ -613,21 +616,20 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                        default:
                                LOG_WARNING("lpc2000 returned %i", status_code);
                                retval = ERROR_FLASH_OPERATION_FAILED;
-                                break;
+                               break;
                }
                
-                /* Exit if error occured */
-                if (retval != ERROR_OK)
-                  goto cleanup_working_area;
-
+               /* Exit if error occured */
+               if (retval != ERROR_OK)
+                       break;
+               
                if (bytes_remaining > thisrun_bytes)
                        bytes_remaining -= thisrun_bytes;
                else
                        bytes_remaining = 0;
                bytes_written += thisrun_bytes;
        }
-
- cleanup_working_area:
+       
        target_free_working_area(target, download_area);
        
        return retval;
@@ -645,6 +647,7 @@ int lpc2000_erase_check(struct flash_bank_s *bank)
 {
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
        
@@ -687,6 +690,7 @@ int lpc2000_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd,
 
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }