From 285ae1ab312e9dd2ded92823d4e62b3068f37454 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Mon, 17 Jul 2006 19:58:50 +0000
Subject: [PATCH] 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@588 81a1dc3b-b13d-400b-aceb-764788c761c2
---
avrdude/ChangeLog | 6 ++++++
avrdude/main.c | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index 8a4c5391..7372a9a6 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -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>
First stab at an implementation of the STK500 parallel programming
diff --git a/avrdude/main.c b/avrdude/main.c
index f98f8fa6..b0a2bee3 100644
--- a/avrdude/main.c
+++ b/avrdude/main.c
@@ -556,7 +556,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
*/
if (quell_progress < 2) {
fprintf(stderr, "%s: writing %s (%d bytes):\n",
- progname, upd->memtype, size);
+ progname, mem->desc, size);
}
if (!nowrite) {
@@ -582,7 +582,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
if (quell_progress < 2) {
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",
progname, upd->filename, size);
fprintf(stderr, "%s: reading on-chip %s data:\n",
- progname, upd->memtype);
+ progname, mem->desc);
}
report_progress (0,1,"Reading");