avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement ATmega256x support for butterfly/avr109. 

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@727 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2007-01-30 15:47:53 +00:00
parent 3407d4312a
commit 6a9ee90a06
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
avrdude/ChangeLog
View File

@ -1,3 +1,7 @@
2007-01-30 Joerg Wunsch <j@uriah.heep.sax.de>
* butterfly.c: Implement ATmega256x support for butterfly/avr109.
2007-01-30 Joerg Wunsch <j@uriah.heep.sax.de> 2007-01-30 Joerg Wunsch <j@uriah.heep.sax.de>
* configure.ac: Fix subdir handling. Now finally, "make distcheck" will * configure.ac: Fix subdir handling. Now finally, "make distcheck" will

2
avrdude/NEWS
View File

@ -13,6 +13,8 @@ Current:
into a libavrdude.a library where main.c is currently the only into a libavrdude.a library where main.c is currently the only
existing frontend. existing frontend.
* Implement ATmega256x support for butterfly/avr109.
Version 5.3.1: Version 5.3.1:
* Add support for the AVR Dragon (all modes: ISP, JTAG, HVSP, PP, * Add support for the AVR Dragon (all modes: ISP, JTAG, HVSP, PP,

34
avrdude/butterfly.c
View File

@ -412,12 +412,27 @@ static void butterfly_set_addr(PROGRAMMER * pgm, unsigned long addr)
} }
static void butterfly_set_extaddr(PROGRAMMER * pgm, unsigned long addr)
{
char cmd[4];
cmd[0] = 'H';
cmd[1] = (addr >> 16) & 0xff;
cmd[2] = (addr >> 8) & 0xff;
cmd[3] = addr & 0xff;
butterfly_send(pgm, cmd, sizeof(cmd));
butterfly_vfy_cmd_sent(pgm, "set extaddr");
}
static int butterfly_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, static int butterfly_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
unsigned long addr, unsigned char value) unsigned long addr, unsigned char value)
{ {
char cmd[6]; char cmd[6];
int size; int size;
int use_ext_addr = m->op[AVR_OP_LOAD_EXT_ADDR] != NULL;
no_show_func_info(); no_show_func_info();
@ -435,8 +450,12 @@ static int butterfly_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
size = 6; size = 6;
return -1; return -1;
} }
if (use_ext_addr) {
butterfly_set_extaddr(pgm, addr);
} else {
butterfly_set_addr(pgm, addr); butterfly_set_addr(pgm, addr);
} }
}
else if (strcmp(m->desc, "lock") == 0) else if (strcmp(m->desc, "lock") == 0)
{ {
cmd[0] = 'l'; cmd[0] = 'l';
@ -459,6 +478,7 @@ static int butterfly_read_byte_flash(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
static int cached = 0; static int cached = 0;
static unsigned char cvalue; static unsigned char cvalue;
static unsigned long caddr; static unsigned long caddr;
int use_ext_addr = m->op[AVR_OP_LOAD_EXT_ADDR] != NULL;
if (cached && ((caddr + 1) == addr)) { if (cached && ((caddr + 1) == addr)) {
*value = cvalue; *value = cvalue;
@ -467,7 +487,11 @@ static int butterfly_read_byte_flash(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
else { else {
char buf[2]; char buf[2];
if (use_ext_addr) {
butterfly_set_extaddr(pgm, addr >> 1);
} else {
butterfly_set_addr(pgm, addr >> 1); butterfly_set_addr(pgm, addr >> 1);
}
butterfly_send(pgm, "g\000\002F", 4); butterfly_send(pgm, "g\000\002F", 4);
@ -544,6 +568,7 @@ static int butterfly_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
unsigned int max_addr = n_bytes; unsigned int max_addr = n_bytes;
char *cmd; char *cmd;
unsigned int blocksize = buffersize; unsigned int blocksize = buffersize;
int use_ext_addr = m->op[AVR_OP_LOAD_EXT_ADDR] != NULL;
if (strcmp(m->desc, "flash") && strcmp(m->desc, "eeprom")) if (strcmp(m->desc, "flash") && strcmp(m->desc, "eeprom"))
return -2; return -2;
@ -551,7 +576,11 @@ static int butterfly_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
if (m->desc[0] == 'e') if (m->desc[0] == 'e')
blocksize = 1; /* Write to eeprom single bytes only */ blocksize = 1; /* Write to eeprom single bytes only */
if (use_ext_addr) {
butterfly_set_extaddr(pgm, addr);
} else {
butterfly_set_addr(pgm, addr); butterfly_set_addr(pgm, addr);
}
#if 0 #if 0
usleep(1000000); usleep(1000000);
@ -592,6 +621,7 @@ static int butterfly_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
unsigned int addr = 0; unsigned int addr = 0;
unsigned int max_addr = n_bytes; unsigned int max_addr = n_bytes;
int rd_size = 1; int rd_size = 1;
int use_ext_addr = m->op[AVR_OP_LOAD_EXT_ADDR] != NULL;
/* check parameter syntax: only "flash" or "eeprom" is allowed */ /* check parameter syntax: only "flash" or "eeprom" is allowed */
if (strcmp(m->desc, "flash") && strcmp(m->desc, "eeprom")) if (strcmp(m->desc, "flash") && strcmp(m->desc, "eeprom"))
@ -604,7 +634,11 @@ static int butterfly_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
cmd[0] = 'g'; cmd[0] = 'g';
cmd[3] = toupper(m->desc[0]); cmd[3] = toupper(m->desc[0]);
if (use_ext_addr) {
butterfly_set_extaddr(pgm, addr);
} else {
butterfly_set_addr(pgm, addr); butterfly_set_addr(pgm, addr);
}
while (addr < max_addr) { while (addr < max_addr) {
if ((max_addr - addr) < blocksize) { if ((max_addr - addr) < blocksize) {
blocksize = max_addr - addr; blocksize = max_addr - addr;