X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fat91sam7.c;h=3a809e250dc884e55f40bc2358c97272a877a167;hb=f9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1;hp=f9b87babb23708da4c6542e43a36d408eb5c8271;hpb=fe9228a32db930be297d4d3b35ffb94d6de1b9ab;p=openocd.git diff --git a/src/flash/nor/at91sam7.c b/src/flash/nor/at91sam7.c index f9b87babb2..3a809e250d 100644 --- a/src/flash/nor/at91sam7.c +++ b/src/flash/nor/at91sam7.c @@ -49,8 +49,9 @@ #include "config.h" #endif +#include "imp.h" #include "at91sam7.h" -#include "binarybuffer.h" +#include static int at91sam7_protect_check(struct flash_bank *bank); static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count); @@ -297,7 +298,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank) uint32_t ext_freq; uint32_t bank_size; uint32_t base_address = 0; - char *target_name = "Unknown"; + char *target_name_t = "Unknown"; at91sam7_info = t_bank->driver_priv; @@ -385,7 +386,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank) if (arch == 0x70) { num_nvmbits = 2; - target_name = "AT91SAM7S161/16"; + target_name_t = "AT91SAM7S161/16"; } break; @@ -398,12 +399,12 @@ static int at91sam7_read_part_info(struct flash_bank *bank) if (arch == 0x70) { num_nvmbits = 2; - target_name = "AT91SAM7S321/32"; + target_name_t = "AT91SAM7S321/32"; } if (arch == 0x72) { num_nvmbits = 3; - target_name = "AT91SAM7SE32"; + target_name_t = "AT91SAM7SE32"; } break; @@ -416,7 +417,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank) if (arch == 0x70) { num_nvmbits = 2; - target_name = "AT91SAM7S64"; + target_name_t = "AT91SAM7S64"; } break; @@ -429,22 +430,22 @@ static int at91sam7_read_part_info(struct flash_bank *bank) if (arch == 0x70) { num_nvmbits = 2; - target_name = "AT91SAM7S128"; + target_name_t = "AT91SAM7S128"; } if (arch == 0x71) { num_nvmbits = 3; - target_name = "AT91SAM7XC128"; + target_name_t = "AT91SAM7XC128"; } if (arch == 0x72) { num_nvmbits = 3; - target_name = "AT91SAM7SE128"; + target_name_t = "AT91SAM7SE128"; } if (arch == 0x75) { num_nvmbits = 3; - target_name = "AT91SAM7X128"; + target_name_t = "AT91SAM7X128"; } break; @@ -457,27 +458,27 @@ static int at91sam7_read_part_info(struct flash_bank *bank) if (arch == 0x60) { num_nvmbits = 3; - target_name = "AT91SAM7A3"; + target_name_t = "AT91SAM7A3"; } if (arch == 0x70) { num_nvmbits = 2; - target_name = "AT91SAM7S256"; + target_name_t = "AT91SAM7S256"; } if (arch == 0x71) { num_nvmbits = 3; - target_name = "AT91SAM7XC256"; + target_name_t = "AT91SAM7XC256"; } if (arch == 0x72) { num_nvmbits = 3; - target_name = "AT91SAM7SE256"; + target_name_t = "AT91SAM7SE256"; } if (arch == 0x75) { num_nvmbits = 3; - target_name = "AT91SAM7X256"; + target_name_t = "AT91SAM7X256"; } break; @@ -490,22 +491,22 @@ static int at91sam7_read_part_info(struct flash_bank *bank) if (arch == 0x70) { num_nvmbits = 2; - target_name = "AT91SAM7S512"; + target_name_t = "AT91SAM7S512"; } if (arch == 0x71) { num_nvmbits = 3; - target_name = "AT91SAM7XC512"; + target_name_t = "AT91SAM7XC512"; } if (arch == 0x72) { num_nvmbits = 3; - target_name = "AT91SAM7SE512"; + target_name_t = "AT91SAM7SE512"; } if (arch == 0x75) { num_nvmbits = 3; - target_name = "AT91SAM7X512"; + target_name_t = "AT91SAM7X512"; } break; @@ -516,7 +517,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank) break; } - if (strcmp(target_name, "Unknown") == 0) + if (strcmp(target_name_t, "Unknown") == 0) { LOG_ERROR("Target autodetection failed! Please specify target parameters in configuration file"); return ERROR_FLASH_OPERATION_FAILED; @@ -572,7 +573,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank) at91sam7_info->cidr_eproc = (cidr >> 5)&0x0007; at91sam7_info->cidr_version = cidr&0x001F; - at91sam7_info->target_name = target_name; + at91sam7_info->target_name = target_name_t; at91sam7_info->flashmode = 0; at91sam7_info->ext_freq = ext_freq; at91sam7_info->num_nvmbits = num_nvmbits; @@ -730,7 +731,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command) uint16_t page_size; uint16_t num_nvmbits; - char *target_name; + char *target_name_t; int bnk, sec; @@ -774,8 +775,8 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command) return ERROR_OK; } - target_name = calloc(strlen(CMD_ARGV[7]) + 1, sizeof(char)); - strcpy(target_name, CMD_ARGV[7]); + target_name_t = calloc(strlen(CMD_ARGV[7]) + 1, sizeof(char)); + strcpy(target_name_t, CMD_ARGV[7]); /* calculate bank size */ bank_size = num_sectors * pages_per_sector * page_size; @@ -815,7 +816,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command) at91sam7_info = t_bank->driver_priv; - at91sam7_info->target_name = target_name; + at91sam7_info->target_name = target_name_t; at91sam7_info->flashmode = 0; at91sam7_info->ext_freq = ext_freq; at91sam7_info->num_nvmbits = num_nvmbits; @@ -1033,7 +1034,7 @@ static int at91sam7_probe(struct flash_bank *bank) return ERROR_OK; } -static int at91sam7_info(struct flash_bank *bank, char *buf, int buf_size) +static int get_at91sam7_info(struct flash_bank *bank, char *buf, int buf_size) { int printed; struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv; @@ -1181,10 +1182,11 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command) static const struct command_registration at91sam7_exec_command_handlers[] = { { .name = "gpnvm", - .handler = &at91sam7_handle_gpnvm_command, + .handler = at91sam7_handle_gpnvm_command, .mode = COMMAND_EXEC, - .usage = "gpnvm set | clear, " - "set or clear one gpnvm bit", + .help = "set or clear one General Purpose Non-Volatile Memory " + "(gpnvm) bit", + .usage = "bitnum ('set'|'clear')", }, COMMAND_REGISTRATION_DONE }; @@ -1199,15 +1201,16 @@ static const struct command_registration at91sam7_command_handlers[] = { }; struct flash_driver at91sam7_flash = { - .name = "at91sam7", - .commands = at91sam7_command_handlers, - .flash_bank_command = &at91sam7_flash_bank_command, - .erase = &at91sam7_erase, - .protect = &at91sam7_protect, - .write = &at91sam7_write, - .probe = &at91sam7_probe, - .auto_probe = &at91sam7_probe, - .erase_check = &at91sam7_erase_check, - .protect_check = &at91sam7_protect_check, - .info = &at91sam7_info, - }; + .name = "at91sam7", + .commands = at91sam7_command_handlers, + .flash_bank_command = at91sam7_flash_bank_command, + .erase = at91sam7_erase, + .protect = at91sam7_protect, + .write = at91sam7_write, + .read = default_flash_read, + .probe = at91sam7_probe, + .auto_probe = at91sam7_probe, + .erase_check = at91sam7_erase_check, + .protect_check = at91sam7_protect_check, + .info = get_at91sam7_info, +};