Use mem->desc in place of upd->memtype in more places to

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

(Previous attempt in rev 1.110 was obviously not complete.)


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@588 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2006-07-17 19:58:50 +00:00
parent 8bdbf1774e
commit ff8fb9928e
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2006-07-17 Joerg Wunsch <j@uriah.heep.sax.de>
* main.c: Use mem->desc in place of upd->memtype in more places to
give the full name of the respective memory area, instead of
the (possibly abbreviated) name the user typed in the -U option.
2006-07-16 Joerg Wunsch <j@uriah.heep.sax.de> 2006-07-16 Joerg Wunsch <j@uriah.heep.sax.de>
First stab at an implementation of the STK500 parallel programming First stab at an implementation of the STK500 parallel programming

6
main.c
View File

@ -556,7 +556,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
*/ */
if (quell_progress < 2) { if (quell_progress < 2) {
fprintf(stderr, "%s: writing %s (%d bytes):\n", fprintf(stderr, "%s: writing %s (%d bytes):\n",
progname, upd->memtype, size); progname, mem->desc, size);
} }
if (!nowrite) { if (!nowrite) {
@ -582,7 +582,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 written\n", progname, fprintf(stderr, "%s: %d bytes of %s written\n", progname,
vsize, upd->memtype); vsize, mem->desc);
} }
} }
@ -614,7 +614,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
fprintf(stderr, "%s: input file %s contains %d bytes\n", fprintf(stderr, "%s: input file %s contains %d bytes\n",
progname, upd->filename, size); progname, upd->filename, size);
fprintf(stderr, "%s: reading on-chip %s data:\n", fprintf(stderr, "%s: reading on-chip %s data:\n",
progname, upd->memtype); progname, mem->desc);
} }
report_progress (0,1,"Reading"); report_progress (0,1,"Reading");