X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Favrf.c;h=5d3c033d80b6ca3670add6a2544ffead8358f6e3;hp=7a7eddd98c1a66a47449e7d19b8c00ef683a2e50;hb=e84849f5ed7416c758914bea88a31827259c4f5b;hpb=a7a8a1c9e2e86902a3a5864cd257e01e0b3f6da6

diff --git a/src/flash/avrf.c b/src/flash/avrf.c
index 7a7eddd98c..5d3c033d80 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;
 
@@ -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;
@@ -306,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++)
 		{
@@ -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)
 	{
@@ -425,8 +425,8 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
 		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_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -449,9 +449,9 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
 	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",
@@ -461,7 +461,7 @@ static int avrf_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-flash_driver_t avr_flash = {
+struct flash_driver avr_flash = {
 		.name = "avr",
 		.register_commands = &avrf_register_commands,
 		.flash_bank_command = &avrf_flash_bank_command,