X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstr9xpec.c;h=ad51cf191eb555fa84362b216247bccd39673400;hp=1ea81763bfee102d1745478754f3b8c567430176;hb=8012b3963fc49c7edf87f31a93bc0039095f5b59;hpb=278ca633da5c7c2d1979129d7db912b1f4784d98 diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c index 1ea81763bf..ad51cf191e 100644 --- a/src/flash/str9xpec.c +++ b/src/flash/str9xpec.c @@ -28,86 +28,19 @@ #include "arm7_9_common.h" -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_set_address(struct flash_bank_s *bank, uint8_t 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 = -{ - .name = "str9xpec", - .register_commands = str9xpec_register_commands, - .flash_bank_command = str9xpec_flash_bank_command, - .erase = str9xpec_erase, - .protect = str9xpec_protect, - .write = str9xpec_write, - .probe = str9xpec_probe, - .auto_probe = str9xpec_probe, - .erase_check = str9xpec_erase_check, - .protect_check = str9xpec_protect_check, - .info = str9xpec_info -}; - -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"); - - register_command(cmd_ctx, str9xpec_cmd, "enable_turbo", str9xpec_handle_flash_enable_turbo_command, COMMAND_EXEC, - "enable str9xpec turbo mode"); - register_command(cmd_ctx, str9xpec_cmd, "disable_turbo", str9xpec_handle_flash_disable_turbo_command, COMMAND_EXEC, - "disable str9xpec turbo mode"); - register_command(cmd_ctx, str9xpec_cmd, "options_cmap", str9xpec_handle_flash_options_cmap_command, COMMAND_EXEC, - "configure str9xpec boot sector"); - register_command(cmd_ctx, str9xpec_cmd, "options_lvdthd", str9xpec_handle_flash_options_lvdthd_command, COMMAND_EXEC, - "configure str9xpec lvd threshold"); - register_command(cmd_ctx, str9xpec_cmd, "options_lvdsel", str9xpec_handle_flash_options_lvdsel_command, COMMAND_EXEC, - "configure str9xpec lvd selection"); - register_command(cmd_ctx, str9xpec_cmd, "options_lvdwarn", str9xpec_handle_flash_options_lvdwarn_command, COMMAND_EXEC, - "configure str9xpec lvd warning"); - register_command(cmd_ctx, str9xpec_cmd, "options_read", str9xpec_handle_flash_options_read_command, COMMAND_EXEC, - "read str9xpec options"); - register_command(cmd_ctx, str9xpec_cmd, "options_write", str9xpec_handle_flash_options_write_command, COMMAND_EXEC, - "write str9xpec options"); - register_command(cmd_ctx, str9xpec_cmd, "lock", str9xpec_handle_flash_lock_command, COMMAND_EXEC, - "lock str9xpec device"); - register_command(cmd_ctx, str9xpec_cmd, "unlock", str9xpec_handle_flash_unlock_command, COMMAND_EXEC, - "unlock str9xpec device"); - register_command(cmd_ctx, str9xpec_cmd, "part_id", str9xpec_handle_part_id_command, COMMAND_EXEC, - "print part id of str9xpec flash bank "); - - return ERROR_OK; -} - -int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state) +int str9xpec_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_state_t end_state) { - if( tap == NULL ){ + if (tap == NULL) { return ERROR_TARGET_INVALID; } if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) { - scan_field_t field; + struct scan_field field; field.tap = tap; field.num_bits = tap->ir_length; @@ -123,10 +56,10 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state) return ERROR_OK; } -static u8 str9xpec_isc_status(jtag_tap_t *tap) +static uint8_t str9xpec_isc_status(struct jtag_tap *tap) { - scan_field_t field; - u8 status; + struct scan_field field; + uint8_t status; if (str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE) != ERROR_OK) return ISC_STATUS_ERROR; @@ -137,7 +70,7 @@ static u8 str9xpec_isc_status(jtag_tap_t *tap) field.in_value = &status; - jtag_add_dr_scan(1, &field, TAP_IDLE); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE)); jtag_execute_queue(); LOG_DEBUG("status: 0x%2.2x", status); @@ -150,9 +83,9 @@ static u8 str9xpec_isc_status(jtag_tap_t *tap) static int str9xpec_isc_enable(struct flash_bank_s *bank) { - u8 status; - jtag_tap_t *tap; - str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; + uint8_t status; + struct jtag_tap *tap; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; tap = str9xpec_info->tap; @@ -177,9 +110,9 @@ static int str9xpec_isc_enable(struct flash_bank_s *bank) static int str9xpec_isc_disable(struct flash_bank_s *bank) { - u8 status; - jtag_tap_t *tap; - str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; + uint8_t status; + struct jtag_tap *tap; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; tap = str9xpec_info->tap; @@ -206,11 +139,11 @@ static int str9xpec_isc_disable(struct flash_bank_s *bank) static int str9xpec_read_config(struct flash_bank_s *bank) { - scan_field_t field; - u8 status; - jtag_tap_t *tap; + struct scan_field field; + uint8_t status; + struct jtag_tap *tap; - str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; tap = str9xpec_info->tap; @@ -225,7 +158,7 @@ static int str9xpec_read_config(struct flash_bank_s *bank) field.in_value = str9xpec_info->options; - jtag_add_dr_scan(1, &field, TAP_IDLE); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE)); jtag_execute_queue(); status = str9xpec_isc_status(tap); @@ -235,12 +168,12 @@ static int str9xpec_read_config(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; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; int i; int num_sectors; int b0_sectors = 0, b1_sectors = 0; - u32 offset = 0; + uint32_t offset = 0; int b1_size = 0x2000; switch (bank->size) @@ -272,8 +205,8 @@ static int str9xpec_build_block_list(struct flash_bank_s *bank) num_sectors = b0_sectors + b1_sectors; bank->num_sectors = num_sectors; - bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors); - str9xpec_info->sector_bits = malloc(sizeof(u32) * num_sectors); + bank->sectors = malloc(sizeof(struct flash_sector) * num_sectors); + str9xpec_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors); num_sectors = 0; @@ -302,11 +235,11 @@ static int str9xpec_build_block_list(struct flash_bank_s *bank) /* flash bank str9x 0 0 */ -static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) +FLASH_BANK_COMMAND_HANDLER(str9xpec_flash_bank_command) { - str9xpec_flash_controller_t *str9xpec_info; + struct str9xpec_flash_controller *str9xpec_info; armv4_5_common_t *armv4_5 = NULL; - arm7_9_common_t *arm7_9 = NULL; + struct arm7_9_common *arm7_9 = NULL; arm_jtag_t *jtag_info = NULL; if (argc < 6) @@ -315,17 +248,17 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char * return ERROR_FLASH_BANK_INVALID; } - str9xpec_info = malloc(sizeof(str9xpec_flash_controller_t)); + str9xpec_info = malloc(sizeof(struct str9xpec_flash_controller)); 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_TapByAbsPosition( jtag_info->tap->abs_chain_position - 1); + str9xpec_info->tap = bank->target->tap; str9xpec_info->isc_enable = 0; str9xpec_build_block_list(bank); @@ -338,18 +271,18 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char * static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) { - scan_field_t field; - u8 status; - jtag_tap_t *tap; + struct scan_field field; + uint8_t status; + struct jtag_tap *tap; int i; - u8 *buffer = NULL; + uint8_t *buffer = NULL; - str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { - str9xpec_isc_enable( bank ); + str9xpec_isc_enable(bank); } if (!str9xpec_info->isc_enable) { @@ -372,7 +305,7 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) field.out_value = buffer; field.in_value = NULL; - jtag_add_dr_scan(1, &field, TAP_IDLE); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE)); jtag_add_sleep(40000); /* read blank check result */ @@ -405,10 +338,10 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last) static int str9xpec_protect_check(struct flash_bank_s *bank) { - u8 status; + uint8_t status; int i; - str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; status = str9xpec_read_config(bank); @@ -427,18 +360,18 @@ static int str9xpec_protect_check(struct flash_bank_s *bank) static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last) { - scan_field_t field; - u8 status; - jtag_tap_t *tap; + struct scan_field field; + uint8_t status; + struct jtag_tap *tap; int i; - u8 *buffer = NULL; + uint8_t *buffer = NULL; - str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { - str9xpec_isc_enable( bank ); + str9xpec_isc_enable(bank); } if (!str9xpec_info->isc_enable) { @@ -478,7 +411,7 @@ static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last) field.out_value = buffer; field.in_value = NULL; - jtag_add_dr_scan(1, &field, TAP_IDLE); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE)); jtag_execute_queue(); jtag_add_sleep(10); @@ -509,16 +442,16 @@ static int str9xpec_erase(struct flash_bank_s *bank, int first, int last) static int str9xpec_lock_device(struct flash_bank_s *bank) { - scan_field_t field; - u8 status; - jtag_tap_t *tap; - str9xpec_flash_controller_t *str9xpec_info = NULL; + struct scan_field field; + uint8_t status; + struct jtag_tap *tap; + struct str9xpec_flash_controller *str9xpec_info = NULL; str9xpec_info = bank->driver_priv; tap = str9xpec_info->tap; if (!str9xpec_info->isc_enable) { - str9xpec_isc_enable( bank ); + str9xpec_isc_enable(bank); } if (!str9xpec_info->isc_enable) { @@ -539,10 +472,10 @@ static int str9xpec_lock_device(struct flash_bank_s *bank) field.out_value = NULL; field.in_value = &status; - jtag_add_dr_scan(1, &field, TAP_INVALID); + jtag_add_dr_scan(1, &field, jtag_get_end_state()); jtag_execute_queue(); - } while(!(status & ISC_STATUS_BUSY)); + } while (!(status & ISC_STATUS_BUSY)); str9xpec_isc_disable(bank); @@ -551,7 +484,7 @@ static int str9xpec_lock_device(struct flash_bank_s *bank) static int str9xpec_unlock_device(struct flash_bank_s *bank) { - u8 status; + uint8_t status; status = str9xpec_erase_area(bank, 0, 255); @@ -560,10 +493,10 @@ static int str9xpec_unlock_device(struct flash_bank_s *bank) static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last) { - u8 status; + uint8_t status; int i; - str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; status = str9xpec_read_config(bank); @@ -575,7 +508,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 +522,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); @@ -604,11 +537,11 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l return ERROR_OK; } -static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector) +static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector) { - jtag_tap_t *tap; - scan_field_t field; - str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; + struct jtag_tap *tap; + struct scan_field field; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; tap = str9xpec_info->tap; @@ -620,22 +553,22 @@ static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector) field.out_value = §or; field.in_value = NULL; - jtag_add_dr_scan(1, &field, TAP_INVALID); + jtag_add_dr_scan(1, &field, jtag_get_end_state()); return ERROR_OK; } -static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count) { - str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv; - u32 dwords_remaining = (count / 8); - u32 bytes_remaining = (count & 0x00000007); - u32 bytes_written = 0; - u8 status; - u32 check_address = offset; - jtag_tap_t *tap; - scan_field_t field; - u8 *scanbuf; + struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv; + uint32_t dwords_remaining = (count / 8); + uint32_t bytes_remaining = (count & 0x00000007); + uint32_t bytes_written = 0; + uint8_t status; + uint32_t check_address = offset; + struct jtag_tap *tap; + struct scan_field field; + uint8_t *scanbuf; int i; int first_sector = 0; int last_sector = 0; @@ -652,14 +585,14 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 if (offset & 0x7) { - LOG_WARNING("offset 0x%x breaks required 8-byte alignment", offset); + LOG_WARNING("offset 0x%" PRIx32 " breaks required 8-byte alignment", offset); return ERROR_FLASH_DST_BREAKS_ALIGNMENT; } for (i = 0; i < bank->num_sectors; i++) { - u32 sec_start = bank->sectors[i].offset; - u32 sec_end = sec_start + bank->sectors[i].size; + uint32_t sec_start = bank->sectors[i].offset; + uint32_t sec_end = sec_start + bank->sectors[i].size; /* check if destination falls within the current sector */ if ((check_address >= sec_start) && (check_address < sec_end)) @@ -671,11 +604,11 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 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; } } @@ -704,7 +637,7 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 field.out_value = (buffer + bytes_written); field.in_value = NULL; - jtag_add_dr_scan(1, &field, TAP_IDLE); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE)); /* small delay before polling */ jtag_add_sleep(50); @@ -717,12 +650,12 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 field.out_value = NULL; field.in_value = scanbuf; - jtag_add_dr_scan(1, &field, TAP_INVALID); + jtag_add_dr_scan(1, &field, jtag_get_end_state()); jtag_execute_queue(); status = buf_get_u32(scanbuf, 0, 8); - } while(!(status & ISC_STATUS_BUSY)); + } while (!(status & ISC_STATUS_BUSY)); if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS) return ERROR_FLASH_OPERATION_FAILED; @@ -737,10 +670,10 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 if (bytes_remaining) { - u8 last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; int i = 0; - while(bytes_remaining > 0) + while (bytes_remaining > 0) { last_dword[i++] = *(buffer + bytes_written); bytes_remaining--; @@ -754,7 +687,7 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 field.out_value = last_dword; field.in_value = NULL; - jtag_add_dr_scan(1, &field, TAP_IDLE); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE)); /* small delay before polling */ jtag_add_sleep(50); @@ -767,12 +700,12 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 field.out_value = NULL; field.in_value = scanbuf; - jtag_add_dr_scan(1, &field, TAP_INVALID); + jtag_add_dr_scan(1, &field, jtag_get_end_state()); jtag_execute_queue(); status = buf_get_u32(scanbuf, 0, 8); - } while(!(status & ISC_STATUS_BUSY)); + } while (!(status & ISC_STATUS_BUSY)); if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS) return ERROR_FLASH_OPERATION_FAILED; @@ -793,26 +726,21 @@ static int str9xpec_probe(struct flash_bank_s *bank) return ERROR_OK; } -static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_part_id_command) { - flash_bank_t *bank; - scan_field_t field; - u8 *buffer = NULL; - jtag_tap_t *tap; - u32 idcode; - str9xpec_flash_controller_t *str9xpec_info = NULL; + struct scan_field field; + uint8_t *buffer = NULL; + struct jtag_tap *tap; + uint32_t idcode; + struct str9xpec_flash_controller *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; @@ -826,12 +754,12 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch field.out_value = NULL; field.in_value = buffer; - jtag_add_dr_scan(1, &field, TAP_IDLE); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE)); jtag_execute_queue(); idcode = buf_get_u32(buffer, 0, 32); - command_print(cmd_ctx, "str9xpec part id: 0x%8.8x", idcode); + command_print(cmd_ctx, "str9xpec part id: 0x%8.8" PRIx32 "", idcode); free(buffer); @@ -845,15 +773,14 @@ 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) +COMMAND_HANDLER(str9xpec_handle_flash_options_read_command) { - flash_bank_t *bank; - u8 status; - str9xpec_flash_controller_t *str9xpec_info = NULL; + uint8_t status; + struct str9xpec_flash_controller *str9xpec_info = NULL; if (argc < 1) { @@ -861,12 +788,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; @@ -910,22 +835,22 @@ static int str9xpec_handle_flash_options_read_command(struct command_context_s * static int str9xpec_write_options(struct flash_bank_s *bank) { - scan_field_t field; - u8 status; - jtag_tap_t *tap; - str9xpec_flash_controller_t *str9xpec_info = NULL; + struct scan_field field; + uint8_t status; + struct jtag_tap *tap; + struct str9xpec_flash_controller *str9xpec_info = NULL; str9xpec_info = bank->driver_priv; 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) { @@ -946,7 +871,7 @@ static int str9xpec_write_options(struct flash_bank_s *bank) field.out_value = str9xpec_info->options; field.in_value = NULL; - jtag_add_dr_scan(1, &field, TAP_IDLE); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE)); /* small delay before polling */ jtag_add_sleep(50); @@ -959,20 +884,19 @@ static int str9xpec_write_options(struct flash_bank_s *bank) field.out_value = NULL; field.in_value = &status; - jtag_add_dr_scan(1, &field, TAP_INVALID); + jtag_add_dr_scan(1, &field, jtag_get_end_state()); jtag_execute_queue(); - } while(!(status & ISC_STATUS_BUSY)); + } while (!(status & ISC_STATUS_BUSY)); str9xpec_isc_disable(bank); return status; } -static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_flash_options_write_command) { - flash_bank_t *bank; - u8 status; + uint8_t status; if (argc < 1) { @@ -980,12 +904,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); @@ -995,23 +917,20 @@ static int str9xpec_handle_flash_options_write_command(struct command_context_s return ERROR_OK; } -static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_flash_options_cmap_command) { - flash_bank_t *bank; - str9xpec_flash_controller_t *str9xpec_info = NULL; + struct str9xpec_flash_controller *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; @@ -1027,23 +946,20 @@ static int str9xpec_handle_flash_options_cmap_command(struct command_context_s * return ERROR_OK; } -static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_flash_options_lvdthd_command) { - flash_bank_t *bank; - str9xpec_flash_controller_t *str9xpec_info = NULL; + struct str9xpec_flash_controller *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; @@ -1059,23 +975,20 @@ static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s return ERROR_OK; } -int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_flash_options_lvdsel_command) { - flash_bank_t *bank; - str9xpec_flash_controller_t *str9xpec_info = NULL; + struct str9xpec_flash_controller *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; @@ -1091,23 +1004,20 @@ int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_c return ERROR_OK; } -static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_flash_options_lvdwarn_command) { - flash_bank_t *bank; - str9xpec_flash_controller_t *str9xpec_info = NULL; + struct str9xpec_flash_controller *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; @@ -1123,10 +1033,9 @@ static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_ return ERROR_OK; } -static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_flash_lock_command) { - u8 status; - flash_bank_t *bank; + uint8_t status; if (argc < 1) { @@ -1134,12 +1043,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); @@ -1149,10 +1056,9 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, return ERROR_OK; } -static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_flash_unlock_command) { - u8 status; - flash_bank_t *bank; + uint8_t status; if (argc < 1) { @@ -1160,12 +1066,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); @@ -1175,14 +1079,12 @@ static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ct return ERROR_OK; } -static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_flash_enable_turbo_command) { - int retval; - flash_bank_t *bank; - jtag_tap_t *tap0; - jtag_tap_t *tap1; - jtag_tap_t *tap2; - str9xpec_flash_controller_t *str9xpec_info = NULL; + struct jtag_tap *tap0; + struct jtag_tap *tap1; + struct jtag_tap *tap2; + struct str9xpec_flash_controller *str9xpec_info = NULL; if (argc < 1) { @@ -1190,12 +1092,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; @@ -1228,11 +1128,10 @@ static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s * return ERROR_OK; } -static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(str9xpec_handle_flash_disable_turbo_command) { - flash_bank_t *bank; - jtag_tap_t *tap; - str9xpec_flash_controller_t *str9xpec_info = NULL; + struct jtag_tap *tap; + struct str9xpec_flash_controller *str9xpec_info = NULL; if (argc < 1) { @@ -1240,12 +1139,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 +1151,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 */ @@ -1264,3 +1162,59 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s return ERROR_OK; } + +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"); + + register_command(cmd_ctx, str9xpec_cmd, "enable_turbo", + str9xpec_handle_flash_enable_turbo_command, + COMMAND_EXEC, "enable str9xpec turbo mode"); + register_command(cmd_ctx, str9xpec_cmd, "disable_turbo", + str9xpec_handle_flash_disable_turbo_command, + COMMAND_EXEC, "disable str9xpec turbo mode"); + register_command(cmd_ctx, str9xpec_cmd, "options_cmap", + str9xpec_handle_flash_options_cmap_command, + COMMAND_EXEC, "configure str9xpec boot sector"); + register_command(cmd_ctx, str9xpec_cmd, "options_lvdthd", + str9xpec_handle_flash_options_lvdthd_command, + COMMAND_EXEC, "configure str9xpec lvd threshold"); + register_command(cmd_ctx, str9xpec_cmd, "options_lvdsel", + str9xpec_handle_flash_options_lvdsel_command, + COMMAND_EXEC, "configure str9xpec lvd selection"); + register_command(cmd_ctx, str9xpec_cmd, "options_lvdwarn", + str9xpec_handle_flash_options_lvdwarn_command, + COMMAND_EXEC, "configure str9xpec lvd warning"); + register_command(cmd_ctx, str9xpec_cmd, "options_read", + str9xpec_handle_flash_options_read_command, + COMMAND_EXEC, "read str9xpec options"); + register_command(cmd_ctx, str9xpec_cmd, "options_write", + str9xpec_handle_flash_options_write_command, + COMMAND_EXEC, "write str9xpec options"); + register_command(cmd_ctx, str9xpec_cmd, "lock", + str9xpec_handle_flash_lock_command, + COMMAND_EXEC, "lock str9xpec device"); + register_command(cmd_ctx, str9xpec_cmd, "unlock", + str9xpec_handle_flash_unlock_command, + COMMAND_EXEC, "unlock str9xpec device"); + register_command(cmd_ctx, str9xpec_cmd, "part_id", + str9xpec_handle_part_id_command, + COMMAND_EXEC, "print part id of str9xpec flash bank "); + + return ERROR_OK; +} + +struct flash_driver str9xpec_flash = { + .name = "str9xpec", + .register_commands = &str9xpec_register_commands, + .flash_bank_command = &str9xpec_flash_bank_command, + .erase = &str9xpec_erase, + .protect = &str9xpec_protect, + .write = &str9xpec_write, + .probe = &str9xpec_probe, + .auto_probe = &str9xpec_probe, + .erase_check = &str9xpec_erase_check, + .protect_check = &str9xpec_protect_check, + .info = &str9xpec_info, + };