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

Merge pull request #1029 from stefanrueger/issue992 

Fix usbtiny read/verify for parts with more than 64 kB flash
This commit is contained in:
Stefan Rueger 2022-07-18 14:32:15 +01:00 committed by GitHub
parent 494199fa78 d05ddd188d
commit 6e5bf3bc8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/usbtiny.c
View File

@ -657,15 +657,39 @@ static int usbtiny_paged_load (PROGRAMMER * pgm, AVRPART * p, AVRMEM* m,
unsigned int addr, unsigned int n_bytes) unsigned int addr, unsigned int n_bytes)
{ {
unsigned int maxaddr = addr + n_bytes; unsigned int maxaddr = addr + n_bytes;
int chunk; int chunk, function;
int function; OPCODE *lext, *readop;
unsigned char cmd[8];
// First determine what we're doing // First determine what we're doing
if (strcmp( m->desc, "flash" ) == 0) { function = strcmp(m->desc, "eeprom")==0?
function = USBTINY_FLASH_READ; USBTINY_EEPROM_READ: USBTINY_FLASH_READ;
} else {
function = USBTINY_EEPROM_READ; // paged_load() only called for pages, so OK to set ext addr once at start
if((lext = m->op[AVR_OP_LOAD_EXT_ADDR])) {
memset(cmd, 0, sizeof(cmd));
avr_set_bits(lext, cmd);
avr_set_addr(lext, cmd, addr/2);
if(pgm->cmd(pgm, cmd, cmd+4) < 0)
return -1;
}
// Byte acces as work around to correctly read flash above 64 kiB
if(function == USBTINY_FLASH_READ && addr >= 0x10000) {
for(unsigned int i=0; i<n_bytes; i++, addr++) {
if(!(readop = m->op[addr&1? AVR_OP_READ_HI: AVR_OP_READ_LO]))
return -1;
memset(cmd, 0, sizeof(cmd));
avr_set_bits(readop, cmd);
avr_set_addr(readop, cmd, addr/2);
if(pgm->cmd(pgm, cmd, cmd+4) < 0)
return -1;
m->buf[addr] = 0;
avr_get_output(readop, cmd+4, m->buf + addr);
}
return n_bytes;
} }
for (; addr < maxaddr; addr += chunk) { for (; addr < maxaddr; addr += chunk) {