X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Favrf.c;h=356c404924a67e483c9c4682838f721101b5c2ae;hb=73c6e3bb18326050acc8908b561443a7b37549bb;hp=8dd43398cb8f717310fafec956f8ea297924af86;hpb=632fd663a821047df9a9b965ec1c35d6b034ebba;p=openocd.git diff --git a/src/flash/avrf.c b/src/flash/avrf.c index 8dd43398cb..356c404924 100644 --- a/src/flash/avrf.c +++ b/src/flash/avrf.c @@ -70,7 +70,7 @@ int mcu_write_dr_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int int mcu_execute_queue(void); /* avr program functions */ -static int avr_jtag_reset(avr_common_t *avr, uint32_t 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); @@ -78,7 +78,7 @@ static int avr_jtag_reset(avr_common_t *avr, uint32_t reset) return ERROR_OK; } -static int avr_jtag_read_jtagid(avr_common_t *avr, uint32_t *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); @@ -86,7 +86,7 @@ static int avr_jtag_read_jtagid(avr_common_t *avr, uint32_t *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); @@ -96,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); @@ -110,7 +110,7 @@ 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) { uint32_t poll_value; @@ -133,7 +133,7 @@ static int avr_jtagprg_chiperase(avr_common_t *avr) return ERROR_OK; } -static int avr_jtagprg_writeflashpage(avr_common_t *avr, uint8_t *page_buf, uint32_t buf_size, uint32_t addr, uint32_t 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) { uint32_t i, poll_value; @@ -184,7 +184,7 @@ FLASH_BANK_COMMAND_HANDLER(avrf_flash_bank_command) { 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; @@ -198,22 +198,22 @@ FLASH_BANK_COMMAND_HANDLER(avrf_flash_bank_command) 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, uint8_t *buffer, uint32_t offset, uint32_t 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; + 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) @@ -261,11 +261,11 @@ static int avrf_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offse #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; + struct target *target = bank->target; struct avrf_flash_bank *avrf_info = bank->driver_priv; - avr_common_t *avr = target->arch_info; + struct avr_common *avr = target->arch_info; struct avrf_type *avr_info = NULL; int i; uint32_t device_id; @@ -329,7 +329,7 @@ static int avrf_probe(struct flash_bank_s *bank) } } -static int avrf_auto_probe(struct flash_bank_s *bank) +static int avrf_auto_probe(struct flash_bank *bank) { struct avrf_flash_bank *avrf_info = bank->driver_priv; if (avrf_info->probed) @@ -337,16 +337,16 @@ static int avrf_auto_probe(struct flash_bank_s *bank) 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; + struct target *target = bank->target; + struct avr_common *avr = target->arch_info; struct avrf_type *avr_info = NULL; int i; uint32_t device_id; @@ -394,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) { @@ -419,14 +419,14 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command) { 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; } - flash_bank_t *bank; - int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); if (ERROR_OK != retval) return retval; @@ -438,20 +438,20 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command) 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_s *cmd_ctx) +static int avrf_register_commands(struct command_context *cmd_ctx) { - command_t *avr_cmd = register_command(cmd_ctx, NULL, "avr", + struct command *avr_cmd = register_command(cmd_ctx, NULL, "avr", NULL, COMMAND_ANY, "avr flash specific commands"); register_command(cmd_ctx, avr_cmd, "mass_erase",