ocd_flash_banks now returns empty list when no flash banks are configured instead...

[openocd] / src / flash / ecos.c

diff --git a/src/flash/ecos.c b/src/flash/ecos.c
index 6a312ced29585d21e4a3be4247bb3110ce0b67a3..f6c2442f16c663e187ca4d022d31d376faadbbe4 100644 (file)
--- a/src/flash/ecos.c
+++ b/src/flash/ecos.c
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 Øyvind Harboe                                      *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "replacements.h"
 
 
@@ -43,7 +45,6 @@ int ecosflash_erase(struct flash_bank_s *bank, int first, int last);
 int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last);
 int ecosflash_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
 int ecosflash_probe(struct flash_bank_s *bank);
-int ecosflash_erase_check(struct flash_bank_s *bank);
 int ecosflash_protect_check(struct flash_bank_s *bank);
 int ecosflash_info(struct flash_bank_s *bank, char *buf, int buf_size);
 
@@ -62,7 +63,7 @@ flash_driver_t ecosflash_flash =
        .write = ecosflash_write,
        .probe = ecosflash_probe,
        .auto_probe = ecosflash_probe,
-       .erase_check = ecosflash_erase_check,
+       .erase_check = default_flash_blank_check,
        .protect_check = ecosflash_protect_check,
        .info = ecosflash_info
 };
@@ -145,14 +146,14 @@ int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, c
        
        if (argc < 7)
        {
-               WARNING("incomplete flash_bank ecosflash configuration");
+               LOG_WARNING("incomplete flash_bank ecosflash configuration");
                return ERROR_FLASH_BANK_INVALID;
        }
        
        info = malloc(sizeof(ecosflash_flash_bank_t));
        if(info == NULL)
        {
-               ERROR("no memory for flash bank info");
+               LOG_ERROR("no memory for flash bank info");
                exit(-1);
        }
        bank->driver_priv = info;
@@ -178,7 +179,7 @@ int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, c
        info->target = get_target_by_num(strtoul(args[5], NULL, 0));
        if (info->target == NULL)
        {
-               ERROR("no target '%i' configured", (int)strtoul(args[5], NULL, 0));
+               LOG_ERROR("no target '%i' configured", (int)strtoul(args[5], NULL, 0));
                exit(-1);
        }
        return ERROR_OK;
@@ -194,10 +195,11 @@ int loadDriver(ecosflash_flash_bank_t *info)
        image.base_address_set = 0;
        image.start_address_set = 0;
        target_t *target=info->target;
+       int retval;
        
-       if (image_open(&image, info->driverPath, NULL) != ERROR_OK)
+       if ((retval=image_open(&image, info->driverPath, NULL)) != ERROR_OK)
        {
-               return ERROR_FLASH_BANK_INVALID;
+               return retval;
        }
        
        info->start_address=image.start_address;
@@ -210,14 +212,13 @@ int loadDriver(ecosflash_flash_bank_t *info)
                int retval;
                if ((retval = image_read_section(&image, i, 0x0, image.sections[i].size, buffer, &buf_cnt)) != ERROR_OK)
                {
-                       ERROR("image_read_section failed with error code: %i", retval);
                        free(buffer);
                        image_close(&image);
-                       return ERROR_FLASH_BANK_INVALID;
+                       return retval;
                }
                target_write_buffer(target, image.sections[i].base_address, buf_cnt, buffer);
                image_size += buf_cnt;
-               DEBUG("%u byte written at address 0x%8.8x", buf_cnt, image.sections[i].base_address);
+               LOG_DEBUG("%u byte written at address 0x%8.8x", buf_cnt, image.sections[i].base_address);
                
                free(buffer);
        }
@@ -264,7 +265,7 @@ int runCode(ecosflash_flash_bank_t *info,
                        codeStop, timeout, 
                        &armv4_5_info)) != ERROR_OK)
        {
-               ERROR("error executing eCos flash algorithm");
+               LOG_ERROR("error executing eCos flash algorithm");
                return retval;
        }
        
@@ -301,8 +302,8 @@ int eCosBoard_erase(ecosflash_flash_bank_t *info, u32 address, u32 len)
        
        if (flashErr != 0x0)
        {
-               ERROR("Flash erase failed with %d (%s)\n", flashErr, flash_errmsg(flashErr));
-               return ERROR_JTAG_DEVICE_ERROR;
+               LOG_ERROR("Flash erase failed with %d (%s)\n", flashErr, flash_errmsg(flashErr));
+               return ERROR_FAIL;
        }
 
        return ERROR_OK;
@@ -342,7 +343,7 @@ int eCosBoard_flash(ecosflash_flash_bank_t *info, void *data, u32 address, u32 l
                }
                
                int retval;
-       retval=target_write_buffer(target, buffer, t, ((char *)data)+i);
+       retval=target_write_buffer(target, buffer, t, ((u8 *)data)+i);
        if (retval != ERROR_OK)
                return retval;
        
@@ -360,8 +361,8 @@ int eCosBoard_flash(ecosflash_flash_bank_t *info, void *data, u32 address, u32 l
 
                if (flashErr != 0x0)
                {
-                       ERROR("Flash prog failed with %d (%s)\n", flashErr, flash_errmsg(flashErr));
-                       return ERROR_JTAG_DEVICE_ERROR;
+                       LOG_ERROR("Flash prog failed with %d (%s)\n", flashErr, flash_errmsg(flashErr));
+                       return ERROR_FAIL;
                }
     }
        return ERROR_OK;
@@ -442,11 +443,6 @@ int ecosflash_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
 }
 
 
-int ecosflash_erase_check(struct flash_bank_s *bank)
-{
-       return ERROR_OK;
-}
-
 int ecosflash_protect_check(struct flash_bank_s *bank)
 {
        return ERROR_OK;