X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fecos.c;h=ad27a45d360a18d7bbe1e430cf4abf99df631078;hp=e19ac9b0919abd3e68f608de41878ceebbbb7442;hb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;hpb=9af5e445b796f3b4a51d41f9d2eeaf1f5cd78e3b diff --git a/src/flash/ecos.c b/src/flash/ecos.c index e19ac9b091..ad27a45d36 100644 --- a/src/flash/ecos.c +++ b/src/flash/ecos.c @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007,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 * @@ -26,15 +26,6 @@ #include "image.h" -static int ecosflash_register_commands(struct command_context_s *cmd_ctx); -static int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); -static int ecosflash_erase(struct flash_bank_s *bank, int first, int last); -static int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last); -static int ecosflash_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count); -static int ecosflash_probe(struct flash_bank_s *bank); -static int ecosflash_protect_check(struct flash_bank_s *bank); -static int ecosflash_info(struct flash_bank_s *bank, char *buf, int buf_size); - #if 0 static uint32_t ecosflash_get_flash_status(flash_bank_t *bank); static void ecosflash_set_flash_mode(flash_bank_t *bank,int mode); @@ -42,31 +33,16 @@ static uint32_t ecosflash_wait_status_busy(flash_bank_t *bank, uint32_t waitbits static int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); #endif -flash_driver_t ecosflash_flash = -{ - .name = "ecosflash", - .register_commands = ecosflash_register_commands, - .flash_bank_command = ecosflash_flash_bank_command, - .erase = ecosflash_erase, - .protect = ecosflash_protect, - .write = ecosflash_write, - .probe = ecosflash_probe, - .auto_probe = ecosflash_probe, - .erase_check = default_flash_blank_check, - .protect_check = ecosflash_protect_check, - .info = ecosflash_info -}; - -typedef struct ecosflash_flash_bank_s +struct ecosflash_flash_bank { - struct target_s *target; - working_area_t *write_algorithm; - working_area_t *erase_check_algorithm; + struct target *target; + struct working_area *write_algorithm; + struct working_area *erase_check_algorithm; char *driverPath; uint32_t start_address; -} ecosflash_flash_bank_t; +}; -static const int sectorSize=0x10000; +static const int sectorSize = 0x10000; char * flash_errmsg(int err); @@ -128,9 +104,9 @@ flash_errmsg(int err) /* flash bank ecosflash */ -static int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) +FLASH_BANK_COMMAND_HANDLER(ecosflash_flash_bank_command) { - ecosflash_flash_bank_t *info; + struct ecosflash_flash_bank *info; if (argc < 7) { @@ -138,23 +114,23 @@ static int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char return ERROR_FLASH_BANK_INVALID; } - info = malloc(sizeof(ecosflash_flash_bank_t)); + info = malloc(sizeof(struct ecosflash_flash_bank)); if (info == NULL) { LOG_ERROR("no memory for flash bank info"); exit(-1); } bank->driver_priv = info; - info->driverPath=strdup(args[6]); + info->driverPath = strdup(args[6]); /* eCos flash sector sizes are not exposed to OpenOCD, use 0x10000 as - * a way to improve impeadance matach between OpenOCD and eCos flash + * a way to improve impedance match between OpenOCD and eCos flash * driver. */ int i = 0; uint32_t offset = 0; - bank->num_sectors=bank->size/sectorSize; - bank->sectors = malloc(sizeof(flash_sector_t) * bank->num_sectors); + bank->num_sectors = bank->size/sectorSize; + bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors); for (i = 0; i < bank->num_sectors; i++) { bank->sectors[i].offset = offset; @@ -173,23 +149,23 @@ static int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char return ERROR_OK; } -static int loadDriver(ecosflash_flash_bank_t *info) +static int loadDriver(struct ecosflash_flash_bank *info) { uint32_t buf_cnt; uint32_t image_size; - image_t image; + struct image image; image.base_address_set = 0; image.start_address_set = 0; - target_t *target=info->target; + struct target *target = info->target; int retval; - if ((retval=image_open(&image, info->driverPath, NULL)) != ERROR_OK) + if ((retval = image_open(&image, info->driverPath, NULL)) != ERROR_OK) { return retval; } - info->start_address=image.start_address; + info->start_address = image.start_address; image_size = 0x0; int i; @@ -215,23 +191,23 @@ static int loadDriver(ecosflash_flash_bank_t *info) return ERROR_OK; } -static int const OFFSET_ERASE=0x0; -static int const OFFSET_ERASE_SIZE=0x8; -static int const OFFSET_FLASH=0xc; -static int const OFFSET_FLASH_SIZE=0x8; -static int const OFFSET_GET_WORKAREA=0x18; -static int const OFFSET_GET_WORKAREA_SIZE=0x4; +static int const OFFSET_ERASE = 0x0; +static int const OFFSET_ERASE_SIZE = 0x8; +static int const OFFSET_FLASH = 0xc; +static int const OFFSET_FLASH_SIZE = 0x8; +static int const OFFSET_GET_WORKAREA = 0x18; +static int const OFFSET_GET_WORKAREA_SIZE = 0x4; -static int runCode(ecosflash_flash_bank_t *info, +static int runCode(struct ecosflash_flash_bank *info, uint32_t codeStart, uint32_t codeStop, uint32_t r0, uint32_t r1, uint32_t r2, uint32_t *result, /* timeout in ms */ int timeout) { - target_t *target=info->target; + struct target *target = info->target; - reg_param_t reg_params[3]; - armv4_5_algorithm_t armv4_5_info; + struct reg_param reg_params[3]; + struct armv4_5_algorithm armv4_5_info; armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; armv4_5_info.core_state = ARMV4_5_STATE_ARM; @@ -254,7 +230,7 @@ static int runCode(ecosflash_flash_bank_t *info, return retval; } - *result=buf_get_u32(reg_params[0].value, 0, 32); + *result = buf_get_u32(reg_params[0].value, 0, 32); destroy_reg_param(®_params[0]); destroy_reg_param(®_params[1]); @@ -263,26 +239,26 @@ static int runCode(ecosflash_flash_bank_t *info, return ERROR_OK; } -static int eCosBoard_erase(ecosflash_flash_bank_t *info, uint32_t address, uint32_t len) +static int eCosBoard_erase(struct ecosflash_flash_bank *info, uint32_t address, uint32_t len) { int retval; int timeout = (len / 20480 + 1) * 1000; /*asume 20 KB/s*/ - retval=loadDriver(info); - if (retval!=ERROR_OK) + retval = loadDriver(info); + if (retval != ERROR_OK) return retval; uint32_t flashErr; - retval=runCode(info, - info->start_address+OFFSET_ERASE, - info->start_address+OFFSET_ERASE+OFFSET_ERASE_SIZE, + retval = runCode(info, + info->start_address + OFFSET_ERASE, + info->start_address + OFFSET_ERASE + OFFSET_ERASE_SIZE, address, len, 0, &flashErr, timeout - ); - if (retval!=ERROR_OK) +); + if (retval != ERROR_OK) return retval; if (flashErr != 0x0) @@ -294,50 +270,50 @@ static int eCosBoard_erase(ecosflash_flash_bank_t *info, uint32_t address, uint3 return ERROR_OK; } -static int eCosBoard_flash(ecosflash_flash_bank_t *info, void *data, uint32_t address, uint32_t len) +static int eCosBoard_flash(struct ecosflash_flash_bank *info, void *data, uint32_t address, uint32_t len) { - target_t *target=info->target; - const int chunk=8192; - int retval=ERROR_OK; + struct target *target = info->target; + const int chunk = 8192; + int retval = ERROR_OK; int timeout = (chunk / 20480 + 1) * 1000; /*asume 20 KB/s + 1 second*/ - retval=loadDriver(info); - if (retval!=ERROR_OK) + retval = loadDriver(info); + if (retval != ERROR_OK) return retval; uint32_t buffer; - retval=runCode(info, - info->start_address+OFFSET_GET_WORKAREA, - info->start_address+OFFSET_GET_WORKAREA+OFFSET_GET_WORKAREA_SIZE, + retval = runCode(info, + info->start_address + OFFSET_GET_WORKAREA, + info->start_address + OFFSET_GET_WORKAREA + OFFSET_GET_WORKAREA_SIZE, 0, 0, 0, &buffer, 1000); - if (retval!=ERROR_OK) + if (retval != ERROR_OK) return retval; uint32_t i; - for (i=0; ichunk) + int t = len-i; + if (t > chunk) { - t=chunk; + t = chunk; } int retval; - retval=target_write_buffer(target, buffer, t, ((uint8_t *)data)+i); + retval = target_write_buffer(target, buffer, t, ((uint8_t *)data) + i); if (retval != ERROR_OK) return retval; uint32_t flashErr; - retval=runCode(info, - info->start_address+OFFSET_FLASH, - info->start_address+OFFSET_FLASH+OFFSET_FLASH_SIZE, + retval = runCode(info, + info->start_address + OFFSET_FLASH, + info->start_address + OFFSET_FLASH + OFFSET_FLASH_SIZE, buffer, - address+i, + address + i, t, &flashErr, timeout); @@ -368,7 +344,7 @@ static int ecosflash_register_commands(struct command_context_s *cmd_ctx) #if 0 static void command(flash_bank_t *bank, uint8_t cmd, uint8_t *cmd_buf) { - ecosflash_flash_bank_t *info = bank->driver_priv; + struct ecosflash_flash_bank *info = bank->driver_priv; int i; if (info->target->endianness == TARGET_LITTLE_ENDIAN) @@ -408,9 +384,9 @@ static uint32_t ecosflash_address(struct flash_bank_s *bank, uint32_t address) static int ecosflash_erase(struct flash_bank_s *bank, int first, int last) { - struct flash_bank_s *c=bank; - ecosflash_flash_bank_t *info = bank->driver_priv; - return eCosBoard_erase(info, c->base+first*sectorSize, sectorSize*(last-first+1)); + struct flash_bank_s *c = bank; + struct ecosflash_flash_bank *info = bank->driver_priv; + return eCosBoard_erase(info, c->base + first*sectorSize, sectorSize*(last-first + 1)); } static int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last) @@ -420,9 +396,9 @@ static int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int static int ecosflash_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count) { - ecosflash_flash_bank_t *info = bank->driver_priv; - struct flash_bank_s *c=bank; - return eCosBoard_flash(info, buffer, c->base+offset, count); + struct ecosflash_flash_bank *info = bank->driver_priv; + struct flash_bank_s *c = bank; + return eCosBoard_flash(info, buffer, c->base + offset, count); } static int ecosflash_protect_check(struct flash_bank_s *bank) @@ -432,7 +408,7 @@ static int ecosflash_protect_check(struct flash_bank_s *bank) static int ecosflash_info(struct flash_bank_s *bank, char *buf, int buf_size) { - ecosflash_flash_bank_t *info = bank->driver_priv; + struct ecosflash_flash_bank *info = bank->driver_priv; snprintf(buf, buf_size, "eCos flash driver: %s", info->driverPath); return ERROR_OK; } @@ -458,3 +434,17 @@ static int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, cha return ERROR_OK; } #endif + +struct flash_driver ecosflash_flash = { + .name = "ecosflash", + .register_commands = &ecosflash_register_commands, + .flash_bank_command = &ecosflash_flash_bank_command, + .erase = &ecosflash_erase, + .protect = &ecosflash_protect, + .write = &ecosflash_write, + .probe = &ecosflash_probe, + .auto_probe = &ecosflash_probe, + .erase_check = &default_flash_blank_check, + .protect_check = &ecosflash_protect_check, + .info = &ecosflash_info + };