[avr-libc-commit] [2113] 2010-03-30 Eric B.

[Eric Weddington]

Revision: 2113
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2113
Author:   arcanum
Date:     2010-03-31 04:27:34 +0000 (Wed, 31 Mar 2010)
Log Message:
-----------
2010-03-30  Eric B. Weddington  <address@hidden>

        * xml/avrgcc-header: Modify XMEGA portion of script to not generate CPU
        and GPIO definitions that include references to non-existent structures.
        This is a partial fix for bug #28901, for future header files.

Ticket Links:
:-----------
    http://savannah.gnu.org/bugs/?28901

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/xml/avrgcc-header

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2010-03-29 05:25:58 UTC (rev 2112)
+++ trunk/avr-libc/ChangeLog    2010-03-31 04:27:34 UTC (rev 2113)
@@ -1,3 +1,9 @@
+2010-03-30  Eric B. Weddington  <address@hidden>
+
+       * xml/avrgcc-header: Modify XMEGA portion of script to not generate CPU
+       and GPIO definitions that include references to non-existent structures.
+       This is a partial fix for bug #28901, for future header files.
+
 2010-03-28  Eric B. Weddington  <address@hidden>
 
        Add support for new device: m3000.

Modified: trunk/avr-libc/xml/avrgcc-header
===================================================================
--- trunk/avr-libc/xml/avrgcc-header    2010-03-29 05:25:58 UTC (rev 2112)
+++ trunk/avr-libc/xml/avrgcc-header    2010-03-31 04:27:34 UTC (rev 2113)
@@ -417,11 +417,14 @@
 echo 
"==========================================================================" >> 
$headerfile
 echo "*/" >> $headerfile
 echo "" >> $headerfile
-xml sel -T \
-    -t -m /AVRPART/group \
-        -s "A:T:-" "@offset" \
-        -v "concat('#define ',@name,'    (*(',@implements,'_t *) ',@offset,')  
/* ',@text,' */')" -n \
-    -t -n -n $headerfile-iogroups.xml >> $headerfile
+for i in $(xml sel -T -t -m /AVRPART/group -s "A:T:-" "@offset" -v 
"concat(@name,' ')" $headerfile-iogroups.xml | sed "s,GPIO ,,g" | sed "s,CPU 
,,g") ; do
+    IMPLEMENTS=$(xml sel -T -t -m '/AVRPART/address@hidden'\'${i}\'']' -v 
@implements $headerfile-iogroups.xml)
+    OFFSET=$(xml sel -T -t -m '/AVRPART/address@hidden'\'${i}\'']' -v @offset 
$headerfile-iogroups.xml)
+    TEXT=$(xml sel -T -t -m '/AVRPART/address@hidden'\'${i}\'']' -v @text 
$headerfile-iogroups.xml)
+    echo "#define ${i}    (*(${IMPLEMENTS}_t *) ${OFFSET})  /* ${TEXT} */" >> 
$headerfile
+done
+echo "" >> $headerfile
+echo "" >> $headerfile
 
 
 
@@ -430,6 +433,8 @@
 echo "" >> $headerfile
 
 
+
+
 # XMEGA Flattened fully qualified IO register names
 #---------------------------------------------------