#include "image.h"
#include "time_support.h"
-/* command handlers */
-static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-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;
+struct flash_bank *flash_banks;
static command_t *flash_cmd;
/* 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;
return retval;
}
-int flash_register_commands(struct command_context_s *cmd_ctx)
-{
- flash_cmd = register_command(cmd_ctx, NULL, "flash", NULL, COMMAND_ANY, NULL);
-
- 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 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;
}
-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");
-
- 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;
-}
-
-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_num(int num)
{
- flash_bank_t *p = get_flash_bank_by_num_noprobe(num);
+ struct flash_bank *p = get_flash_bank_by_num_noprobe(num);
int retval;
if (p == NULL)
}
int flash_command_get_bank_by_num(
- struct command_context_s *cmd_ctx, char *str, flash_bank_t **bank)
+ struct command_context_s *cmd_ctx, const char *str, struct flash_bank **bank)
{
unsigned bank_num;
COMMAND_PARSE_NUMBER(uint, str, bank_num);
}
-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;
+ struct target *target;
if (argc < 6)
{
if (strcmp(args[0], flash_drivers[i]->name) != 0)
continue;
- flash_bank_t *p, *c;
+ struct flash_bank *p, *c;
/* register flash specific commands */
if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
return ERROR_FAIL;
}
- c = malloc(sizeof(flash_bank_t));
+ c = malloc(sizeof(struct flash_bank));
c->target = target;
c->driver = flash_drivers[i];
c->driver_priv = NULL;
c->sectors = NULL;
c->next = NULL;
- if ((retval = flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
+ 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);
free(c);
return ERROR_OK;
}
-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;
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;
unsigned bank_nr;
COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
- flash_bank_t *p = get_flash_bank_by_num_noprobe(bank_nr);
+ struct flash_bank *p = get_flash_bank_by_num_noprobe(bank_nr);
if (p)
{
if ((retval = p->driver->probe(p)) == ERROR_OK)
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)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
- flash_bank_t *p;
+ struct flash_bank *p;
int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
if (ERROR_OK != retval)
return retval;
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)
return ERROR_COMMAND_SYNTAX_ERROR;
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)
return ERROR_COMMAND_SYNTAX_ERROR;
- flash_bank_t *p;
+ struct flash_bank *p;
int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
if (ERROR_OK != retval)
return retval;
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)
return ERROR_COMMAND_SYNTAX_ERROR;
uint32_t last;
COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
- flash_bank_t *p = get_flash_bank_by_num(bank_nr);
+ struct flash_bank *p = get_flash_bank_by_num(bank_nr);
if (!p)
return ERROR_OK;
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)
return ERROR_COMMAND_SYNTAX_ERROR;
int set;
COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
- flash_bank_t *p = get_flash_bank_by_num(bank_nr);
+ struct flash_bank *p = get_flash_bank_by_num(bank_nr);
if (!p)
return ERROR_OK;
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;
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 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;
if (count == 0)
return ERROR_OK;
- switch (cmd[4])
+ switch (CMD_NAME[4])
{
case 'w':
wordsize = 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_OK;
}
-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)
return ERROR_COMMAND_SYNTAX_ERROR;
struct duration bench;
duration_start(&bench);
- flash_bank_t *p;
+ struct flash_bank *p;
int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
if (ERROR_OK != retval)
return retval;
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;
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;
+ struct target *target = bank->target;
uint8_t buffer[1024];
int buffer_size = sizeof(buffer);
int i;
return ERROR_OK;
}
-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");
+
+ 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;
+}
+
+int flash_register_commands(struct command_context_s *cmd_ctx)
+{
+ flash_cmd = register_command(cmd_ctx, NULL, "flash",
+ NULL, COMMAND_ANY, NULL);
+
+ 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;
+}
projects / fw / openocd / blobdiff