/***************************************************************************
- * 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 *
#include "flash.h"
#include "embeddedice.h"
#include "image.h"
+#include "algorithm.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);
-static uint32_t ecosflash_wait_status_busy(flash_bank_t *bank, uint32_t waitbits, int timeout);
-static int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static uint32_t ecosflash_get_flash_status(struct flash_bank *bank);
+static void ecosflash_set_flash_mode(struct flash_bank *bank,int mode);
+static uint32_t ecosflash_wait_status_busy(struct flash_bank *bank, uint32_t waitbits, int timeout);
+static int ecosflash_handle_gpnvm_command(struct command_context *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;
/* flash bank ecosflash <base> <size> <chip_width> <bus_width> <target#> <driverPath>
*/
-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)
+ if (CMD_ARGC < 7)
{
LOG_WARNING("incomplete flash_bank ecosflash configuration");
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(CMD_ARGV[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->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
for (i = 0; i < bank->num_sectors; i++)
{
bank->sectors[i].offset = offset;
bank->sectors[i].is_protected = 0;
}
- info->target = get_target(args[5]);
+ info->target = get_target(CMD_ARGV[5]);
if (info->target == NULL)
{
- LOG_ERROR("target '%s' not defined", args[5]);
+ LOG_ERROR("target '%s' not defined", CMD_ARGV[5]);
return ERROR_FAIL;
}
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;
+ size_t buf_cnt;
+ size_t image_size;
+ 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)
}
target_write_buffer(target, image.sections[i].base_address, buf_cnt, buffer);
image_size += buf_cnt;
- LOG_DEBUG("%" PRIu32 " byte written at address 0x%8.8" PRIx32 "", buf_cnt, image.sections[i].base_address);
+ LOG_DEBUG("%zu bytes written at address 0x%8.8" PRIx32 "",
+ buf_cnt, image.sections[i].base_address);
free(buffer);
}
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;
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*/
0,
&flashErr,
timeout
- );
+);
if (retval != ERROR_OK)
return retval;
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;
+ 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*/
uint32_t i;
- for (i = 0; i<len; i += chunk)
+ for (i = 0; i < len; i += chunk)
{
int t = len-i;
- if (t>chunk)
+ if (t > chunk)
{
t = chunk;
}
return ERROR_OK;
}
-static int ecosflash_probe(struct flash_bank_s *bank)
+static int ecosflash_probe(struct flash_bank *bank)
{
return ERROR_OK;
}
-static int ecosflash_register_commands(struct command_context_s *cmd_ctx)
+static int ecosflash_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "ecosflash", NULL, COMMAND_ANY, NULL);
+ COMMAND_REGISTER(cmd_ctx, NULL, "ecosflash", NULL, COMMAND_ANY, NULL);
return ERROR_OK;
}
#if 0
-static void command(flash_bank_t *bank, uint8_t cmd, uint8_t *cmd_buf)
+static void command(struct flash_bank *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)
#endif
#if 0
-static uint32_t ecosflash_address(struct flash_bank_s *bank, uint32_t address)
+static uint32_t ecosflash_address(struct flash_bank *bank, uint32_t address)
{
uint32_t retval = 0;
switch (bank->bus_width)
}
#endif
-static int ecosflash_erase(struct flash_bank_s *bank, int first, int last)
+static int ecosflash_erase(struct flash_bank *bank, int first, int last)
{
- struct flash_bank_s *c = bank;
- ecosflash_flash_bank_t *info = bank->driver_priv;
+ struct flash_bank *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)
+static int ecosflash_protect(struct flash_bank *bank, int set, int first, int last)
{
return ERROR_OK;
}
-static int ecosflash_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int ecosflash_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
{
- ecosflash_flash_bank_t *info = bank->driver_priv;
- struct flash_bank_s *c = bank;
+ struct ecosflash_flash_bank *info = bank->driver_priv;
+ struct flash_bank *c = bank;
return eCosBoard_flash(info, buffer, c->base + offset, count);
}
-static int ecosflash_protect_check(struct flash_bank_s *bank)
+static int ecosflash_protect_check(struct flash_bank *bank)
{
return ERROR_OK;
}
-static int ecosflash_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int ecosflash_info(struct flash_bank *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;
}
#if 0
-static uint32_t ecosflash_get_flash_status(flash_bank_t *bank)
+static uint32_t ecosflash_get_flash_status(struct flash_bank *bank)
{
return ERROR_OK;
}
-static void ecosflash_set_flash_mode(flash_bank_t *bank,int mode)
+static void ecosflash_set_flash_mode(struct flash_bank *bank,int mode)
{
}
-static uint32_t ecosflash_wait_status_busy(flash_bank_t *bank, uint32_t waitbits, int timeout)
+static uint32_t ecosflash_wait_status_busy(struct flash_bank *bank, uint32_t waitbits, int timeout)
{
return ERROR_OK;
}
-static int ecosflash_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int ecosflash_handle_gpnvm_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc)
{
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
+ };