NULL,
};
-flash_bank_t *flash_banks;
-static command_t *flash_cmd;
+struct flash_bank *flash_banks;
+static struct command *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;
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_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)
return p;
}
-int flash_command_get_bank_by_num(
- struct command_context_s *cmd_ctx, const char *str, flash_bank_t **bank)
+COMMAND_HELPER(flash_command_get_bank_by_num,
+ unsigned name_index, struct flash_bank **bank)
{
unsigned bank_num;
- COMMAND_PARSE_NUMBER(uint, str, bank_num);
+ COMMAND_PARSE_NUMBER(uint, args[name_index], bank_num);
*bank = get_flash_bank_by_num(bank_num);
if (!*bank)
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;
COMMAND_HANDLER(handle_flash_info_command)
{
- flash_bank_t *p;
+ struct flash_bank *p;
uint32_t i = 0;
int j = 0;
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_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_by_num, 0, &p);
if (ERROR_OK != retval)
return retval;
COMMAND_HANDLER(handle_flash_erase_address_command)
{
- flash_bank_t *p;
+ struct flash_bank *p;
int retval;
int address;
int length;
if (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_by_num, 0, &p);
if (ERROR_OK != retval)
return retval;
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)) {
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;
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;
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)
{
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_by_num, 0, &p);
if (ERROR_OK != retval)
return retval;
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,
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 */
-struct flash_bank_s *get_flash_bank_by_addr(struct target *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(struct target *target, uint32_t addr, uint32_t length,
- int (*callback)(struct flash_bank_s *bank, int first, int last))
+ 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;
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);
}
int section;
uint32_t section_offset;
- flash_bank_t *c;
+ struct flash_bank *c;
int *padding;
section = 0;
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)
{
struct target *target = bank->target;
uint8_t buffer[1024];
return ERROR_OK;
}
-int default_flash_blank_check(struct flash_bank_s *bank)
+int default_flash_blank_check(struct flash_bank *bank)
{
struct target *target = bank->target;
int i;
return ERROR_OK;
}
-int flash_init_drivers(struct command_context_s *cmd_ctx)
+int flash_init_drivers(struct command_context *cmd_ctx)
{
register_jim(cmd_ctx, "ocd_flash_banks",
jim_flash_banks, "return information about the flash banks");
return ERROR_OK;
}
-int flash_register_commands(struct command_context_s *cmd_ctx)
+int flash_register_commands(struct command_context *cmd_ctx)
{
flash_cmd = register_command(cmd_ctx, NULL, "flash",
NULL, COMMAND_ANY, NULL);