X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fflash%2Favrf.c;h=692992f4cdede0932182f214417197d9fcf0c2e0;hb=833e7f5248778bcb31b4db1a1b91160995415203;hp=301ce2658c8bb9f48e0ab883788054f167e841d8;hpb=278ca633da5c7c2d1979129d7db912b1f4784d98;p=fw%2Fopenocd diff --git a/src/flash/avrf.c b/src/flash/avrf.c index 301ce2658..692992f4c 100644 --- a/src/flash/avrf.c +++ b/src/flash/avrf.c @@ -50,55 +50,27 @@ #define AVR_JTAG_REG_ProgrammingCommand_Len 15 #define AVR_JTAG_REG_FlashDataByte_Len 16 -avrf_type_t avft_chips_info[] = +struct avrf_type avft_chips_info[] = { // name, chip_id, flash_page_size, flash_page_num, eeprom_page_size, eeprom_page_num {"atmega128", 0x9702, 256, 512, 8, 512}, }; -static int avrf_register_commands(struct command_context_s *cmd_ctx); -static int avrf_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); -static int avrf_erase(struct flash_bank_s *bank, int first, int last); -static int avrf_protect(struct flash_bank_s *bank, int set, int first, int last); -static int avrf_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); -static int avrf_probe(struct flash_bank_s *bank); -static int avrf_auto_probe(struct flash_bank_s *bank); -//static int avrf_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int avrf_protect_check(struct flash_bank_s *bank); -static int avrf_info(struct flash_bank_s *bank, char *buf, int buf_size); - -static int avrf_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); - -extern int avr_jtag_sendinstr(jtag_tap_t *tap, u8 *ir_in, u8 ir_out); -extern int avr_jtag_senddat(jtag_tap_t *tap, u32 *dr_in, u32 dr_out, int len); - -extern int mcu_write_ir(jtag_tap_t *tap, u8 *ir_in, u8 *ir_out, int ir_len, int rti); -extern int mcu_write_dr(jtag_tap_t *tap, u8 *ir_in, u8 *ir_out, int dr_len, int rti); -extern int mcu_write_ir_u8(jtag_tap_t *tap, u8 *ir_in, u8 ir_out, int ir_len, int rti); -extern int mcu_write_dr_u8(jtag_tap_t *tap, u8 *ir_in, u8 ir_out, int dr_len, int rti); -extern int mcu_write_ir_u16(jtag_tap_t *tap, u16 *ir_in, u16 ir_out, int ir_len, int rti); -extern int mcu_write_dr_u16(jtag_tap_t *tap, u16 *ir_in, u16 ir_out, int dr_len, int rti); -extern int mcu_write_ir_u32(jtag_tap_t *tap, u32 *ir_in, u32 ir_out, int ir_len, int rti); -extern int mcu_write_dr_u32(jtag_tap_t *tap, u32 *ir_in, u32 ir_out, int dr_len, int rti); -extern int mcu_execute_queue(void); - -flash_driver_t avr_flash = -{ - .name = "avr", - .register_commands = avrf_register_commands, - .flash_bank_command = avrf_flash_bank_command, - .erase = avrf_erase, - .protect = avrf_protect, - .write = avrf_write, - .probe = avrf_probe, - .auto_probe = avrf_auto_probe, - .erase_check = default_flash_mem_blank_check, - .protect_check = avrf_protect_check, - .info = avrf_info -}; +int avr_jtag_sendinstr(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out); +int avr_jtag_senddat(struct jtag_tap *tap, uint32_t *dr_in, uint32_t dr_out, int len); + +int mcu_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti); +int mcu_write_dr(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out, int dr_len, int rti); +int mcu_write_ir_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti); +int mcu_write_dr_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int dr_len, int rti); +int mcu_write_ir_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti); +int mcu_write_dr_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int dr_len, int rti); +int mcu_write_ir_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti); +int mcu_write_dr_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int dr_len, int rti); +int mcu_execute_queue(void); /* avr program functions */ -static int avr_jtag_reset(avr_common_t *avr, u32 reset) +static int avr_jtag_reset(struct avr_common *avr, uint32_t reset) { avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_AVR_RESET); avr_jtag_senddat(avr->jtag_info.tap, NULL, reset ,AVR_JTAG_REG_Reset_Len); @@ -106,7 +78,7 @@ static int avr_jtag_reset(avr_common_t *avr, u32 reset) return ERROR_OK; } -static int avr_jtag_read_jtagid(avr_common_t *avr, u32 *id) +static int avr_jtag_read_jtagid(struct avr_common *avr, uint32_t *id) { avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_IDCODE); avr_jtag_senddat(avr->jtag_info.tap, id, 0, AVR_JTAG_REG_JTAGID_Len); @@ -114,7 +86,7 @@ static int avr_jtag_read_jtagid(avr_common_t *avr, u32 *id) return ERROR_OK; } -static int avr_jtagprg_enterprogmode(avr_common_t *avr) +static int avr_jtagprg_enterprogmode(struct avr_common *avr) { avr_jtag_reset(avr, 1); @@ -124,7 +96,7 @@ static int avr_jtagprg_enterprogmode(avr_common_t *avr) return ERROR_OK; } -static int avr_jtagprg_leaveprogmode(avr_common_t *avr) +static int avr_jtagprg_leaveprogmode(struct avr_common *avr) { avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_COMMANDS); avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x2300, AVR_JTAG_REG_ProgrammingCommand_Len); @@ -138,9 +110,9 @@ static int avr_jtagprg_leaveprogmode(avr_common_t *avr) return ERROR_OK; } -static int avr_jtagprg_chiperase(avr_common_t *avr) +static int avr_jtagprg_chiperase(struct avr_common *avr) { - u32 poll_value; + uint32_t poll_value; avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_COMMANDS); avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x2380, AVR_JTAG_REG_ProgrammingCommand_Len); @@ -148,22 +120,22 @@ static int avr_jtagprg_chiperase(avr_common_t *avr) avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x3380, AVR_JTAG_REG_ProgrammingCommand_Len); avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x3380, AVR_JTAG_REG_ProgrammingCommand_Len); - do{ + do { poll_value = 0; avr_jtag_senddat(avr->jtag_info.tap, &poll_value, 0x3380, AVR_JTAG_REG_ProgrammingCommand_Len); if (ERROR_OK != mcu_execute_queue()) { return ERROR_FAIL; } - LOG_DEBUG("poll_value = 0x%04X", poll_value); - }while(!(poll_value & 0x0200)); + LOG_DEBUG("poll_value = 0x%04" PRIx32 "", poll_value); + } while (!(poll_value & 0x0200)); return ERROR_OK; } -static int avr_jtagprg_writeflashpage(avr_common_t *avr, u8 *page_buf, u32 buf_size, u32 addr, u32 page_size) +static int avr_jtagprg_writeflashpage(struct avr_common *avr, uint8_t *page_buf, uint32_t buf_size, uint32_t addr, uint32_t page_size) { - u32 i, poll_value; + uint32_t i, poll_value; avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_COMMANDS); avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x2310, AVR_JTAG_REG_ProgrammingCommand_Len); @@ -195,41 +167,30 @@ static int avr_jtagprg_writeflashpage(avr_common_t *avr, u8 *page_buf, u32 buf_s avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x3700, AVR_JTAG_REG_ProgrammingCommand_Len); avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x3700, AVR_JTAG_REG_ProgrammingCommand_Len); - do{ + do { poll_value = 0; avr_jtag_senddat(avr->jtag_info.tap, &poll_value, 0x3700, AVR_JTAG_REG_ProgrammingCommand_Len); if (ERROR_OK != mcu_execute_queue()) { return ERROR_FAIL; } - LOG_DEBUG("poll_value = 0x%04X", poll_value); - }while(!(poll_value & 0x0200)); - - return ERROR_OK; -} - -/* interface command */ -static int avrf_register_commands(struct command_context_s *cmd_ctx) -{ - command_t *avr_cmd = register_command(cmd_ctx, NULL, "avr", NULL, COMMAND_ANY, "avr flash specific commands"); - - register_command(cmd_ctx, avr_cmd, "mass_erase", avrf_handle_mass_erase_command, COMMAND_EXEC, - "mass erase device"); + LOG_DEBUG("poll_value = 0x%04" PRIx32 "", poll_value); + } while (!(poll_value & 0x0200)); return ERROR_OK; } -static int avrf_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) +FLASH_BANK_COMMAND_HANDLER(avrf_flash_bank_command) { - avrf_flash_bank_t *avrf_info; + struct avrf_flash_bank *avrf_info; - if (argc < 6) + if (CMD_ARGC < 6) { LOG_WARNING("incomplete flash_bank avr configuration"); return ERROR_FLASH_BANK_INVALID; } - avrf_info = malloc(sizeof(avrf_flash_bank_t)); + avrf_info = malloc(sizeof(struct avrf_flash_bank)); bank->driver_priv = avrf_info; avrf_info->probed = 0; @@ -237,23 +198,23 @@ static int avrf_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, return ERROR_OK; } -static int avrf_erase(struct flash_bank_s *bank, int first, int last) +static int avrf_erase(struct flash_bank *bank, int first, int last) { LOG_INFO("%s", __FUNCTION__); return ERROR_OK; } -static int avrf_protect(struct flash_bank_s *bank, int set, int first, int last) +static int avrf_protect(struct flash_bank *bank, int set, int first, int last) { LOG_INFO("%s", __FUNCTION__); return ERROR_OK; } -static int avrf_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int avrf_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count) { - target_t *target = bank->target; - avr_common_t *avr = target->arch_info; - u32 cur_size, cur_buffer_size, page_size; + struct target *target = bank->target; + struct avr_common *avr = target->arch_info; + uint32_t cur_size, cur_buffer_size, page_size; if (bank->target->state != TARGET_HALTED) { @@ -264,12 +225,12 @@ static int avrf_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou page_size = bank->sectors[0].size; if ((offset % page_size) != 0) { - LOG_WARNING("offset 0x%x breaks required %d-byte alignment", offset, page_size); + LOG_WARNING("offset 0x%" PRIx32 " breaks required %" PRIu32 "-byte alignment", offset, page_size); return ERROR_FLASH_DST_BREAKS_ALIGNMENT; } - LOG_DEBUG("offset is 0x%08X", offset); - LOG_DEBUG("count is %d", count); + LOG_DEBUG("offset is 0x%08" PRIx32 "", offset); + LOG_DEBUG("count is %" PRId32 "", count); if (ERROR_OK != avr_jtagprg_enterprogmode(avr)) { @@ -277,7 +238,7 @@ static int avrf_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou } cur_size = 0; - while(count > 0) + while (count > 0) { if (count > page_size) { @@ -300,14 +261,14 @@ static int avrf_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou #define EXTRACT_MFG(X) (((X) & 0xffe) >> 1) #define EXTRACT_PART(X) (((X) & 0xffff000) >> 12) #define EXTRACT_VER(X) (((X) & 0xf0000000) >> 28) -static int avrf_probe(struct flash_bank_s *bank) +static int avrf_probe(struct flash_bank *bank) { - target_t *target = bank->target; - avrf_flash_bank_t *avrf_info = bank->driver_priv; - avr_common_t *avr = target->arch_info; - avrf_type_t *avr_info = NULL; + struct target *target = bank->target; + struct avrf_flash_bank *avrf_info = bank->driver_priv; + struct avr_common *avr = target->arch_info; + struct avrf_type *avr_info = NULL; int i; - u32 device_id; + uint32_t device_id; if (bank->target->state != TARGET_HALTED) { @@ -323,10 +284,10 @@ static int avrf_probe(struct flash_bank_s *bank) return ERROR_FAIL; } - LOG_INFO( "device id = 0x%08x", device_id ); + LOG_INFO("device id = 0x%08" PRIx32 "", device_id); if (EXTRACT_MFG(device_id) != 0x1F) { - LOG_ERROR("0x%X is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F); + LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F); } for (i = 0; i < (int)(sizeof(avft_chips_info) / sizeof(avft_chips_info[0])); i++) @@ -345,7 +306,7 @@ static int avrf_probe(struct flash_bank_s *bank) bank->base = 0x00000000; bank->size = (avr_info->flash_page_size * avr_info->flash_page_num); bank->num_sectors = avr_info->flash_page_num; - bank->sectors = malloc(sizeof(flash_sector_t) * avr_info->flash_page_num); + bank->sectors = malloc(sizeof(struct flash_sector) * avr_info->flash_page_num); for (i = 0; i < avr_info->flash_page_num; i++) { @@ -361,34 +322,34 @@ static int avrf_probe(struct flash_bank_s *bank) else { // chip not supported - LOG_ERROR("0x%X is not support for avr", EXTRACT_PART(device_id)); + LOG_ERROR("0x%" PRIx32 " is not support for avr", EXTRACT_PART(device_id)); avrf_info->probed = 1; return ERROR_FAIL; } } -static int avrf_auto_probe(struct flash_bank_s *bank) +static int avrf_auto_probe(struct flash_bank *bank) { - avrf_flash_bank_t *avrf_info = bank->driver_priv; + struct avrf_flash_bank *avrf_info = bank->driver_priv; if (avrf_info->probed) return ERROR_OK; return avrf_probe(bank); } -static int avrf_protect_check(struct flash_bank_s *bank) +static int avrf_protect_check(struct flash_bank *bank) { LOG_INFO("%s", __FUNCTION__); return ERROR_OK; } -static int avrf_info(struct flash_bank_s *bank, char *buf, int buf_size) +static int avrf_info(struct flash_bank *bank, char *buf, int buf_size) { - target_t *target = bank->target; - avr_common_t *avr = target->arch_info; - avrf_type_t *avr_info = NULL; + struct target *target = bank->target; + struct avr_common *avr = target->arch_info; + struct avrf_type *avr_info = NULL; int i; - u32 device_id; + uint32_t device_id; if (bank->target->state != TARGET_HALTED) { @@ -402,10 +363,10 @@ static int avrf_info(struct flash_bank_s *bank, char *buf, int buf_size) return ERROR_FAIL; } - LOG_INFO( "device id = 0x%08x", device_id ); + LOG_INFO("device id = 0x%08" PRIx32 "", device_id); if (EXTRACT_MFG(device_id) != 0x1F) { - LOG_ERROR("0x%X is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F); + LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F); } for (i = 0; i < (int)(sizeof(avft_chips_info) / sizeof(avft_chips_info[0])); i++) @@ -422,7 +383,7 @@ static int avrf_info(struct flash_bank_s *bank, char *buf, int buf_size) if (avr_info != NULL) { // chip found - snprintf(buf, buf_size, "%s - Rev: 0x%X", avr_info->name, EXTRACT_VER(device_id)); + snprintf(buf, buf_size, "%s - Rev: 0x%" PRIx32 "", avr_info->name, EXTRACT_VER(device_id)); return ERROR_OK; } else @@ -433,10 +394,10 @@ static int avrf_info(struct flash_bank_s *bank, char *buf, int buf_size) } } -static int avrf_mass_erase(struct flash_bank_s *bank) +static int avrf_mass_erase(struct flash_bank *bank) { - target_t *target = bank->target; - avr_common_t *avr = target->arch_info; + struct target *target = bank->target; + struct avr_common *avr = target->arch_info; if (target->state != TARGET_HALTED) { @@ -454,23 +415,20 @@ static int avrf_mass_erase(struct flash_bank_s *bank) return ERROR_OK; } -static int avrf_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(avrf_handle_mass_erase_command) { - flash_bank_t *bank; int i; - if (argc < 1) + if (CMD_ARGC < 1) { - command_print(cmd_ctx, "avr mass_erase "); + command_print(CMD_CTX, "avr mass_erase "); 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; - } + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); + if (ERROR_OK != retval) + return retval; if (avrf_mass_erase(bank) == ERROR_OK) { @@ -480,13 +438,39 @@ static int avrf_handle_mass_erase_command(struct command_context_s *cmd_ctx, cha bank->sectors[i].is_erased = 1; } - command_print(cmd_ctx, "avr mass erase complete"); + command_print(CMD_CTX, "avr mass erase complete"); } else { - command_print(cmd_ctx, "avr mass erase failed"); + command_print(CMD_CTX, "avr mass erase failed"); } LOG_DEBUG("%s", __FUNCTION__); return ERROR_OK; } + +static int avrf_register_commands(struct command_context *cmd_ctx) +{ + struct command *avr_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "avr", + NULL, COMMAND_ANY, "avr flash specific commands"); + + COMMAND_REGISTER(cmd_ctx, avr_cmd, "mass_erase", + avrf_handle_mass_erase_command, COMMAND_EXEC, + "mass erase device"); + + return ERROR_OK; +} + +struct flash_driver avr_flash = { + .name = "avr", + .register_commands = &avrf_register_commands, + .flash_bank_command = &avrf_flash_bank_command, + .erase = &avrf_erase, + .protect = &avrf_protect, + .write = &avrf_write, + .probe = &avrf_probe, + .auto_probe = &avrf_auto_probe, + .erase_check = &default_flash_mem_blank_check, + .protect_check = &avrf_protect_check, + .info = &avrf_info, + };