X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Fstr9xpec.c;h=dc195c148fa1f5ef662a049a74f4ca0008e712b1;hb=fbcb57baf842a84898dcc1cbe9a8b56d2a0028e1;hp=c01292d37b1e2b815c89c845782670b6130e8e2c;hpb=e3462b228ce9533b6e7989361f9c4090043a8aa4;p=openocd.git diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c index c01292d37b..dc195c148f 100644 --- a/src/flash/str9xpec.c +++ b/src/flash/str9xpec.c @@ -24,47 +24,35 @@ #include "config.h" #endif -#include "replacements.h" - #include "str9xpec.h" -#include "flash.h" -#include "target.h" -#include "log.h" -#include "armv4_5.h" #include "arm7_9_common.h" -#include "jtag.h" -#include "binarybuffer.h" - -#include -#include -#include -#include - -int str9xpec_register_commands(struct command_context_s *cmd_ctx); -int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); -int str9xpec_erase(struct flash_bank_s *bank, int first, int last); -int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last); -int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); -int str9xpec_probe(struct flash_bank_s *bank); -int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_protect_check(struct flash_bank_s *bank); -int str9xpec_erase_check(struct flash_bank_s *bank); -int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size); - -int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last); -int str9xpec_set_address(struct flash_bank_s *bank, u8 sector); -int str9xpec_write_options(struct flash_bank_s *bank); - -int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); + + +static int str9xpec_register_commands(struct command_context_s *cmd_ctx); +static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); +static int str9xpec_erase(struct flash_bank_s *bank, int first, int last); +static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last); +static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); +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); +static int str9xpec_protect_check(struct flash_bank_s *bank); +static int str9xpec_erase_check(struct flash_bank_s *bank); +static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size); + +static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last); +static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector); +static int str9xpec_write_options(struct flash_bank_s *bank); + +static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); flash_driver_t str9xpec_flash = { @@ -81,7 +69,7 @@ flash_driver_t str9xpec_flash = .info = str9xpec_info }; -int str9xpec_register_commands(struct command_context_s *cmd_ctx) +static int str9xpec_register_commands(struct command_context_s *cmd_ctx) { command_t *str9xpec_cmd = register_command(cmd_ctx, NULL, "str9xpec", NULL, COMMAND_ANY, "str9xpec flash specific commands"); @@ -111,28 +99,26 @@ int str9xpec_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } -int str9xpec_set_instr(int chain_pos, u32 new_instr, enum tap_state end_state) +int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state) { - jtag_device_t *device = jtag_get_device(chain_pos); - if (device == NULL) - { + if( tap == NULL ){ return ERROR_TARGET_INVALID; } - if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr) + if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) { scan_field_t field; - field.device = chain_pos; - field.num_bits = device->ir_length; + field.tap = tap; + field.num_bits = tap->ir_length; field.out_value = calloc(CEIL(field.num_bits, 8), 1); buf_set_u32(field.out_value, 0, field.num_bits, new_instr); - field.out_mask = NULL; + field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + jtag_add_ir_scan(1, &field, end_state); @@ -142,25 +128,25 @@ int str9xpec_set_instr(int chain_pos, u32 new_instr, enum tap_state end_state) return ERROR_OK; } -u8 str9xpec_isc_status(int chain_pos) +static u8 str9xpec_isc_status(jtag_tap_t *tap) { scan_field_t field; u8 status; - if (str9xpec_set_instr(chain_pos, ISC_NOOP, TAP_PI) != ERROR_OK) + if (str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE) != ERROR_OK) return ISC_STATUS_ERROR; - field.device = chain_pos; + field.tap = tap; field.num_bits = 8; field.out_value = NULL; - field.out_mask = NULL; + field.in_value = &status; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + - jtag_add_dr_scan(1, &field, TAP_RTI); + jtag_add_dr_scan(1, &field, TAP_IDLE); jtag_execute_queue(); LOG_DEBUG("status: 0x%2.2x", status); @@ -171,23 +157,23 @@ u8 str9xpec_isc_status(int chain_pos) return status; } -int str9xpec_isc_enable(struct flash_bank_s *bank) +static int str9xpec_isc_enable(struct flash_bank_s *bank) { u8 status; - u32 chain_pos; + jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; if (str9xpec_info->isc_enable) return ERROR_OK; /* enter isc mode */ - if (str9xpec_set_instr(chain_pos, ISC_ENABLE, TAP_RTI) != ERROR_OK) + if (str9xpec_set_instr(tap, ISC_ENABLE, TAP_IDLE) != ERROR_OK) return ERROR_TARGET_INVALID; /* check ISC status */ - status = str9xpec_isc_status(chain_pos); + status = str9xpec_isc_status(tap); if (status & ISC_STATUS_MODE) { /* we have entered isc mode */ @@ -198,25 +184,25 @@ int str9xpec_isc_enable(struct flash_bank_s *bank) return ERROR_OK; } -int str9xpec_isc_disable(struct flash_bank_s *bank) +static int str9xpec_isc_disable(struct flash_bank_s *bank) { u8 status; - u32 chain_pos; + jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) return ERROR_OK; - if (str9xpec_set_instr(chain_pos, ISC_DISABLE, TAP_RTI) != ERROR_OK) + if (str9xpec_set_instr(tap, ISC_DISABLE, TAP_IDLE) != ERROR_OK) return ERROR_TARGET_INVALID; /* delay to handle aborts */ jtag_add_sleep(50); /* check ISC status */ - status = str9xpec_isc_status(chain_pos); + status = str9xpec_isc_status(tap); if (!(status & ISC_STATUS_MODE)) { /* we have left isc mode */ @@ -227,40 +213,40 @@ int str9xpec_isc_disable(struct flash_bank_s *bank) return ERROR_OK; } -int str9xpec_read_config(struct flash_bank_s *bank) +static int str9xpec_read_config(struct flash_bank_s *bank) { scan_field_t field; u8 status; - u32 chain_pos; + jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; LOG_DEBUG("ISC_CONFIGURATION"); /* execute ISC_CONFIGURATION command */ - str9xpec_set_instr(chain_pos, ISC_CONFIGURATION, TAP_PI); + str9xpec_set_instr(tap, ISC_CONFIGURATION, TAP_IRPAUSE); - field.device = chain_pos; + field.tap = tap; field.num_bits = 64; field.out_value = NULL; - field.out_mask = NULL; + field.in_value = str9xpec_info->options; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + - jtag_add_dr_scan(1, &field, TAP_RTI); + jtag_add_dr_scan(1, &field, TAP_IDLE); jtag_execute_queue(); - status = str9xpec_isc_status(chain_pos); + status = str9xpec_isc_status(tap); return status; } -int str9xpec_build_block_list(struct flash_bank_s *bank) +static int str9xpec_build_block_list(struct flash_bank_s *bank) { str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; @@ -329,7 +315,7 @@ int str9xpec_build_block_list(struct flash_bank_s *bank) /* flash bank str9x 0 0 */ -int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) +static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) { str9xpec_flash_controller_t *str9xpec_info; armv4_5_common_t *armv4_5 = NULL; @@ -352,9 +338,8 @@ int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, ch arm7_9 = armv4_5->arch_info; jtag_info = &arm7_9->jtag_info; - str9xpec_info->chain_pos = (jtag_info->chain_pos - 1); + str9xpec_info->tap = jtag_TapByAbsPosition( jtag_info->tap->abs_chain_position - 1); str9xpec_info->isc_enable = 0; - str9xpec_info->devarm = NULL; str9xpec_build_block_list(bank); @@ -364,17 +349,17 @@ int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, ch return ERROR_OK; } -int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) +static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) { scan_field_t field; u8 status; - u32 chain_pos; + jtag_tap_t *tap; int i; u8 *buffer = NULL; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { str9xpec_isc_enable( bank ); @@ -393,36 +378,36 @@ int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) } /* execute ISC_BLANK_CHECK command */ - str9xpec_set_instr(chain_pos, ISC_BLANK_CHECK, TAP_PI); + str9xpec_set_instr(tap, ISC_BLANK_CHECK, TAP_IRPAUSE); - field.device = chain_pos; + field.tap = tap; field.num_bits = 64; field.out_value = buffer; - field.out_mask = NULL; + field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + - jtag_add_dr_scan(1, &field, TAP_RTI); + jtag_add_dr_scan(1, &field, TAP_IDLE); jtag_add_sleep(40000); /* read blank check result */ - field.device = chain_pos; + field.tap = tap; field.num_bits = 64; field.out_value = NULL; - field.out_mask = NULL; + field.in_value = buffer; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + - jtag_add_dr_scan(1, &field, TAP_PI); + jtag_add_dr_scan(1, &field, TAP_IRPAUSE); jtag_execute_queue(); - status = str9xpec_isc_status(chain_pos); + status = str9xpec_isc_status(tap); for (i = first; i <= last; i++) { @@ -441,7 +426,7 @@ int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) return ERROR_OK; } -int str9xpec_protect_check(struct flash_bank_s *bank) +static int str9xpec_protect_check(struct flash_bank_s *bank) { u8 status; int i; @@ -463,17 +448,17 @@ int str9xpec_protect_check(struct flash_bank_s *bank) return ERROR_OK; } -int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last) +static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last) { scan_field_t field; u8 status; - u32 chain_pos; + jtag_tap_t *tap; int i; u8 *buffer = NULL; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { str9xpec_isc_enable( bank ); @@ -509,25 +494,25 @@ int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last) LOG_DEBUG("ISC_ERASE"); /* execute ISC_ERASE command */ - str9xpec_set_instr(chain_pos, ISC_ERASE, TAP_PI); + str9xpec_set_instr(tap, ISC_ERASE, TAP_IRPAUSE); - field.device = chain_pos; + field.tap = tap; field.num_bits = 64; field.out_value = buffer; - field.out_mask = NULL; + field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + - jtag_add_dr_scan(1, &field, TAP_RTI); + jtag_add_dr_scan(1, &field, TAP_IDLE); jtag_execute_queue(); jtag_add_sleep(10); /* wait for erase completion */ - while (!((status = str9xpec_isc_status(chain_pos)) & ISC_STATUS_BUSY)) { + while (!((status = str9xpec_isc_status(tap)) & ISC_STATUS_BUSY)) { alive_sleep(1); } @@ -538,7 +523,7 @@ int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last) return status; } -int str9xpec_erase(struct flash_bank_s *bank, int first, int last) +static int str9xpec_erase(struct flash_bank_s *bank, int first, int last) { int status; @@ -550,15 +535,15 @@ int str9xpec_erase(struct flash_bank_s *bank, int first, int last) return ERROR_OK; } -int str9xpec_lock_device(struct flash_bank_s *bank) +static int str9xpec_lock_device(struct flash_bank_s *bank) { scan_field_t field; u8 status; - u32 chain_pos; + jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = NULL; str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { str9xpec_isc_enable( bank ); @@ -572,20 +557,20 @@ int str9xpec_lock_device(struct flash_bank_s *bank) str9xpec_set_address(bank, 0x80); /* execute ISC_PROGRAM command */ - str9xpec_set_instr(chain_pos, ISC_PROGRAM_SECURITY, TAP_RTI); + str9xpec_set_instr(tap, ISC_PROGRAM_SECURITY, TAP_IDLE); - str9xpec_set_instr(chain_pos, ISC_NOOP, TAP_PI); + str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE); do { - field.device = chain_pos; + field.tap = tap; field.num_bits = 8; field.out_value = NULL; - field.out_mask = NULL; + field.in_value = &status; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + jtag_add_dr_scan(1, &field, -1); jtag_execute_queue(); @@ -597,7 +582,7 @@ int str9xpec_lock_device(struct flash_bank_s *bank) return status; } -int str9xpec_unlock_device(struct flash_bank_s *bank) +static int str9xpec_unlock_device(struct flash_bank_s *bank) { u8 status; @@ -606,7 +591,7 @@ int str9xpec_unlock_device(struct flash_bank_s *bank) return status; } -int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last) +static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last) { u8 status; int i; @@ -652,33 +637,33 @@ int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last) return ERROR_OK; } -int str9xpec_set_address(struct flash_bank_s *bank, u8 sector) +static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector) { - u32 chain_pos; + jtag_tap_t *tap; scan_field_t field; str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; /* set flash controller address */ - str9xpec_set_instr(chain_pos, ISC_ADDRESS_SHIFT, TAP_PI); + str9xpec_set_instr(tap, ISC_ADDRESS_SHIFT, TAP_IRPAUSE); - field.device = chain_pos; + field.tap = tap; field.num_bits = 8; field.out_value = §or; - field.out_mask = NULL; + field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + jtag_add_dr_scan(1, &field, -1); return ERROR_OK; } -int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) { str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; u32 dwords_remaining = (count / 8); @@ -686,14 +671,14 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) u32 bytes_written = 0; u8 status; u32 check_address = offset; - u32 chain_pos; + jtag_tap_t *tap; scan_field_t field; u8 *scanbuf; int i; - u32 first_sector = 0; - u32 last_sector = 0; + int first_sector = 0; + int last_sector = 0; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { str9xpec_isc_enable(bank); @@ -750,35 +735,35 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) while (dwords_remaining > 0) { - str9xpec_set_instr(chain_pos, ISC_PROGRAM, TAP_PI); + str9xpec_set_instr(tap, ISC_PROGRAM, TAP_IRPAUSE); - field.device = chain_pos; + field.tap = tap; field.num_bits = 64; field.out_value = (buffer + bytes_written); - field.out_mask = NULL; + field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + - jtag_add_dr_scan(1, &field, TAP_RTI); + jtag_add_dr_scan(1, &field, TAP_IDLE); /* small delay before polling */ jtag_add_sleep(50); - str9xpec_set_instr(chain_pos, ISC_NOOP, TAP_PI); + str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE); do { - field.device = chain_pos; + field.tap = tap; field.num_bits = 8; field.out_value = NULL; - field.out_mask = NULL; + field.in_value = scanbuf; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + jtag_add_dr_scan(1, &field, -1); jtag_execute_queue(); @@ -810,35 +795,35 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) bytes_written++; } - str9xpec_set_instr(chain_pos, ISC_PROGRAM, TAP_PI); + str9xpec_set_instr(tap, ISC_PROGRAM, TAP_IRPAUSE); - field.device = chain_pos; + field.tap = tap; field.num_bits = 64; field.out_value = last_dword; - field.out_mask = NULL; + field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + - jtag_add_dr_scan(1, &field, TAP_RTI); + jtag_add_dr_scan(1, &field, TAP_IDLE); /* small delay before polling */ jtag_add_sleep(50); - str9xpec_set_instr(chain_pos, ISC_NOOP, TAP_PI); + str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE); do { - field.device = chain_pos; + field.tap = tap; field.num_bits = 8; field.out_value = NULL; - field.out_mask = NULL; + field.in_value = scanbuf; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + jtag_add_dr_scan(1, &field, -1); jtag_execute_queue(); @@ -861,17 +846,17 @@ int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) return ERROR_OK; } -int str9xpec_probe(struct flash_bank_s *bank) +static int str9xpec_probe(struct flash_bank_s *bank) { return ERROR_OK; } -int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +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; u8 *buffer = NULL; - u32 chain_pos; + jtag_tap_t *tap; u32 idcode; str9xpec_flash_controller_t *str9xpec_info = NULL; @@ -888,23 +873,23 @@ int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd } str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; buffer = calloc(CEIL(32, 8), 1); - str9xpec_set_instr(chain_pos, ISC_IDCODE, TAP_PI); + str9xpec_set_instr(tap, ISC_IDCODE, TAP_IRPAUSE); - field.device = chain_pos; + field.tap = tap; field.num_bits = 32; field.out_value = NULL; - field.out_mask = NULL; + field.in_value = buffer; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + - jtag_add_dr_scan(1, &field, TAP_RTI); + jtag_add_dr_scan(1, &field, TAP_IDLE); jtag_execute_queue(); idcode = buf_get_u32(buffer, 0, 32); @@ -916,18 +901,18 @@ int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd return ERROR_OK; } -int str9xpec_erase_check(struct flash_bank_s *bank) +static int str9xpec_erase_check(struct flash_bank_s *bank) { return str9xpec_blank_check(bank, 0, bank->num_sectors - 1); } -int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size) +static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size) { snprintf(buf, buf_size, "str9xpec flash driver info" ); return ERROR_OK; } -int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *bank; u8 status; @@ -986,15 +971,15 @@ int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx return ERROR_OK; } -int str9xpec_write_options(struct flash_bank_s *bank) +static int str9xpec_write_options(struct flash_bank_s *bank) { scan_field_t field; u8 status; - u32 chain_pos; + jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = NULL; str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap = str9xpec_info->tap; /* erase config options first */ status = str9xpec_erase_area( bank, 0xFE, 0xFE ); @@ -1017,35 +1002,35 @@ int str9xpec_write_options(struct flash_bank_s *bank) str9xpec_set_address(bank, 0x50); /* execute ISC_PROGRAM command */ - str9xpec_set_instr(chain_pos, ISC_PROGRAM, TAP_PI); + str9xpec_set_instr(tap, ISC_PROGRAM, TAP_IRPAUSE); - field.device = chain_pos; + field.tap = tap; field.num_bits = 64; field.out_value = str9xpec_info->options; - field.out_mask = NULL; + field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + - jtag_add_dr_scan(1, &field, TAP_RTI); + jtag_add_dr_scan(1, &field, TAP_IDLE); /* small delay before polling */ jtag_add_sleep(50); - str9xpec_set_instr(chain_pos, ISC_NOOP, TAP_PI); + str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE); do { - field.device = chain_pos; + field.tap = tap; field.num_bits = 8; field.out_value = NULL; - field.out_mask = NULL; + field.in_value = &status; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; + + + + jtag_add_dr_scan(1, &field, -1); jtag_execute_queue(); @@ -1057,7 +1042,7 @@ int str9xpec_write_options(struct flash_bank_s *bank) return status; } -int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *bank; u8 status; @@ -1083,7 +1068,7 @@ int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ct return ERROR_OK; } -int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +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; @@ -1115,7 +1100,7 @@ int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx return ERROR_OK; } -int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +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; @@ -1179,7 +1164,7 @@ int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_c return ERROR_OK; } -int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +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; @@ -1211,7 +1196,7 @@ int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ return ERROR_OK; } -int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { u8 status; flash_bank_t *bank; @@ -1237,7 +1222,7 @@ int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char * return ERROR_OK; } -int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { u8 status; flash_bank_t *bank; @@ -1263,13 +1248,13 @@ int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char return ERROR_OK; } -int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +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; - u32 chain_pos; - jtag_device_t* dev0; - jtag_device_t* dev2; + jtag_tap_t *tap0; + jtag_tap_t *tap1; + jtag_tap_t *tap2; str9xpec_flash_controller_t *str9xpec_info = NULL; if (argc < 1) @@ -1287,33 +1272,39 @@ int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx str9xpec_info = bank->driver_priv; - chain_pos = str9xpec_info->chain_pos; + tap0 = str9xpec_info->tap; /* remove arm core from chain - enter turbo mode */ + tap1 = tap0->next_tap; + if (tap1 == NULL) + { + /* things are *WRONG* */ + command_print(cmd_ctx,"**STR9FLASH** (tap1) invalid chain?"); + return ERROR_OK; + } + tap2 = tap1->next_tap; + if (tap2 == NULL) + { + /* things are *WRONG* */ + command_print(cmd_ctx,"**STR9FLASH** (tap2) invalid chain?"); + return ERROR_OK; + } - str9xpec_set_instr(chain_pos+2, 0xD, TAP_RTI); - if ((retval=jtag_execute_queue())!=ERROR_OK) + /* enable turbo mode - TURBO-PROG-ENABLE */ + str9xpec_set_instr(tap2, 0xD, TAP_IDLE); + if ((retval = jtag_execute_queue()) != ERROR_OK) return retval; /* modify scan chain - str9 core has been removed */ - dev0 = jtag_get_device(chain_pos); - if (dev0 == NULL) - return ERROR_FAIL; - str9xpec_info->devarm = jtag_get_device(chain_pos+1); - dev2 = jtag_get_device(chain_pos+2); - if (dev2 == NULL) - return ERROR_FAIL; - dev0->next = dev2; - jtag_num_devices--; + tap1->enabled = 0; return ERROR_OK; } -int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *bank; - u32 chain_pos; - jtag_device_t* dev0; + jtag_tap_t *tap; str9xpec_flash_controller_t *str9xpec_info = NULL; if (argc < 1) @@ -1330,23 +1321,18 @@ int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ct } str9xpec_info = bank->driver_priv; + tap = str9xpec_info->tap; - chain_pos = str9xpec_info->chain_pos; - - dev0 = jtag_get_device(chain_pos); - if (dev0 == NULL) + if (tap == NULL) return ERROR_FAIL; - - /* exit turbo mode via TLR */ - str9xpec_set_instr(chain_pos, ISC_NOOP, TAP_TLR); + /* exit turbo mode via RESET */ + str9xpec_set_instr(tap, ISC_NOOP, TAP_RESET); jtag_execute_queue(); /* restore previous scan chain */ - if( str9xpec_info->devarm ) { - dev0->next = str9xpec_info->devarm; - jtag_num_devices++; - str9xpec_info->devarm = NULL; + if (tap->next_tap) { + tap->next_tap->enabled = 1; } return ERROR_OK;