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

* main.c(do_op): use mem->desc in place of upd->memtype to 

give the full name of the respective memory area, instead of
the (possibly abbreviated) name the user typed in the -U option.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@529 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2005-09-22 14:14:14 +00:00
parent 551aff83c5
commit 367a80150f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
avrdude/ChangeLog
View File

@ -1,3 +1,9 @@
2005-09-21 Joerg Wunsch <j@uriah.heep.sax.de>
* main.c(do_op): use mem->desc in place of upd->memtype to
give the full name of the respective memory area, instead of
the (possibly abbreviated) name the user typed in the -U option.
2005-09-21 Joerg Wunsch <j@uriah.heep.sax.de> 2005-09-21 Joerg Wunsch <j@uriah.heep.sax.de>
* main.c: Add the forgotten -B option to the option string in * main.c: Add the forgotten -B option to the option string in

14
avrdude/main.c
View File

@ -540,13 +540,13 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
*/ */
if (quell_progress < 2) { if (quell_progress < 2) {
fprintf(stderr, "%s: reading %s memory:\n", fprintf(stderr, "%s: reading %s memory:\n",
progname, upd->memtype); progname, mem->desc);
} }
report_progress(0,1,"Reading"); report_progress(0,1,"Reading");
rc = avr_read(pgm, p, upd->memtype, 0, 1); rc = avr_read(pgm, p, upd->memtype, 0, 1);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: failed to read all of %s memory, rc=%d\n", fprintf(stderr, "%s: failed to read all of %s memory, rc=%d\n",
progname, upd->memtype, rc); progname, mem->desc, rc);
return -1; return -1;
} }
report_progress(1,1,NULL); report_progress(1,1,NULL);
@ -607,7 +607,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: failed to write %s memory, rc=%d\n", fprintf(stderr, "%s: failed to write %s memory, rc=%d\n",
progname, upd->memtype, rc); progname, mem->desc, rc);
return -1; return -1;
} }
@ -630,10 +630,10 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
if (quell_progress < 2) { if (quell_progress < 2) {
fprintf(stderr, "%s: verifying %s memory against %s:\n", fprintf(stderr, "%s: verifying %s memory against %s:\n",
progname, upd->memtype, upd->filename); progname, mem->desc, upd->filename);
fprintf(stderr, "%s: load data %s data from input file %s:\n", fprintf(stderr, "%s: load data %s data from input file %s:\n",
progname, upd->memtype, upd->filename); progname, mem->desc, upd->filename);
} }
rc = fileio(FIO_READ, upd->filename, upd->format, p, upd->memtype, -1); rc = fileio(FIO_READ, upd->filename, upd->format, p, upd->memtype, -1);
@ -654,7 +654,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
rc = avr_read(pgm, v, upd->memtype, size, 1); rc = avr_read(pgm, v, upd->memtype, size, 1);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: failed to read all of %s memory, rc=%d\n", fprintf(stderr, "%s: failed to read all of %s memory, rc=%d\n",
progname, upd->memtype, rc); progname, mem->desc, rc);
pgm->err_led(pgm, ON); pgm->err_led(pgm, ON);
return -1; return -1;
} }
@ -675,7 +675,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
if (quell_progress < 2) { if (quell_progress < 2) {
fprintf(stderr, "%s: %d bytes of %s verified\n", fprintf(stderr, "%s: %d bytes of %s verified\n",
progname, rc, upd->memtype); progname, rc, mem->desc);
} }
pgm->vfy_led(pgm, OFF); pgm->vfy_led(pgm, OFF);