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

Add write statistics for patched flash input files at notice2 level

This commit is contained in:
Stefan Rueger 2022-11-11 01:27:55 +00:00
parent 22bd977365
commit 6e3a99be87
No known key found for this signature in database
GPG Key ID: B0B4F1FD86B1EC55
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/update.c
View File

@ -431,7 +431,7 @@ int do_op(const PROGRAMMER *pgm, const AVRPART *p, UPDATE *upd, enum updateflags
AVRMEM *mem; AVRMEM *mem;
int size; int size;
int rc; int rc;
Filestats fs; Filestats fs, fs_patched;
mem = avr_locate_mem(p, upd->memtype); mem = avr_locate_mem(p, upd->memtype);
if (mem == NULL) { if (mem == NULL) {
@ -506,11 +506,10 @@ int do_op(const PROGRAMMER *pgm, const AVRPART *p, UPDATE *upd, enum updateflags
msg_info("\n"); msg_info("\n");
} }
// Patch input if for flash, eg, for vector bootloaders? // Patch flash input, eg, for vector bootloaders
if(pgm->flash_readhook) { if(pgm->flash_readhook) {
AVRMEM *mem = avr_locate_mem(p, upd->memtype); AVRMEM *mem = avr_locate_mem(p, upd->memtype);
if(mem && !strcmp(mem->desc, "flash")) { if(mem && !strcmp(mem->desc, "flash")) {
Filestats fs_patched;
rc = pgm->flash_readhook(pgm, p, mem, upd->filename, rc); rc = pgm->flash_readhook(pgm, p, mem, upd->filename, rc);
if (rc < 0) { if (rc < 0) {
pmsg_notice("readhook for file %s failed\n", update_inname(upd->filename)); pmsg_notice("readhook for file %s failed\n", update_inname(upd->filename));
@ -518,9 +517,23 @@ int do_op(const PROGRAMMER *pgm, const AVRPART *p, UPDATE *upd, enum updateflags
} }
if(memstats(p, upd->memtype, rc, &fs_patched) < 0) if(memstats(p, upd->memtype, rc, &fs_patched) < 0)
return LIBAVRDUDE_GENERAL_FAILURE; return LIBAVRDUDE_GENERAL_FAILURE;
if(memcmp(&fs_patched, &fs, sizeof fs)) if(memcmp(&fs_patched, &fs, sizeof fs)) {
imsg_info("and patching flash input for device%s\n", pmsg_info("preparing flash input for device%s\n",
pgm->prog_modes & PM_SPM? " bootloader": ""); pgm->prog_modes & PM_SPM? " bootloader": "");
imsg_notice2("with %d byte%s in %d section%s within %s\n",
fs_patched.nbytes, update_plural(fs_patched.nbytes),
fs_patched.nsections, update_plural(fs_patched.nsections),
update_interval(fs_patched.firstaddr, fs_patched.lastaddr));
if(mem->page_size > 1) {
imsg_notice2("using %d page%s and %d pad byte%s",
fs_patched.npages, update_plural(fs_patched.npages),
fs_patched.nfill, update_plural(fs_patched.nfill));
if(fs_patched.ntrailing)
msg_notice2(", and %d trailing 0xff byte%s",
fs_patched.ntrailing, update_plural(fs_patched.ntrailing));
msg_notice2("\n");
}
}
} }
} }
size = rc; size = rc;