bug #39893: Verification failure with AVRISPmkII and Xmega

* stk500v2.c (stk600_xprog_page_erase): Fix argument that is
passed to stk600_xprog_memtype()



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1188 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2013-08-30 06:49:40 +00:00
parent 3879e70713
commit 056b5f6e77
3 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2013-08-30 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
bug #39893: Verification failure with AVRISPmkII and Xmega
* stk500v2.c (stk600_xprog_page_erase): Fix argument that is
passed to stk600_xprog_memtype()
2013-07-11 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2013-07-11 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* fileio.c (elf2b): replace elf_getshstrndx() by * fileio.c (elf2b): replace elf_getshstrndx() by

1
NEWS
View File

@ -80,6 +80,7 @@ Current:
- bug #37942: Latest SVN can't program in dragon_jtag mode - bug #37942: Latest SVN can't program in dragon_jtag mode
- patch #7876 JTAGICE mkII fails to connect to attiny if debugwire - patch #7876 JTAGICE mkII fails to connect to attiny if debugwire
is enabled AND target has a very slow clock is enabled AND target has a very slow clock
- bug #39893: Verification failure with AVRISPmkII and Xmega
* Keep track of input file contents * Keep track of input file contents

View File

@ -4313,7 +4313,7 @@ static int stk600_xprog_page_erase(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
unsigned char b[6]; unsigned char b[6];
if (strcmp(m->desc, "flash") == 0) { if (strcmp(m->desc, "flash") == 0) {
b[1] = stk600_xprog_memtype(pgm, addr - m->offset) == XPRG_MEM_TYPE_APPL? b[1] = stk600_xprog_memtype(pgm, addr) == XPRG_MEM_TYPE_APPL?
XPRG_ERASE_APP_PAGE: XPRG_ERASE_BOOT_PAGE; XPRG_ERASE_APP_PAGE: XPRG_ERASE_BOOT_PAGE;
} else if (strcmp(m->desc, "application") == 0 || } else if (strcmp(m->desc, "application") == 0 ||
strcmp(m->desc, "apptable") == 0) { strcmp(m->desc, "apptable") == 0) {