From 367a80150f44f6de5b608d55faeb89c68553bae7 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Thu, 22 Sep 2005 14:14:14 +0000 Subject: [PATCH] * 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 --- avrdude/ChangeLog | 6 ++++++ avrdude/main.c | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog index 3c810ba6..aa8edc18 100644 --- a/avrdude/ChangeLog +++ b/avrdude/ChangeLog @@ -1,3 +1,9 @@ +2005-09-21 Joerg Wunsch + + * 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 * main.c: Add the forgotten -B option to the option string in diff --git a/avrdude/main.c b/avrdude/main.c index 29d20742..59e7473d 100644 --- a/avrdude/main.c +++ b/avrdude/main.c @@ -540,13 +540,13 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite, */ if (quell_progress < 2) { fprintf(stderr, "%s: reading %s memory:\n", - progname, upd->memtype); + progname, mem->desc); } report_progress(0,1,"Reading"); rc = avr_read(pgm, p, upd->memtype, 0, 1); if (rc < 0) { fprintf(stderr, "%s: failed to read all of %s memory, rc=%d\n", - progname, upd->memtype, rc); + progname, mem->desc, rc); return -1; } report_progress(1,1,NULL); @@ -607,7 +607,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite, if (rc < 0) { fprintf(stderr, "%s: failed to write %s memory, rc=%d\n", - progname, upd->memtype, rc); + progname, mem->desc, rc); return -1; } @@ -630,10 +630,10 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite, if (quell_progress < 2) { 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", - progname, upd->memtype, upd->filename); + progname, mem->desc, upd->filename); } 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); if (rc < 0) { 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); return -1; } @@ -675,7 +675,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite, if (quell_progress < 2) { fprintf(stderr, "%s: %d bytes of %s verified\n", - progname, rc, upd->memtype); + progname, rc, mem->desc); } pgm->vfy_led(pgm, OFF);