X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Favrf.c;h=15b8b2794567830e700caeaca57a05db6bf7e749;hb=61bb0d3d235c659eb407a7032aa9ec70a914dc03;hp=687dd4b59ea2acf79bf263bfe9ee47532d938ae4;hpb=fe9228a32db930be297d4d3b35ffb94d6de1b9ab;p=openocd

diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c
index 687dd4b5..15b8b279 100644
--- a/src/flash/nor/avrf.c
+++ b/src/flash/nor/avrf.c
@@ -21,9 +21,9 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "avrf.h"
-#include "avrt.h"
-#include "flash.h"
+#include <target/avrt.h>
 
 
 /* AVR_JTAG_Instructions */
@@ -50,10 +50,13 @@
 #define AVR_JTAG_REG_ProgrammingCommand_Len			15
 #define AVR_JTAG_REG_FlashDataByte_Len				16
 
-struct avrf_type avft_chips_info[] =
+static 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},
+/*	name, chip_id,	flash_page_size, flash_page_num,
+ *			eeprom_page_size, eeprom_page_num
+ */
+	{"atmega128",	0x9702, 256, 512, 8, 512},
+	{"at90can128",	0x9781, 256, 512, 8, 512},
 };
 
 int avr_jtag_sendinstr(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out);
@@ -200,8 +203,27 @@ FLASH_BANK_COMMAND_HANDLER(avrf_flash_bank_command)
 
 static int avrf_erase(struct flash_bank *bank, int first, int last)
 {
-	LOG_INFO("%s", __FUNCTION__);
-	return ERROR_OK;
+	struct target *target = bank->target;
+	struct avr_common *avr = target->arch_info;
+	int status;
+
+	LOG_DEBUG("%s", __FUNCTION__);
+
+	if (target->state != TARGET_HALTED)
+	{
+		LOG_ERROR("Target not halted");
+		return ERROR_TARGET_NOT_HALTED;
+	}
+
+	status = avr_jtagprg_enterprogmode(avr);
+	if (status != ERROR_OK)
+		return status;
+
+	status = avr_jtagprg_chiperase(avr);
+	if (status != ERROR_OK)
+		return status;
+
+	return avr_jtagprg_leaveprogmode(avr);
 }
 
 static int avrf_protect(struct flash_bank *bank, int set, int first, int last)
@@ -452,7 +474,7 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
 static const struct command_registration avrf_exec_command_handlers[] = {
 	{
 		.name = "mass_erase",
-		.handler = &avrf_handle_mass_erase_command,
+		.handler = avrf_handle_mass_erase_command,
 		.mode = COMMAND_EXEC,
 		.help = "erase entire device",
 	},
@@ -469,15 +491,15 @@ static const struct command_registration avrf_command_handlers[] = {
 };
 
 struct flash_driver avr_flash = {
-		.name = "avr",
-		.commands = avrf_command_handlers,
-		.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,
-	};
+	.name = "avr",
+	.commands = avrf_command_handlers,
+	.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,
+};