[avr-libc-commit] [2238] 2011-05-09 Eric B.

[Eric Weddington]

Revision: 2238
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2238
Author:   arcanum
Date:     2011-05-09 16:44:33 +0000 (Mon, 09 May 2011)
Log Message:
-----------
2011-05-09  Eric B. Weddington  <address@hidden>

        Fix for bug #33230.
        * include/avr/sleep.h: Move conditionals for devices attiny261,
        attiny261a, attiny461, attiny461a, attiny861, attiny861a to
        correct location.
        * NEWS: Add to fixed bug list.

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

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/NEWS
    trunk/avr-libc/include/avr/sleep.h

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2011-05-09 16:34:41 UTC (rev 2237)
+++ trunk/avr-libc/ChangeLog    2011-05-09 16:44:33 UTC (rev 2238)
@@ -1,5 +1,13 @@
 2011-05-09  Eric B. Weddington  <address@hidden>
 
+       Fix for bug #33230.
+       * include/avr/sleep.h: Move conditionals for devices attiny261,
+       attiny261a, attiny461, attiny461a, attiny861, attiny861a to
+       correct location.
+       * NEWS: Add to fixed bug list.
+
+2011-05-09  Eric B. Weddington  <address@hidden>
+
        Fix for bug #33238.
        * include/avr/iom8u2.h: Fix _VECTORS_SIZE value.
        * include/avr/iom16u2.h: Same.

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2011-05-09 16:34:41 UTC (rev 2237)
+++ trunk/avr-libc/NEWS 2011-05-09 16:44:33 UTC (rev 2238)
@@ -8,6 +8,7 @@
   [#32103] Support for Target-Triplets
   [#32419] Incorrect EEPROM size in header for ATxmega192A3
   [#32698] power.h has additional endif that will break the build
+  [#33230] Sleep modes have incorrect names for ATtiny261/461/861
   [#33238] Wrong _VECTORS_SIZE for mega8U2 et al
   system when power_all_disable() is used
 

Modified: trunk/avr-libc/include/avr/sleep.h
===================================================================
--- trunk/avr-libc/include/avr/sleep.h  2011-05-09 16:34:41 UTC (rev 2237)
+++ trunk/avr-libc/include/avr/sleep.h  2011-05-09 16:44:33 UTC (rev 2238)
@@ -244,12 +244,6 @@
 || defined(__AVR_ATtiny45__) \
 || defined(__AVR_ATtiny48__) \
 || defined(__AVR_ATtiny85__) \
-|| defined(__AVR_ATtiny261__) \
-|| defined(__AVR_ATtiny261A__) \
-|| defined(__AVR_ATtiny461__) \
-|| defined(__AVR_ATtiny461A__) \
-|| defined(__AVR_ATtiny861__) \
-|| defined(__AVR_ATtiny861A__) \
 || defined(__AVR_ATtiny88__)
 
     #define SLEEP_MODE_IDLE         0
@@ -287,6 +281,12 @@
     } while(0)
 
 #elif defined(__AVR_ATtiny26__) \
+|| defined(__AVR_ATtiny261__) \
+|| defined(__AVR_ATtiny261A__) \
+|| defined(__AVR_ATtiny461__) \
+|| defined(__AVR_ATtiny461A__) \
+|| defined(__AVR_ATtiny861__) \
+|| defined(__AVR_ATtiny861A__) \
 || defined(__AVR_ATtiny43U__)
 
     #define SLEEP_MODE_IDLE         0