X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=2c63b827c9d7f81527d14e935a9cd480b589b452;hp=5374532cea8ff0f2286eb5c9fb4056d0e4b77785;hb=2861877b32a7a2f4022a1c3d9b66c9b4879878ac;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea diff --git a/src/flash/flash.c b/src/flash/flash.c index 5374532cea..2c63b827c9 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -76,11 +76,11 @@ struct flash_driver *flash_drivers[] = { 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; @@ -94,7 +94,7 @@ static int flash_driver_write(struct flash_bank_s *bank, uint8_t *buffer, uint32 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; @@ -107,7 +107,7 @@ static int flash_driver_erase(struct flash_bank_s *bank, int first, int last) 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; @@ -122,7 +122,7 @@ int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last 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"); @@ -153,9 +153,9 @@ static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv) 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) @@ -171,7 +171,7 @@ flash_bank_t *get_flash_bank_by_num_noprobe(int num) 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) { @@ -180,9 +180,9 @@ int flash_get_bank_count(void) 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) @@ -198,17 +198,17 @@ flash_bank_t *get_flash_bank_by_num(int num) 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) { + const char *name = CMD_ARGV[name_index]; 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; @@ -222,39 +222,39 @@ COMMAND_HANDLER(handle_flash_bank_command) int found = 0; struct target *target; - if (argc < 6) + if (CMD_ARGC < 6) { return ERROR_COMMAND_SYNTAX_ERROR; } - if ((target = get_target(args[5])) == NULL) + 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++) { - if (strcmp(args[0], flash_drivers[i]->name) != 0) + if (strcmp(CMD_ARGV[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) + if (flash_drivers[i]->register_commands(CMD_CTX) != ERROR_OK) { - LOG_ERROR("couldn't register '%s' commands", args[0]); + LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]); 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_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; @@ -262,7 +262,7 @@ COMMAND_HANDLER(handle_flash_bank_command) 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 , CMD_ARGV[0], c->base); free(c); return retval; } @@ -289,7 +289,7 @@ COMMAND_HANDLER(handle_flash_bank_command) /* no matching flash driver found */ if (!found) { - LOG_ERROR("flash driver '%s' not found", args[0]); + LOG_ERROR("flash driver '%s' not found", CMD_ARGV[0]); return ERROR_FAIL; } @@ -298,16 +298,16 @@ COMMAND_HANDLER(handle_flash_bank_command) 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++) { @@ -320,7 +320,7 @@ COMMAND_HANDLER(handle_flash_info_command) 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, @@ -339,7 +339,7 @@ COMMAND_HANDLER(handle_flash_info_command) 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, @@ -350,7 +350,7 @@ COMMAND_HANDLER(handle_flash_info_command) *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); } @@ -362,34 +362,34 @@ 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; @@ -397,25 +397,25 @@ COMMAND_HANDLER(handle_flash_probe_command) 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_by_num, 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++) @@ -429,7 +429,7 @@ COMMAND_HANDLER(handle_flash_erase_check_command) 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, @@ -443,21 +443,21 @@ COMMAND_HANDLER(handle_flash_erase_check_command) COMMAND_HANDLER(handle_flash_erase_address_command) { - flash_bank_t *p; + struct flash_bank *p; int retval; int address; int length; - struct target *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; } @@ -477,7 +477,7 @@ COMMAND_HANDLER(handle_flash_erase_address_command) 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)); } @@ -487,31 +487,31 @@ COMMAND_HANDLER(handle_flash_erase_address_command) 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_by_num, 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)) { @@ -531,26 +531,26 @@ static int flash_check_sector_parameters(struct command_context_s *cmd_ctx, COMMAND_HANDLER(handle_flash_erase_command) { - if (argc != 2) + if (CMD_ARGC != 2) 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; @@ -561,7 +561,7 @@ COMMAND_HANDLER(handle_flash_erase_command) 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)); } @@ -571,7 +571,7 @@ COMMAND_HANDLER(handle_flash_erase_command) COMMAND_HANDLER(handle_flash_protect_command) { - if (argc != 3) + if (CMD_ARGC != 3) return ERROR_COMMAND_SYNTAX_ERROR; uint32_t bank_nr; @@ -579,32 +579,32 @@ COMMAND_HANDLER(handle_flash_protect_command) 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) + if (strcmp(CMD_ARGV[3], "on") == 0) set = 1; - else if (strcmp(args[3], "off") == 0) + else if (strcmp(CMD_ARGV[3], "off") == 0) set = 0; else return ERROR_COMMAND_SYNTAX_ERROR; 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); @@ -615,14 +615,14 @@ COMMAND_HANDLER(handle_flash_protect_command) COMMAND_HANDLER(handle_flash_write_image_command) { - struct target *target = get_current_target(cmd_ctx); + struct target *target = get_current_target(CMD_CTX); struct image image; uint32_t written; int retval; - if (argc < 1) + if (CMD_ARGC < 1) { return ERROR_COMMAND_SYNTAX_ERROR; } @@ -633,25 +633,25 @@ COMMAND_HANDLER(handle_flash_write_image_command) 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; } @@ -665,10 +665,10 @@ COMMAND_HANDLER(handle_flash_write_image_command) 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 { @@ -678,7 +678,7 @@ COMMAND_HANDLER(handle_flash_write_image_command) 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; @@ -693,8 +693,8 @@ COMMAND_HANDLER(handle_flash_write_image_command) 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)); } @@ -714,16 +714,16 @@ COMMAND_HANDLER(handle_flash_fill_command) uint32_t wrote = 0; uint32_t cur_size = 0; uint32_t chunk_count; - struct target *target = get_current_target(cmd_ctx); + struct target *target = get_current_target(CMD_CTX); uint32_t i; uint32_t wordsize; - if (argc != 3) + if (CMD_ARGC != 3) return ERROR_COMMAND_SYNTAX_ERROR; - COMMAND_PARSE_NUMBER(u32, args[0], address); - COMMAND_PARSE_NUMBER(u32, args[1], pattern); - COMMAND_PARSE_NUMBER(u32, args[2], count); + 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; @@ -772,7 +772,7 @@ COMMAND_HANDLER(handle_flash_fill_command) 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) { @@ -800,7 +800,7 @@ COMMAND_HANDLER(handle_flash_fill_command) 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)); } @@ -811,28 +811,28 @@ COMMAND_HANDLER(handle_flash_write_bank_command) { uint32_t offset; uint8_t *buffer; - uint32_t buf_cnt; 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_by_num, 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); @@ -847,9 +847,9 @@ COMMAND_HANDLER(handle_flash_write_bank_command) 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)); } @@ -860,7 +860,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command) void flash_set_dirty(void) { - flash_bank_t *c; + struct flash_bank *c; int i; /* set all flash to require erasing */ @@ -874,9 +874,9 @@ void flash_set_dirty(void) } /* 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) @@ -899,9 +899,9 @@ struct flash_bank_s *get_flash_bank_by_addr(struct target *target, uint32_t addr /* 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; @@ -954,7 +954,7 @@ int flash_erase_address_range(struct target *target, uint32_t addr, uint32_t len 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); } @@ -972,7 +972,7 @@ static int flash_write_unlock(struct target *target, struct image *image, uint32 int section; uint32_t section_offset; - flash_bank_t *c; + struct flash_bank *c; int *padding; section = 0; @@ -1059,7 +1059,7 @@ static int flash_write_unlock(struct target *target, struct image *image, uint32 /* 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) @@ -1130,7 +1130,7 @@ int flash_write(struct target *target, struct image *image, uint32_t *written, i 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]; @@ -1177,7 +1177,7 @@ int default_flash_mem_blank_check(struct flash_bank_s *bank) 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; @@ -1217,7 +1217,7 @@ int default_flash_blank_check(struct flash_bank_s *bank) 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"); @@ -1267,7 +1267,7 @@ int flash_init_drivers(struct command_context_s *cmd_ctx) 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);