* avr910.c (avr910_read_byte_flash): Eliminate a static variable that
hasn't been in use for 5 years. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@814 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
parent
11834b9ebf
commit
c2bda1f468
|
@ -1,3 +1,8 @@
|
||||||
|
2009-02-28 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
|
||||||
|
|
||||||
|
* avr910.c (avr910_read_byte_flash): Eliminate a static variable that
|
||||||
|
hasn't been in use for 5 years.
|
||||||
|
|
||||||
2009-02-27 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
|
2009-02-27 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
|
||||||
|
|
||||||
* configure.ac: Post-release 5.6.
|
* configure.ac: Post-release 5.6.
|
||||||
|
|
35
avr910.c
35
avr910.c
|
@ -457,33 +457,20 @@ static int avr910_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
|
||||||
static int avr910_read_byte_flash(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
|
static int avr910_read_byte_flash(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
|
||||||
unsigned long addr, unsigned char * value)
|
unsigned long addr, unsigned char * value)
|
||||||
{
|
{
|
||||||
static int cached = 0;
|
char buf[2];
|
||||||
static unsigned char cvalue;
|
|
||||||
static unsigned long caddr;
|
|
||||||
|
|
||||||
if (cached && ((caddr + 1) == addr)) {
|
avr910_set_addr(pgm, addr >> 1);
|
||||||
*value = cvalue;
|
|
||||||
cached = 0;
|
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];
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
char buf[2];
|
*value = buf[0];
|
||||||
|
|
||||||
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;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue