#endif
#include "flash.h"
+#include "common.h"
#include "image.h"
-#include "time_support.h"
+#include <helper/time_support.h>
-static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock);
+static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock);
/* flash drivers
*/
-extern flash_driver_t lpc2000_flash;
-extern flash_driver_t lpc288x_flash;
-extern flash_driver_t lpc2900_flash;
-extern flash_driver_t cfi_flash;
-extern flash_driver_t at91sam3_flash;
-extern flash_driver_t at91sam7_flash;
-extern flash_driver_t str7x_flash;
-extern flash_driver_t str9x_flash;
-extern flash_driver_t aduc702x_flash;
-extern flash_driver_t stellaris_flash;
-extern flash_driver_t str9xpec_flash;
-extern flash_driver_t stm32x_flash;
-extern flash_driver_t tms470_flash;
-extern flash_driver_t ecosflash_flash;
-extern flash_driver_t ocl_flash;
-extern flash_driver_t pic32mx_flash;
-extern flash_driver_t avr_flash;
-extern flash_driver_t faux_flash;
-
-flash_driver_t *flash_drivers[] = {
+extern struct flash_driver lpc2000_flash;
+extern struct flash_driver lpc288x_flash;
+extern struct flash_driver lpc2900_flash;
+extern struct flash_driver cfi_flash;
+extern struct flash_driver at91sam3_flash;
+extern struct flash_driver at91sam7_flash;
+extern struct flash_driver str7x_flash;
+extern struct flash_driver str9x_flash;
+extern struct flash_driver aduc702x_flash;
+extern struct flash_driver stellaris_flash;
+extern struct flash_driver str9xpec_flash;
+extern struct flash_driver stm32x_flash;
+extern struct flash_driver tms470_flash;
+extern struct flash_driver ecosflash_flash;
+extern struct flash_driver ocl_flash;
+extern struct flash_driver pic32mx_flash;
+extern struct flash_driver avr_flash;
+extern struct flash_driver faux_flash;
+
+struct flash_driver *flash_drivers[] = {
&lpc2000_flash,
&lpc288x_flash,
&lpc2900_flash,
NULL,
};
-flash_bank_t *flash_banks;
-static command_t *flash_cmd;
+struct flash_bank *flash_banks;
/* wafer thin wrapper for invoking the flash driver */
-static int flash_driver_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int flash_driver_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
{
int retval;
return retval;
}
-static int flash_driver_erase(struct flash_bank_s *bank, int first, int last)
+static int flash_driver_erase(struct flash_bank *bank, int first, int last)
{
int retval;
return retval;
}
-int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last)
+int flash_driver_protect(struct flash_bank *bank, int set, int first, int last)
{
int retval;
static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
- flash_bank_t *p;
+ struct flash_bank *p;
if (argc != 1) {
Jim_WrongNumArgs(interp, 1, argv, "no arguments to flash_banks command");
return JIM_OK;
}
-flash_bank_t *get_flash_bank_by_num_noprobe(int num)
+struct flash_bank *get_flash_bank_by_num_noprobe(int num)
{
- flash_bank_t *p;
+ struct flash_bank *p;
int i = 0;
for (p = flash_banks; p; p = p->next)
int flash_get_bank_count(void)
{
- flash_bank_t *p;
+ struct flash_bank *p;
int i = 0;
for (p = flash_banks; p; p = p->next)
{
return i;
}
-flash_bank_t *get_flash_bank_by_num(int num)
+struct flash_bank *get_flash_bank_by_name(const char *name)
{
- flash_bank_t *p = get_flash_bank_by_num_noprobe(num);
+ unsigned requested = get_flash_name_index(name);
+ unsigned found = 0;
+
+ struct flash_bank *bank;
+ for (bank = flash_banks; NULL != bank; bank = bank->next)
+ {
+ if (strcmp(bank->name, name) == 0)
+ return bank;
+ if (!flash_driver_name_matches(bank->driver->name, name))
+ continue;
+ if (++found < requested)
+ continue;
+ return bank;
+ }
+ return NULL;
+}
+
+struct flash_bank *get_flash_bank_by_num(int num)
+{
+ struct flash_bank *p = get_flash_bank_by_num_noprobe(num);
int retval;
if (p == NULL)
return p;
}
-int flash_command_get_bank_by_num(
- struct command_context_s *cmd_ctx, char *str, flash_bank_t **bank)
+COMMAND_HELPER(flash_command_get_bank, unsigned name_index,
+ struct flash_bank **bank)
{
+ const char *name = CMD_ARGV[name_index];
+ *bank = get_flash_bank_by_name(name);
+ if (*bank)
+ return ERROR_OK;
+
unsigned bank_num;
- COMMAND_PARSE_NUMBER(uint, str, bank_num);
+ COMMAND_PARSE_NUMBER(uint, name, bank_num);
*bank = get_flash_bank_by_num(bank_num);
if (!*bank)
{
- command_print(cmd_ctx,
- "flash bank '#%u' not found", bank_num);
+ command_print(CMD_CTX, "flash bank '%s' not found", name);
return ERROR_INVALID_ARGUMENTS;
}
return ERROR_OK;
}
-static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_bank_command)
{
- int retval;
- int i;
- int found = 0;
- target_t *target;
-
- if (argc < 6)
+ if (CMD_ARGC < 7)
{
+ LOG_ERROR("usage: flash bank <name> <driver> "
+ "<base> <size> <chip_width> <bus_width>");
return ERROR_COMMAND_SYNTAX_ERROR;
}
+ // save bank name and advance arguments for compatibility
+ const char *bank_name = *CMD_ARGV++;
+ CMD_ARGC--;
- if ((target = get_target(args[5])) == NULL)
+ struct target *target;
+ if ((target = get_target(CMD_ARGV[5])) == NULL)
{
- LOG_ERROR("target '%s' not defined", args[5]);
+ LOG_ERROR("target '%s' not defined", CMD_ARGV[5]);
return ERROR_FAIL;
}
- for (i = 0; flash_drivers[i]; i++)
+ const char *driver_name = CMD_ARGV[0];
+ for (unsigned i = 0; flash_drivers[i]; i++)
{
- if (strcmp(args[0], flash_drivers[i]->name) != 0)
+ if (strcmp(driver_name, flash_drivers[i]->name) != 0)
continue;
- flash_bank_t *p, *c;
-
/* register flash specific commands */
- if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
+ if (NULL != flash_drivers[i]->commands)
{
- LOG_ERROR("couldn't register '%s' commands", args[0]);
- return ERROR_FAIL;
+ int retval = register_commands(CMD_CTX, NULL,
+ flash_drivers[i]->commands);
+ if (ERROR_OK != retval)
+ {
+ LOG_ERROR("couldn't register '%s' commands",
+ driver_name);
+ return ERROR_FAIL;
+ }
}
- c = malloc(sizeof(flash_bank_t));
+ struct flash_bank *p, *c;
+ c = malloc(sizeof(struct flash_bank));
+ c->name = strdup(bank_name);
c->target = target;
c->driver = flash_drivers[i];
c->driver_priv = NULL;
- COMMAND_PARSE_NUMBER(u32, args[1], c->base);
- COMMAND_PARSE_NUMBER(u32, args[2], c->size);
- COMMAND_PARSE_NUMBER(int, args[3], c->chip_width);
- COMMAND_PARSE_NUMBER(int, args[4], c->bus_width);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], c->base);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], c->size);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[3], c->chip_width);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[4], c->bus_width);
c->num_sectors = 0;
c->sectors = NULL;
c->next = NULL;
- if ((retval = flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
+ int retval;
+ retval = CALL_COMMAND_HANDLER(flash_drivers[i]->flash_bank_command, c);
+ if (ERROR_OK != retval)
{
- LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , args[0], c->base);
+ LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32,
+ driver_name, c->base);
free(c);
return retval;
}
c->bank_number = 0;
}
- found = 1;
+ return ERROR_OK;
}
/* no matching flash driver found */
- if (!found)
- {
- LOG_ERROR("flash driver '%s' not found", args[0]);
- return ERROR_FAIL;
- }
-
- return ERROR_OK;
+ LOG_ERROR("flash driver '%s' not found", driver_name);
+ return ERROR_FAIL;
}
-static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_info_command)
{
- flash_bank_t *p;
+ struct flash_bank *p;
uint32_t i = 0;
int j = 0;
int retval;
- if (argc != 1)
+ if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
unsigned bank_nr;
- COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
+ COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], bank_nr);
for (p = flash_banks; p; p = p->next, i++)
{
if ((retval = p->driver->auto_probe(p)) != ERROR_OK)
return retval;
- command_print(cmd_ctx,
+ command_print(CMD_CTX,
"#%" PRIi32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", buswidth %i, chipwidth %i",
i,
p->driver->name,
else
protect_state = "protection state unknown";
- command_print(cmd_ctx,
+ command_print(CMD_CTX,
"\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
j,
p->sectors[j].offset,
*buf = '\0'; /* initialize buffer, otherwise it migh contain garbage if driver function fails */
retval = p->driver->info(p, buf, sizeof(buf));
- command_print(cmd_ctx, "%s", buf);
+ command_print(CMD_CTX, "%s", buf);
if (retval != ERROR_OK)
LOG_ERROR("error retrieving flash info (%d)", retval);
}
return ERROR_OK;
}
-static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_probe_command)
{
int retval;
- if (argc != 1)
+ if (CMD_ARGC != 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
unsigned bank_nr;
- COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
- flash_bank_t *p = get_flash_bank_by_num_noprobe(bank_nr);
+ COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], bank_nr);
+ struct flash_bank *p = get_flash_bank_by_num_noprobe(bank_nr);
if (p)
{
if ((retval = p->driver->probe(p)) == ERROR_OK)
{
- command_print(cmd_ctx, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
+ command_print(CMD_CTX, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
}
else if (retval == ERROR_FLASH_BANK_INVALID)
{
- command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
- args[0], p->base);
+ command_print(CMD_CTX, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
+ CMD_ARGV[0], p->base);
}
else
{
- command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
- args[0], p->base);
+ command_print(CMD_CTX, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
+ CMD_ARGV[0], p->base);
}
}
else
{
- command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+ command_print(CMD_CTX, "flash bank '#%s' is out of bounds", CMD_ARGV[0]);
}
return ERROR_OK;
}
-static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_erase_check_command)
{
- if (argc != 1)
+ if (CMD_ARGC != 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
- flash_bank_t *p;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+ struct flash_bank *p;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
if (ERROR_OK != retval)
return retval;
int j;
if ((retval = p->driver->erase_check(p)) == ERROR_OK)
{
- command_print(cmd_ctx, "successfully checked erase state");
+ command_print(CMD_CTX, "successfully checked erase state");
}
else
{
- command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
- args[0], p->base);
+ command_print(CMD_CTX, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
+ CMD_ARGV[0], p->base);
}
for (j = 0; j < p->num_sectors; j++)
else
erase_state = "erase state unknown";
- command_print(cmd_ctx,
+ command_print(CMD_CTX,
"\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
j,
p->sectors[j].offset,
return ERROR_OK;
}
-static int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_erase_address_command)
{
- flash_bank_t *p;
+ struct flash_bank *p;
int retval;
int address;
int length;
- target_t *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
- if (argc != 2)
+ if (CMD_ARGC != 2)
return ERROR_COMMAND_SYNTAX_ERROR;
- COMMAND_PARSE_NUMBER(int, args[0], address);
- COMMAND_PARSE_NUMBER(int, args[1], length);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], address);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], length);
if (length <= 0)
{
- command_print(cmd_ctx, "Length must be >0");
+ command_print(CMD_CTX, "Length must be >0");
return ERROR_COMMAND_SYNTAX_ERROR;
}
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
- command_print(cmd_ctx, "erased address 0x%8.8x (length %i)"
+ command_print(CMD_CTX, "erased address 0x%8.8x (length %i)"
" in %fs (%0.3f kb/s)", address, length,
duration_elapsed(&bench), duration_kbps(&bench, length));
}
return retval;
}
-static int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_protect_check_command)
{
- if (argc != 1)
+ if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
- flash_bank_t *p;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+ struct flash_bank *p;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
if (ERROR_OK != retval)
return retval;
if ((retval = p->driver->protect_check(p)) == ERROR_OK)
{
- command_print(cmd_ctx, "successfully checked protect state");
+ command_print(CMD_CTX, "successfully checked protect state");
}
else if (retval == ERROR_FLASH_OPERATION_FAILED)
{
- command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, args[0], p->base);
+ command_print(CMD_CTX, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, CMD_ARGV[0], p->base);
}
else
{
- command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, args[0], p->base);
+ command_print(CMD_CTX, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, CMD_ARGV[0], p->base);
}
return ERROR_OK;
}
-static int flash_check_sector_parameters(struct command_context_s *cmd_ctx,
+static int flash_check_sector_parameters(struct command_context *cmd_ctx,
uint32_t first, uint32_t last, uint32_t num_sectors)
{
if (!(first <= last)) {
return ERROR_OK;
}
-static int handle_flash_erase_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_erase_command)
{
- if (argc != 2)
+ if (CMD_ARGC != 3)
return ERROR_COMMAND_SYNTAX_ERROR;
uint32_t bank_nr;
uint32_t first;
uint32_t last;
- COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
- flash_bank_t *p = get_flash_bank_by_num(bank_nr);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr);
+ struct flash_bank *p = get_flash_bank_by_num(bank_nr);
if (!p)
return ERROR_OK;
- COMMAND_PARSE_NUMBER(u32, args[1], first);
- if (strcmp(args[2], "last") == 0)
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], first);
+ if (strcmp(CMD_ARGV[2], "last") == 0)
last = p->num_sectors - 1;
else
- COMMAND_PARSE_NUMBER(u32, args[2], last);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], last);
int retval;
- if ((retval = flash_check_sector_parameters(cmd_ctx,
+ if ((retval = flash_check_sector_parameters(CMD_CTX,
first, last, p->num_sectors)) != ERROR_OK)
return retval;
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
- command_print(cmd_ctx, "erased sectors %" PRIu32 " "
+ command_print(CMD_CTX, "erased sectors %" PRIu32 " "
"through %" PRIu32" on flash bank %" PRIu32 " "
"in %fs", first, last, bank_nr, duration_elapsed(&bench));
}
return ERROR_OK;
}
-static int handle_flash_protect_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_protect_command)
{
- if (argc != 3)
+ if (CMD_ARGC != 4)
return ERROR_COMMAND_SYNTAX_ERROR;
uint32_t bank_nr;
uint32_t first;
uint32_t last;
- int set;
- COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
- flash_bank_t *p = get_flash_bank_by_num(bank_nr);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr);
+ struct flash_bank *p = get_flash_bank_by_num(bank_nr);
if (!p)
return ERROR_OK;
- COMMAND_PARSE_NUMBER(u32, args[1], first);
- if (strcmp(args[2], "last") == 0)
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], first);
+ if (strcmp(CMD_ARGV[2], "last") == 0)
last = p->num_sectors - 1;
else
- COMMAND_PARSE_NUMBER(u32, args[2], last);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], last);
- if (strcmp(args[3], "on") == 0)
- set = 1;
- else if (strcmp(args[3], "off") == 0)
- set = 0;
- else
- return ERROR_COMMAND_SYNTAX_ERROR;
+ bool set;
+ COMMAND_PARSE_ON_OFF(CMD_ARGV[3], set);
int retval;
- if ((retval = flash_check_sector_parameters(cmd_ctx,
+ if ((retval = flash_check_sector_parameters(CMD_CTX,
first, last, p->num_sectors)) != ERROR_OK)
return retval;
retval = flash_driver_protect(p, set, first, last);
if (retval == ERROR_OK) {
- command_print(cmd_ctx, "%s protection for sectors %i "
+ command_print(CMD_CTX, "%s protection for sectors %i "
"through %i on flash bank %i",
(set) ? "set" : "cleared", (int) first,
(int) last, (int) bank_nr);
return ERROR_OK;
}
-static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_write_image_command)
{
- target_t *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
- image_t image;
+ struct image image;
uint32_t written;
int retval;
- if (argc < 1)
+ if (CMD_ARGC < 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
for (;;)
{
- if (strcmp(args[0], "erase") == 0)
+ if (strcmp(CMD_ARGV[0], "erase") == 0)
{
auto_erase = 1;
- args++;
- argc--;
- command_print(cmd_ctx, "auto erase enabled");
- } else if (strcmp(args[0], "unlock") == 0)
+ CMD_ARGV++;
+ CMD_ARGC--;
+ command_print(CMD_CTX, "auto erase enabled");
+ } else if (strcmp(CMD_ARGV[0], "unlock") == 0)
{
auto_unlock = true;
- args++;
- argc--;
- command_print(cmd_ctx, "auto unlock enabled");
+ CMD_ARGV++;
+ CMD_ARGC--;
+ command_print(CMD_CTX, "auto unlock enabled");
} else
{
break;
}
}
- if (argc < 1)
+ if (CMD_ARGC < 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
struct duration bench;
duration_start(&bench);
- if (argc >= 2)
+ if (CMD_ARGC >= 2)
{
image.base_address_set = 1;
- COMMAND_PARSE_NUMBER(int, args[1], image.base_address);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], image.base_address);
}
else
{
image.start_address_set = 0;
- retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL);
+ retval = image_open(&image, CMD_ARGV[0], (CMD_ARGC == 3) ? CMD_ARGV[2] : NULL);
if (retval != ERROR_OK)
{
return retval;
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
- command_print(cmd_ctx, "wrote %" PRIu32 " byte from file %s "
- "in %fs (%0.3f kb/s)", written, args[0],
+ command_print(CMD_CTX, "wrote %" PRIu32 " byte from file %s "
+ "in %fs (%0.3f kb/s)", written, CMD_ARGV[0],
duration_elapsed(&bench), duration_kbps(&bench, written));
}
return retval;
}
-static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_fill_command)
{
int err = ERROR_OK;
uint32_t address;
uint32_t pattern;
uint32_t count;
- uint8_t chunk[1024];
- uint8_t readback[1024];
uint32_t wrote = 0;
uint32_t cur_size = 0;
uint32_t chunk_count;
- target_t *target = get_current_target(cmd_ctx);
+ struct target *target = get_current_target(CMD_CTX);
uint32_t i;
uint32_t wordsize;
+ int retval = ERROR_OK;
- if (argc != 3)
- return ERROR_COMMAND_SYNTAX_ERROR;
+ static size_t const chunksize = 1024;
+ uint8_t *chunk = malloc(chunksize);
+ if (chunk == NULL)
+ return ERROR_FAIL;
- COMMAND_PARSE_NUMBER(u32, args[0], address);
- COMMAND_PARSE_NUMBER(u32, args[1], pattern);
- COMMAND_PARSE_NUMBER(u32, args[2], count);
+ uint8_t *readback = malloc(chunksize);
+ if (readback == NULL)
+ {
+ free(chunk);
+ return ERROR_FAIL;
+ }
+
+
+ if (CMD_ARGC != 3)
+ {
+ retval = ERROR_COMMAND_SYNTAX_ERROR;
+ goto done;
+ }
+
+
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], pattern);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], count);
if (count == 0)
- return ERROR_OK;
+ goto done;
- switch (cmd[4])
+ switch (CMD_NAME[4])
{
case 'w':
wordsize = 4;
wordsize = 1;
break;
default:
- return ERROR_COMMAND_SYNTAX_ERROR;
+ retval = ERROR_COMMAND_SYNTAX_ERROR;
+ goto done;
}
- chunk_count = MIN(count, (1024 / wordsize));
+ chunk_count = MIN(count, (chunksize / wordsize));
switch (wordsize)
{
case 4:
for (wrote = 0; wrote < (count*wordsize); wrote += cur_size)
{
cur_size = MIN((count*wordsize - wrote), sizeof(chunk));
- flash_bank_t *bank;
+ struct flash_bank *bank;
bank = get_flash_bank_by_addr(target, address);
if (bank == NULL)
{
- return ERROR_FAIL;
+ retval = ERROR_FAIL;
+ goto done;
}
err = flash_driver_write(bank, chunk, address - bank->base + wrote, cur_size);
if (err != ERROR_OK)
- return err;
+ {
+ retval = err;
+ goto done;
+ }
err = target_read_buffer(target, address + wrote, cur_size, readback);
if (err != ERROR_OK)
- return err;
+ {
+ retval = err;
+ goto done;
+ }
unsigned i;
for (i = 0; i < cur_size; i++)
{
LOG_ERROR("Verfication error address 0x%08" PRIx32 ", read back 0x%02x, expected 0x%02x",
address + wrote + i, readback[i], chunk[i]);
- return ERROR_FAIL;
+ retval = ERROR_FAIL;
+ goto done;
}
}
}
if (duration_measure(&bench) == ERROR_OK)
{
- command_print(cmd_ctx, "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32
+ command_print(CMD_CTX, "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32
" in %fs (%0.3f kb/s)", wrote, address,
duration_elapsed(&bench), duration_kbps(&bench, wrote));
}
- return ERROR_OK;
+
+ done:
+ free(readback);
+ free(chunk);
+
+ return retval;
}
-static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_write_bank_command)
{
uint32_t offset;
uint8_t *buffer;
- uint32_t buf_cnt;
- fileio_t fileio;
+ struct fileio fileio;
- if (argc != 3)
+ if (CMD_ARGC != 3)
return ERROR_COMMAND_SYNTAX_ERROR;
struct duration bench;
duration_start(&bench);
- flash_bank_t *p;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+ struct flash_bank *p;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
if (ERROR_OK != retval)
return retval;
- COMMAND_PARSE_NUMBER(u32, args[2], offset);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], offset);
- if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
+ if (fileio_open(&fileio, CMD_ARGV[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
{
return ERROR_OK;
}
buffer = malloc(fileio.size);
+ size_t buf_cnt;
if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK)
{
free(buffer);
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
- command_print(cmd_ctx, "wrote %lld byte from file %s to flash bank %u"
+ command_print(CMD_CTX, "wrote %zu byte from file %s to flash bank %u"
" at offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
- fileio.size, args[1], p->bank_number, offset,
+ fileio.size, CMD_ARGV[1], p->bank_number, offset,
duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
}
void flash_set_dirty(void)
{
- flash_bank_t *c;
+ struct flash_bank *c;
int i;
/* set all flash to require erasing */
}
/* lookup flash bank by address */
-flash_bank_t *get_flash_bank_by_addr(target_t *target, uint32_t addr)
+struct flash_bank *get_flash_bank_by_addr(struct target *target, uint32_t addr)
{
- flash_bank_t *c;
+ struct flash_bank *c;
/* cycle through bank list */
for (c = flash_banks; c; c = c->next)
}
/* erase given flash region, selects proper bank according to target and address */
-static int flash_iterate_address_range(target_t *target, uint32_t addr, uint32_t length,
- int (*callback)(struct flash_bank_s *bank, int first, int last))
+static int flash_iterate_address_range(struct target *target, uint32_t addr, uint32_t length,
+ int (*callback)(struct flash_bank *bank, int first, int last))
{
- flash_bank_t *c;
+ struct flash_bank *c;
int first = -1;
int last = -1;
int i;
-int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length)
+int flash_erase_address_range(struct target *target, uint32_t addr, uint32_t length)
{
return flash_iterate_address_range(target, addr, length, &flash_driver_erase);
}
-static int flash_driver_unprotect(struct flash_bank_s *bank, int first, int last)
+static int flash_driver_unprotect(struct flash_bank *bank, int first, int last)
{
return flash_driver_protect(bank, 0, first, last);
}
-static int flash_unlock_address_range(target_t *target, uint32_t addr, uint32_t length)
+static int flash_unlock_address_range(struct target *target, uint32_t addr, uint32_t length)
{
return flash_iterate_address_range(target, addr, length, &flash_driver_unprotect);
}
/* write (optional verify) an image to flash memory of the given target */
-static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock)
+static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock)
{
int retval = ERROR_OK;
int section;
uint32_t section_offset;
- flash_bank_t *c;
+ struct flash_bank *c;
int *padding;
section = 0;
/* read sections to the buffer */
while (buffer_size < run_size)
{
- uint32_t size_read;
+ size_t size_read;
size_read = run_size - buffer_size;
if (size_read > image->sections[section].size - section_offset)
return retval;
}
-int flash_write(target_t *target, image_t *image, uint32_t *written, int erase)
+int flash_write(struct target *target, struct image *image, uint32_t *written, int erase)
{
return flash_write_unlock(target, image, written, erase, false);
}
-int default_flash_mem_blank_check(struct flash_bank_s *bank)
+int default_flash_mem_blank_check(struct flash_bank *bank)
{
- target_t *target = bank->target;
- uint8_t buffer[1024];
- int buffer_size = sizeof(buffer);
+ struct target *target = bank->target;
+ const int buffer_size = 1024;
int i;
uint32_t nBytes;
+ int retval = ERROR_OK;
if (bank->target->state != TARGET_HALTED)
{
return ERROR_TARGET_NOT_HALTED;
}
+ uint8_t *buffer = malloc(buffer_size);
+
for (i = 0; i < bank->num_sectors; i++)
{
uint32_t j;
for (j = 0; j < bank->sectors[i].size; j += buffer_size)
{
uint32_t chunk;
- int retval;
chunk = buffer_size;
if (chunk > (j - bank->sectors[i].size))
{
retval = target_read_memory(target, bank->base + bank->sectors[i].offset + j, 4, chunk/4, buffer);
if (retval != ERROR_OK)
- return retval;
+ {
+ goto done;
+ }
for (nBytes = 0; nBytes < chunk; nBytes++)
{
}
}
- return ERROR_OK;
+ done:
+ free(buffer);
+
+ return retval;
}
-int default_flash_blank_check(struct flash_bank_s *bank)
+int default_flash_blank_check(struct flash_bank *bank)
{
- target_t *target = bank->target;
+ struct target *target = bank->target;
int i;
int retval;
int fast_check = 0;
return ERROR_OK;
}
-int flash_init_drivers(struct command_context_s *cmd_ctx)
-{
- register_jim(cmd_ctx, "ocd_flash_banks",
- jim_flash_banks, "return information about the flash banks");
+static const struct command_registration flash_exec_command_handlers[] = {
+ {
+ .name = "probe",
+ .handler = &handle_flash_probe_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank>",
+ .help = "identify flash bank",
+ },
+ {
+ .name = "info",
+ .handler = &handle_flash_info_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank>",
+ .help = "print bank information",
+ },
+ {
+ .name = "erase_check",
+ .handler = &handle_flash_erase_check_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank>",
+ .help = "check erase state of sectors",
+ },
+ {
+ .name = "protect_check",
+ .handler = &handle_flash_protect_check_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank>",
+ .help = "check protection state of sectors",
+ },
+ {
+ .name = "erase_sector",
+ .handler = &handle_flash_erase_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> <first> <last>",
+ .help = "erase sectors",
+ },
+ {
+ .name = "erase_address",
+ .handler = &handle_flash_erase_address_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<address> <length>",
+ .help = "erase address range",
+
+ },
+ {
+ .name = "fillw",
+ .handler = &handle_flash_fill_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> <address> <word_pattern> <count>",
+ .help = "fill with pattern (no autoerase)",
+ },
+ {
+ .name = "fillh",
+ .handler = &handle_flash_fill_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> <address> <halfword_pattern> <count>",
+ .help = "fill with pattern",
+ },
+ {
+ .name = "fillb",
+ .handler = &handle_flash_fill_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> <address> <byte_pattern> <count>",
+ .help = "fill with pattern",
+ },
+ {
+ .name = "write_bank",
+ .handler = &handle_flash_write_bank_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> <file> <offset>",
+ .help = "write binary data",
+ },
+ {
+ .name = "write_image",
+ .handler = &handle_flash_write_image_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> [erase] [unlock] <file> [offset] [type]",
+ .help = "write an image to flash"
+ },
+ {
+ .name = "protect",
+ .handler = &handle_flash_protect_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> <first> <last> <on | off>",
+ .help = "set protection of sectors",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
+int flash_init_drivers(struct command_context *cmd_ctx)
+{
if (!flash_banks)
return ERROR_OK;
- register_command(cmd_ctx, flash_cmd, "info",
- handle_flash_info_command, COMMAND_EXEC,
- "print info about flash bank <num>");
- register_command(cmd_ctx, flash_cmd, "probe",
- handle_flash_probe_command, COMMAND_EXEC,
- "identify flash bank <num>");
- register_command(cmd_ctx, flash_cmd, "erase_check",
- handle_flash_erase_check_command, COMMAND_EXEC,
- "check erase state of sectors in flash bank <num>");
- register_command(cmd_ctx, flash_cmd, "protect_check",
- handle_flash_protect_check_command, COMMAND_EXEC,
- "check protection state of sectors in flash bank <num>");
- register_command(cmd_ctx, flash_cmd, "erase_sector",
- handle_flash_erase_command, COMMAND_EXEC,
- "erase sectors at <bank> <first> <last>");
- register_command(cmd_ctx, flash_cmd, "erase_address",
- handle_flash_erase_address_command, COMMAND_EXEC,
- "erase address range <address> <length>");
-
- register_command(cmd_ctx, flash_cmd, "fillw",
- handle_flash_fill_command, COMMAND_EXEC,
- "fill with pattern (no autoerase) <address> <word_pattern> <count>");
- register_command(cmd_ctx, flash_cmd, "fillh",
- handle_flash_fill_command, COMMAND_EXEC,
- "fill with pattern <address> <halfword_pattern> <count>");
- register_command(cmd_ctx, flash_cmd, "fillb",
- handle_flash_fill_command, COMMAND_EXEC,
- "fill with pattern <address> <byte_pattern> <count>");
-
- register_command(cmd_ctx, flash_cmd, "write_bank",
- handle_flash_write_bank_command, COMMAND_EXEC,
- "write binary data to <bank> <file> <offset>");
- register_command(cmd_ctx, flash_cmd, "write_image",
- handle_flash_write_image_command, COMMAND_EXEC,
- "write_image [erase] [unlock] <file> [offset] [type]");
- register_command(cmd_ctx, flash_cmd, "protect",
- handle_flash_protect_command, COMMAND_EXEC,
- "set protection of sectors at <bank> <first> <last> <on | off>");
-
- return ERROR_OK;
+ struct command *parent = command_find_in_context(cmd_ctx, "flash");
+ return register_commands(cmd_ctx, parent, flash_exec_command_handlers);
}
-int flash_register_commands(struct command_context_s *cmd_ctx)
+COMMAND_HANDLER(handle_flash_init_command)
{
- flash_cmd = register_command(cmd_ctx, NULL, "flash",
- NULL, COMMAND_ANY, NULL);
+ if (CMD_ARGC != 0)
+ return ERROR_COMMAND_SYNTAX_ERROR;
- register_command(cmd_ctx, flash_cmd, "bank",
- handle_flash_bank_command, COMMAND_CONFIG,
- "flash bank <driver> <base> <size> "
- "<chip_width> <bus_width> <target> [driver_options ...]");
- return ERROR_OK;
+ static bool flash_initialized = false;
+ if (flash_initialized)
+ {
+ LOG_INFO("'flash init' has already been called");
+ return ERROR_OK;
+ }
+ flash_initialized = true;
+
+ LOG_DEBUG("Initializing flash devices...");
+ return flash_init_drivers(CMD_CTX);
+}
+
+static const struct command_registration flash_config_command_handlers[] = {
+ {
+ .name = "bank",
+ .handler = &handle_flash_bank_command,
+ .mode = COMMAND_CONFIG,
+ .usage = "<name> <driver> <base> <size> "
+ "<chip_width> <bus_width> <target> "
+ "[driver_options ...]",
+ .help = "Define a new bank with the given name, "
+ "using the specified NOR flash driver.",
+ },
+ {
+ .name = "init",
+ .mode = COMMAND_CONFIG,
+ .handler = &handle_flash_init_command,
+ .help = "initialize flash devices",
+ },
+ {
+ .name = "banks",
+ .mode = COMMAND_ANY,
+ .jim_handler = &jim_flash_banks,
+ .help = "return information about the flash banks",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration flash_command_handlers[] = {
+ {
+ .name = "flash",
+ .mode = COMMAND_ANY,
+ .help = "NOR flash command group",
+ .chain = flash_config_command_handlers,
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
+int flash_register_commands(struct command_context *cmd_ctx)
+{
+ return register_commands(cmd_ctx, NULL, flash_command_handlers);
}
Code Review / openocd.git / blobdiff