[avr-libc-commit] [2159] bug #30104: power.h - Missing "power_usart1_/enable/disable()"

[Joerg Wunsch]

Revision: 2159
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2159
Author:   joerg_wunsch
Date:     2010-06-10 16:13:40 +0000 (Thu, 10 Jun 2010)
Log Message:
-----------
bug #30104: power.h - Missing "power_usart1_/enable/disable()"
functions for ATmega644
* include/avr/power.h: Fix macros for ATmega644A/P/PA

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

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

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2010-06-10 15:48:28 UTC (rev 2158)
+++ trunk/avr-libc/ChangeLog    2010-06-10 16:13:40 UTC (rev 2159)
@@ -1,5 +1,11 @@
 2010-06-10  Joerg Wunsch <address@hidden>
 
+       bug #30104: power.h - Missing "power_usart1_/enable/disable()"
+       functions for ATmega644
+       * include/avr/power.h: Fix macros for ATmega644A/P/PA
+
+2010-06-10  Joerg Wunsch <address@hidden>
+
        Submitted by Jan Waclawek:
        Document issues around compiler optimizations and code reordering
        * doc/api/optimize.dox: New file.

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2010-06-10 15:48:28 UTC (rev 2158)
+++ trunk/avr-libc/NEWS 2010-06-10 16:13:40 UTC (rev 2159)
@@ -124,6 +124,7 @@
   [#29950] ATtiny167 SPM_PAGESIZE Discrepancy
   [#30018] Errors in include files
   [#30085] memcpy_P on XMega does not clr NVM.CMD before copy
+  [#30104] power.h - Missing "power_usart1_/enable/disable()" functions for 
ATmega644
 
 * Other changes:
 

Modified: trunk/avr-libc/include/avr/power.h
===================================================================
--- trunk/avr-libc/include/avr/power.h  2010-06-10 15:48:28 UTC (rev 2158)
+++ trunk/avr-libc/include/avr/power.h  2010-06-10 16:13:40 UTC (rev 2159)
@@ -254,13 +254,13 @@
   <tr>
     <td>power_usart1_enable()</td>
     <td>Enable the USART 1 module.</td>
-    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, ATmega164P, 
ATmega324P</td>
+    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, ATmega164P, 
ATmega324P, ATmega644</td>
   </tr>
 
   <tr>
     <td>power_usart1_disable()</td>
     <td>Disable the USART 1 module.</td>
-    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, ATmega164P, 
ATmega324P</td>
+    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, ATmega164P, 
ATmega324P, ATmega644</td>
   </tr>
 
   <tr>
@@ -883,7 +883,10 @@
 || defined(__AVR_ATmega164P__) \
 || defined(__AVR_ATmega324A__) \
 || defined(__AVR_ATmega324P__) \
-|| defined(__AVR_ATmega324PA__)
+|| defined(__AVR_ATmega324PA__) \
+|| defined(__AVR_ATmega644P__) \
+|| defined(__AVR_ATmega644A__) \
+|| defined(__AVR_ATmega644PA__)
 
 #define power_adc_enable()      (PRR0 &= (uint8_t)~(1 << PRADC))
 #define power_adc_disable()     (PRR0 |= (uint8_t)(1 << PRADC))
@@ -913,9 +916,7 @@
 #define power_all_disable()     (PRR0 |= 
(uint8_t)((1<<PRADC)|(1<<PRSPI)|(1<<PRUSART0)|(1<<PRUSART1)|(1<<PRTIM0)|(1<<PRTIM2)|(1<<PRTWI)))
 
 
-#elif defined(__AVR_ATmega644__) \
-|| defined(__AVR_ATmega644A__) \
-|| defined(__AVR_ATmega644P__)
+#elif defined(__AVR_ATmega644__)
 
 #define power_adc_enable()      (PRR0 &= (uint8_t)~(1 << PRADC))
 #define power_adc_disable()     (PRR0 |= (uint8_t)(1 << PRADC))