From 6e88b885054082a9cf3291d067a55f1a3567f623 Mon Sep 17 00:00:00 2001
From: Rene Liebscher <r.liebscher@gmx.de>
Date: Fri, 3 Feb 2012 20:07:54 +0000
Subject: [PATCH] bug #34768 Proposition: Change the name of the AVR32 devices
* avrdude.conf.in: renamed ucr2 to uc3a0512 * avrpart.c: added cast to avoid
compiler warning
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@1061 81a1dc3b-b13d-400b-aceb-764788c761c2
---
avrdude/ChangeLog | 6 ++++++
avrdude/avrdude.conf.in | 20 ++++++++++++--------
avrdude/avrpart.c | 2 +-
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index 52f2470d..6beeae5e 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-03 Rene Liebscher <R.Liebscher@gmx.de>
+
+ bug #34768 Proposition: Change the name of the AVR32 devices
+ * avrdude.conf.in: renamed ucr2 to uc3a0512
+ * avrpart.c: added cast to avoid compiler warning
+
2012-02-03 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* fileio.c (fileio_elf): Fix a copy'n-paste-o.
diff --git a/avrdude/avrdude.conf.in b/avrdude/avrdude.conf.in
index a8d7da1e..7c1ed092 100644
--- a/avrdude/avrdude.conf.in
+++ b/avrdude/avrdude.conf.in
@@ -12686,22 +12686,26 @@ part parent "x128a3"
#------------------------------------------------------------
part
- id = "ucr2";
- desc = "32UC3A0512";
+ id = "uc3a0512";
+ desc = "AT32UC3A0512";
signature = 0xED 0xC0 0x3F;
has_jtag = yes;
- is_avr32 = yes;
+ is_avr32 = yes;
memory "flash"
paged = yes;
- page_size = 512; # bytes
- readsize = 512; # bytes
- num_pages = 1024; # could be set dynamicly
- size = 0x00080000; # could be set dynamicly
- offset = 0x80000000;
+ page_size = 512; # bytes
+ readsize = 512; # bytes
+ num_pages = 1024; # could be set dynamicly
+ size = 0x00080000; # could be set dynamicly
+ offset = 0x80000000;
;
;
+part parent "uc3a0512"
+ id = "ucr2";
+ desc = "deprecated, use 'uc3a0512'";
+;
#------------------------------------------------------------
# ATtiny4
#------------------------------------------------------------
diff --git a/avrdude/avrpart.c b/avrdude/avrpart.c
index 280721be..9d0b1758 100644
--- a/avrdude/avrpart.c
+++ b/avrdude/avrpart.c
@@ -475,7 +475,7 @@ AVRPART * avr_dup_part(AVRPART * d)
void avr_free_part(AVRPART * d)
{
int i;
- ldestroy_cb(d->mem,avr_free_mem);
+ ldestroy_cb(d->mem, (void(*)(void *))avr_free_mem);
d->mem = NULL;
for(i=0;i<sizeof(d->op)/sizeof(d->op[0]);i++)
{