X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fecos.c;h=b508cb12eb5fa1f82154f6ee5b34eb21c92f94fe;hp=0f1752b66789c85ad1550134c6389584f48f66a5;hb=fb59ec739a3ae79937020dc2fe5413be0e73e8d3;hpb=6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa
diff --git a/src/flash/ecos.c b/src/flash/ecos.c
index 0f1752b667..b508cb12eb 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,29 +33,14 @@ 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;
char *driverPath;
uint32_t start_address;
-} ecosflash_flash_bank_t;
+};
static const int sectorSize = 0x10000;
@@ -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,7 +114,7 @@ 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");
@@ -148,13 +124,13 @@ static int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char
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->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
for (i = 0; i < bank->num_sectors; i++)
{
bank->sectors[i].offset = offset;
@@ -173,7 +149,7 @@ 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;
@@ -222,7 +198,7 @@ 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 */
@@ -263,7 +239,7 @@ 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*/
@@ -281,7 +257,7 @@ static int eCosBoard_erase(ecosflash_flash_bank_t *info, uint32_t address, uint3
0,
&flashErr,
timeout
- );
+);
if (retval != ERROR_OK)
return retval;
@@ -294,7 +270,7 @@ 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;
@@ -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)
@@ -409,7 +385,7 @@ 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;
+ struct ecosflash_flash_bank *info = bank->driver_priv;
return eCosBoard_erase(info, c->base + first*sectorSize, sectorSize*(last-first + 1));
}
@@ -420,7 +396,7 @@ 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 ecosflash_flash_bank *info = bank->driver_priv;
struct flash_bank_s *c = bank;
return eCosBoard_flash(info, buffer, c->base + offset, count);
}
@@ -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
+
+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
+ };