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

Fall back on bytewise r/w if paged access fails for avr cache

This commit is contained in:
Stefan Rueger 2022-10-12 15:53:54 +01:00
parent 48919f59b3
commit 8a3864d263
No known key found for this signature in database
GPG Key ID: B0B4F1FD86B1EC55
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/avrcache.c
View File

@ -32,7 +32,7 @@
#include "avrintel.h" #include "avrintel.h"
/* /*
* Provides an API for cached byte-wise access * Provides an API for cached bytewise access
* *
* int avr_read_byte_cached(const PROGRAMMER *pgm, const AVRPART *p, const * int avr_read_byte_cached(const PROGRAMMER *pgm, const AVRPART *p, const
* AVRMEM *mem, unsigned long addr, unsigned char *value); * AVRMEM *mem, unsigned long addr, unsigned char *value);
@ -52,8 +52,8 @@
* avr_read_byte_cached() and avr_write_byte_cached() use a cache if paged * avr_read_byte_cached() and avr_write_byte_cached() use a cache if paged
* routines are available and if the device memory is EEPROM or flash, * routines are available and if the device memory is EEPROM or flash,
* otherwise they fall back to pgm->read_byte() and pgm->write_byte(), * otherwise they fall back to pgm->read_byte() and pgm->write_byte(),
* respectively. Byte-wise cached read always gets its data from the cache, * respectively. Bytewise cached read always gets its data from the cache,
* possibly after reading a page from the device memory. Byte-wise cached * possibly after reading a page from the device memory. Bytewise cached
* write with an address in memory range only ever modifies the cache. Any * write with an address in memory range only ever modifies the cache. Any
* modifications are written to the device after calling avr_flush_cache() or * modifications are written to the device after calling avr_flush_cache() or
* when attempting to read or write from a location outside the address range * when attempting to read or write from a location outside the address range
@ -131,6 +131,7 @@ int avr_has_paged_access(const PROGRAMMER *pgm, const AVRMEM *mem) {
* - Caller to ensure buf has mem->page_size bytes * - Caller to ensure buf has mem->page_size bytes
* - Part memory buffer mem is unaffected by this (though temporarily changed) * - Part memory buffer mem is unaffected by this (though temporarily changed)
* - Uses read_byte() if memory page size is one, otherwise paged_load() * - Uses read_byte() if memory page size is one, otherwise paged_load()
* - Fall back to bytewise read if paged_load() returned an error
*/ */
int avr_read_page_default(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, int addr, unsigned char *buf) { int avr_read_page_default(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, int addr, unsigned char *buf) {
if(!avr_has_paged_access(pgm, mem) || addr < 0 || addr >= mem->size) if(!avr_has_paged_access(pgm, mem) || addr < 0 || addr >= mem->size)
@ -146,6 +147,18 @@ int avr_read_page_default(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM
if((rc = pgm->paged_load(pgm, p, mem, pgsize, off, pgsize)) >= 0) if((rc = pgm->paged_load(pgm, p, mem, pgsize, off, pgsize)) >= 0)
memcpy(buf, mem->buf + off, pgsize); memcpy(buf, mem->buf + off, pgsize);
memcpy(mem->buf + off, pagecopy, pgsize); memcpy(mem->buf + off, pagecopy, pgsize);
if(rc < 0) {
rc = LIBAVRDUDE_SUCCESS;
for(int i=0; i<pgsize; i++) {
if(pgm->read_byte(pgm, p, mem, off+i, pagecopy+i) < 0) {
rc = LIBAVRDUDE_GENERAL_FAILURE;
break;
}
}
if(rc == LIBAVRDUDE_SUCCESS)
memcpy(buf, pagecopy, pgsize);
}
free(pagecopy); free(pagecopy);
return rc; return rc;
@ -248,13 +261,20 @@ static int loadCachePage(AVR_Cache *cp, const PROGRAMMER *pgm, const AVRPART *p,
static int writeCachePage(AVR_Cache *cp, const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, int base, int nlOnErr) { static int writeCachePage(AVR_Cache *cp, const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, int base, int nlOnErr) {
// Write modified page cont to device // Write modified page cont to device; if unsuccessful try bytewise access
if(avr_write_page_default(pgm, p, mem, base, cp->cont + base) < 0) { if(avr_write_page_default(pgm, p, mem, base, cp->cont + base) < 0) {
report_progress(1, -1, NULL); for(int i=0; i < cp->page_size; i++)
if(nlOnErr && quell_progress) if(cp->cont[base+i] != cp->copy[base+i])
avrdude_message(MSG_INFO, "\n"); if(pgm->write_byte(pgm, p, mem, base+i, cp->cont[base+i]) < 0 ||
avrdude_message(MSG_INFO, "%s: writeCachePage() %s write error at addr 0x%04x\n", progname, mem->desc, base); pgm->read_byte(pgm, p, mem, base+i, cp->copy+base+i) < 0) {
return LIBAVRDUDE_GENERAL_FAILURE; report_progress(1, -1, NULL);
if(nlOnErr && quell_progress)
avrdude_message(MSG_INFO, "\n");
avrdude_message(MSG_INFO, "%s: writeCachePage() %s access error at addr 0x%04x\n", progname, mem->desc, base+i);
return LIBAVRDUDE_GENERAL_FAILURE;
}
return LIBAVRDUDE_SUCCESS; // Bytewise writes & reads successful
} }
// Read page back from device and update copy to what is on device // Read page back from device and update copy to what is on device
if(avr_read_page_default(pgm, p, mem, base, cp->copy + base) < 0) { if(avr_read_page_default(pgm, p, mem, base, cp->copy + base) < 0) {