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

* avr910.c: Refactor to allow probing for auto addr increment. If auto 

incr supported by programmer hw, don't send addr for every byte.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@304 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
troth 2003-04-06 00:47:16 +00:00
parent 6ee4dd48d9
commit 2a30421f7e
2 changed files with 106 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-04-05 Theodore A. Roth <troth@openavr.org>
* avr910.c: Refactor to allow probing for auto addr increment. If auto
incr supported by programmer hw, don't send addr for every byte.
2003-04-03 Eric B. Weddington <eric@umginc.net> 2003-04-03 Eric B. Weddington <eric@umginc.net>
* confwin.c: Fix bug that allows garbage for non-existent user * confwin.c: Fix bug that allows garbage for non-existent user
config filename on Windows. config filename on Windows.

191
avr910.c
View File

@ -39,6 +39,8 @@
extern char * progname; extern char * progname;
extern int do_cycles; extern int do_cycles;
static char has_auto_incr_addr;
/* These two defines are only for debugging. Will remove them once it starts /* These two defines are only for debugging. Will remove them once it starts
working. */ working. */
@ -227,8 +229,15 @@ static int avr910_initialize(PROGRAMMER * pgm, AVRPART * p)
avr910_recv(pgm, &type, 1); avr910_recv(pgm, &type, 1);
fprintf(stderr, "Found programmer: Id = \"%s\"; type = %c\n", id, type); fprintf(stderr, "Found programmer: Id = \"%s\"; type = %c\n", id, type);
fprintf(stderr, " Software Version = %c.%c; " fprintf(stderr, " Software Version = %c.%c; ", sw[0], sw[1]);
"Hardware Version = %c.%c\n", sw[0], sw[1], hw[0], hw[1]); fprintf(stderr, "Hardware Version = %c.%c\n", hw[0], hw[1]);
/* See if programmer supports autoincrement of address. */
avr910_send(pgm, "a", 1);
avr910_recv(pgm, &has_auto_incr_addr, 1);
if (has_auto_incr_addr == 'Y')
fprintf(stderr, "Programmer supports auto addr increment.\n");
/* Get list of devices that the programmer supports. */ /* Get list of devices that the programmer supports. */
@ -372,116 +381,119 @@ static void avr910_set_addr(PROGRAMMER * pgm, unsigned long addr)
} }
/* static int avr910_paged_write_flash(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
* For some reason, if we don't do this when writing to flash, the first byte int page_size, int n_bytes)
* of flash is not programmed. I susect that the board got out of sync after
* the erase and sending another command gets us back in sync. -TRoth
*/
static void avr910_write_setup(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m)
{ {
if (strcmp(m->desc, "flash") == 0) { unsigned char cmd[] = {'c', 'C'};
avr910_send(pgm, "y", 1); unsigned char buf[2];
avr910_vfy_cmd_sent(pgm, "clear LED"); unsigned int addr = 0;
unsigned int max_addr = n_bytes;
/*
* For some reason, if we don't do this when writing to flash, the first
* byte of flash is not programmed. I susect that the board got out of sync
* after the erase and sending another command gets us back in sync. -TRoth
*/
avr910_send(pgm, "y", 1);
avr910_vfy_cmd_sent(pgm, "clear LED");
avr910_set_addr(pgm, addr>>1);
while (addr < max_addr) {
buf[0] = cmd[addr & 0x01];
buf[1] = m->buf[addr];
avr910_send(pgm, buf, sizeof(buf));
avr910_vfy_cmd_sent(pgm, "write byte");
addr++;
if ((has_auto_incr_addr != 'Y') && ((addr & 0x01) == 0)) {
avr910_set_addr(pgm, addr>>1);
}
} }
return addr;
} }
static int avr910_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, static int avr910_paged_write_eeprom(PROGRAMMER * pgm, AVRPART * p,
unsigned long addr, unsigned char value) AVRMEM * m, int page_size, int n_bytes)
{ {
unsigned char cmd[2]; unsigned char cmd[2];
unsigned int addr = 0;
unsigned int max_addr = n_bytes;
no_show_func_info(); avr910_set_addr(pgm, addr);
cmd[0] = 'D';
while (addr < max_addr) {
cmd[1] = m->buf[addr];
avr910_send(pgm, cmd, sizeof(cmd));
avr910_vfy_cmd_sent(pgm, "write byte");
addr++;
if (has_auto_incr_addr != 'Y') {
avr910_set_addr(pgm, addr);
}
}
return addr;
}
static int avr910_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
int page_size, int n_bytes)
{
if (strcmp(m->desc, "flash") == 0) { if (strcmp(m->desc, "flash") == 0) {
if (addr & 0x01) { return avr910_paged_write_flash(pgm, p, m, page_size, n_bytes);
cmd[0] = 'C'; /* Write Program Mem high byte */
}
else {
cmd[0] = 'c';
}
addr >>= 1;
} }
else if (strcmp(m->desc, "eeprom") == 0) { else if (strcmp(m->desc, "eeprom") == 0) {
cmd[0] = 'D'; return avr910_paged_write_eeprom(pgm, p, m, page_size, n_bytes);
} }
else { else {
return -1; return -2;
} }
cmd[1] = value;
avr910_set_addr(pgm, addr);
avr910_send(pgm, cmd, sizeof(cmd));
avr910_vfy_cmd_sent(pgm, "write byte");
return 0;
} }
static int avr910_read_byte_flash(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, static int avr910_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
unsigned long addr, unsigned char * value) int page_size, int n_bytes)
{ {
static int cached = 0; unsigned char cmd;
static unsigned char cvalue; int rd_size;
static unsigned long caddr; unsigned int addr = 0;
unsigned int max_addr;
if (cached && ((caddr + 1) == addr)) {
*value = cvalue;
cached = 0;
}
else {
unsigned char buf[2];
avr910_set_addr(pgm, addr >> 1);
avr910_send(pgm, "R", 1);
/* Read back the program mem word (MSB first) */
avr910_recv(pgm, buf, sizeof(buf));
if ((addr & 0x01) == 0) {
*value = buf[1];
cached = 1;
cvalue = buf[0];
caddr = addr;
}
else {
*value = buf[0];
}
}
return 0;
}
static int avr910_read_byte_eeprom(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
unsigned long addr, unsigned char * value)
{
avr910_set_addr(pgm, addr);
avr910_send(pgm, "d", 1);
avr910_recv(pgm, value, 1);
return 0;
}
static int avr910_read_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
unsigned long addr, unsigned char * value)
{
no_show_func_info();
if (strcmp(m->desc, "flash") == 0) { if (strcmp(m->desc, "flash") == 0) {
return avr910_read_byte_flash(pgm, p, m, addr, value); cmd = 'R';
rd_size = 2; /* read two bytes per addr */
}
else if (strcmp(m->desc, "eeprom") == 0) {
cmd = 'd';
rd_size = 1;
}
else {
return -2;
} }
if (strcmp(m->desc, "eeprom") == 0) { max_addr = n_bytes/rd_size;
return avr910_read_byte_eeprom(pgm, p, m, addr, value);
avr910_set_addr(pgm, addr);
while (addr < max_addr) {
avr910_send(pgm, &cmd, 1);
avr910_recv(pgm, &m->buf[addr], rd_size);
addr++;
if (has_auto_incr_addr != 'Y') {
avr910_set_addr(pgm, addr);
}
} }
return -1; return addr * rd_size;
} }
/* Signature byte reads are always 3 bytes. */ /* Signature byte reads are always 3 bytes. */
@ -533,8 +545,7 @@ void avr910_initpgm(PROGRAMMER * pgm)
* optional functions * optional functions
*/ */
pgm->write_setup = avr910_write_setup; pgm->paged_write = avr910_paged_write;
pgm->write_byte = avr910_write_byte; pgm->paged_load = avr910_paged_load;
pgm->read_byte = avr910_read_byte;
pgm->read_sig_bytes = avr910_read_sig_bytes; pgm->read_sig_bytes = avr910_read_sig_bytes;
} }