X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fstr9xpec.c;h=711ee7ae77a7ce60203ba96ea816c99c89a540ba;hb=2689f58f2a0afa296a29ab301a4c1665b914caab;hp=fc1bfbcdde756bb239bf9416461a9ff65764d409;hpb=50c086ffb94f199c088f4cc52b7887b668dddf00;p=openocd diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c index fc1bfbcd..711ee7ae 100644 --- a/src/flash/str9xpec.c +++ b/src/flash/str9xpec.c @@ -101,7 +101,7 @@ static int str9xpec_register_commands(struct command_context_s *cmd_ctx) int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_state) { - if ( tap == NULL ){ + if (tap == NULL) { return ERROR_TARGET_INVALID; } @@ -318,14 +318,14 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char * str9xpec_info = malloc(sizeof(str9xpec_flash_controller_t)); bank->driver_priv = str9xpec_info; - /* find out jtag position of flash controller - * it is always after the arm966 core */ - + /* REVISIT verify that the jtag position of flash controller is + * right after *THIS* core, which must be a STR9xx core ... + */ armv4_5 = bank->target->arch_info; arm7_9 = armv4_5->arch_info; jtag_info = &arm7_9->jtag_info; - str9xpec_info->tap = jtag_tap_by_position( jtag_info->tap->abs_chain_position - 1); + str9xpec_info->tap = bank->target->tap; str9xpec_info->isc_enable = 0; str9xpec_build_block_list(bank); @@ -349,7 +349,7 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { - str9xpec_isc_enable( bank ); + str9xpec_isc_enable(bank); } if (!str9xpec_info->isc_enable) { @@ -438,7 +438,7 @@ static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last) tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { - str9xpec_isc_enable( bank ); + str9xpec_isc_enable(bank); } if (!str9xpec_info->isc_enable) { @@ -518,7 +518,7 @@ static int str9xpec_lock_device(struct flash_bank_s *bank) tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { - str9xpec_isc_enable( bank ); + str9xpec_isc_enable(bank); } if (!str9xpec_info->isc_enable) { @@ -575,7 +575,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l /* last bank: 0xFF signals a full device protect */ if (last == 0xFF) { - if ( set ) + if (set) { status = str9xpec_lock_device(bank); } @@ -589,7 +589,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l { for (i = first; i <= last; i++) { - if ( set ) + if (set) buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 1); else buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 0); @@ -671,11 +671,11 @@ static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t o check_address = sec_end; } - if ((offset >= sec_start) && (offset < sec_end)){ + if ((offset >= sec_start) && (offset < sec_end)) { first_sector = i; } - if ((offset + count >= sec_start) && (offset + count < sec_end)){ + if ((offset + count >= sec_start) && (offset + count < sec_end)) { last_sector = i; } } @@ -795,7 +795,6 @@ static int str9xpec_probe(struct flash_bank_s *bank) static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *bank; scan_field_t field; uint8_t *buffer = NULL; jtag_tap_t *tap; @@ -803,16 +802,12 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch str9xpec_flash_controller_t *str9xpec_info = NULL; if (argc < 1) - { return ERROR_COMMAND_SYNTAX_ERROR; - } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; str9xpec_info = bank->driver_priv; tap = str9xpec_info->tap; @@ -845,13 +840,12 @@ static int str9xpec_erase_check(struct flash_bank_s *bank) static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size) { - snprintf(buf, buf_size, "str9xpec flash driver info" ); + snprintf(buf, buf_size, "str9xpec flash driver info"); return ERROR_OK; } static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *bank; uint8_t status; str9xpec_flash_controller_t *str9xpec_info = NULL; @@ -861,12 +855,10 @@ static int str9xpec_handle_flash_options_read_command(struct command_context_s * return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; str9xpec_info = bank->driver_priv; @@ -919,13 +911,13 @@ static int str9xpec_write_options(struct flash_bank_s *bank) tap = str9xpec_info->tap; /* erase config options first */ - status = str9xpec_erase_area( bank, 0xFE, 0xFE ); + status = str9xpec_erase_area(bank, 0xFE, 0xFE); if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS) return status; if (!str9xpec_info->isc_enable) { - str9xpec_isc_enable( bank ); + str9xpec_isc_enable(bank); } if (!str9xpec_info->isc_enable) { @@ -971,7 +963,6 @@ static int str9xpec_write_options(struct flash_bank_s *bank) static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *bank; uint8_t status; if (argc < 1) @@ -980,12 +971,10 @@ static int str9xpec_handle_flash_options_write_command(struct command_context_s return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; status = str9xpec_write_options(bank); @@ -997,21 +986,18 @@ static int str9xpec_handle_flash_options_write_command(struct command_context_s static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *bank; str9xpec_flash_controller_t *str9xpec_info = NULL; if (argc < 2) { - command_print(cmd_ctx, "str9xpec options_cmap "); + command_print(cmd_ctx, "str9xpec options_cmap "); return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; str9xpec_info = bank->driver_priv; @@ -1029,21 +1015,18 @@ static int str9xpec_handle_flash_options_cmap_command(struct command_context_s * static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *bank; str9xpec_flash_controller_t *str9xpec_info = NULL; if (argc < 2) { - command_print(cmd_ctx, "str9xpec options_lvdthd <2.4v|2.7v>"); + command_print(cmd_ctx, "str9xpec options_lvdthd <2.4v | 2.7v>"); return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; str9xpec_info = bank->driver_priv; @@ -1061,21 +1044,18 @@ static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *bank; str9xpec_flash_controller_t *str9xpec_info = NULL; if (argc < 2) { - command_print(cmd_ctx, "str9xpec options_lvdsel "); + command_print(cmd_ctx, "str9xpec options_lvdsel "); return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; str9xpec_info = bank->driver_priv; @@ -1093,21 +1073,18 @@ int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_c static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *bank; str9xpec_flash_controller_t *str9xpec_info = NULL; if (argc < 2) { - command_print(cmd_ctx, "str9xpec options_lvdwarn "); + command_print(cmd_ctx, "str9xpec options_lvdwarn "); return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; str9xpec_info = bank->driver_priv; @@ -1126,7 +1103,6 @@ static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { uint8_t status; - flash_bank_t *bank; if (argc < 1) { @@ -1134,12 +1110,10 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; status = str9xpec_lock_device(bank); @@ -1152,7 +1126,6 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { uint8_t status; - flash_bank_t *bank; if (argc < 1) { @@ -1160,12 +1133,10 @@ static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ct return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; status = str9xpec_unlock_device(bank); @@ -1177,8 +1148,6 @@ static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ct static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - int retval; - flash_bank_t *bank; jtag_tap_t *tap0; jtag_tap_t *tap1; jtag_tap_t *tap2; @@ -1190,12 +1159,10 @@ static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s * return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; str9xpec_info = bank->driver_priv; @@ -1230,7 +1197,6 @@ static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s * static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *bank; jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = NULL; @@ -1240,12 +1206,10 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s return ERROR_OK; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; str9xpec_info = bank->driver_priv; tap = str9xpec_info->tap; @@ -1254,7 +1218,8 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s return ERROR_FAIL; /* exit turbo mode via RESET */ - str9xpec_set_instr(tap, ISC_NOOP, TAP_RESET); + str9xpec_set_instr(tap, ISC_NOOP, TAP_IDLE); + jtag_add_tlr(); jtag_execute_queue(); /* restore previous scan chain */