avr-libc-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[avr-libc-commit] [2206] 2011-02-11 Anitha Boyapati <address@hidden>


From: Anitha Boyapati
Subject: [avr-libc-commit] [2206] 2011-02-11 Anitha Boyapati <address@hidden>
Date: Fri, 11 Feb 2011 06:58:03 +0000

Revision: 2206
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2206
Author:   aboyapati
Date:     2011-02-11 06:58:02 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
2011-02-11  Anitha Boyapati <address@hidden>


    Thanks to Praveen Kaushik <address@hidden> for
        the fix for #bug31990.
        * include/avr/io90pwm81.h: PRPSC0 is renamed to PRPSCR in sync
        with device XML file.
        * include/avr/power.h:  power_psc0_enable()/disable() have been
        renamed to power_pscr_enable()/disable(). Documentation changes
        to include PWM81 are also done.
                        

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

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2011-02-09 20:53:04 UTC (rev 2205)
+++ trunk/avr-libc/ChangeLog    2011-02-11 06:58:02 UTC (rev 2206)
@@ -1,3 +1,16 @@
+2011-02-11  Anitha Boyapati <address@hidden>
+
+
+       Thanks to Praveen Kaushik <address@hidden> for
+       the fix for #bug31990.
+       * include/avr/io90pwm81.h: PRPSC0 is renamed to PRPSCR in sync 
+       with device XML file.
+       * include/avr/power.h:  power_psc0_enable()/disable() have been 
+       renamed to power_pscr_enable()/disable(). Documentation changes
+       to include PWM81 are also done.
+
+
+
 2011-02-09  Joerg Wunsch <address@hidden>
 
        * include/avr/iom8x.h (_VECTORS_SIZE): fix wrong vector table size

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2011-02-09 20:53:04 UTC (rev 2205)
+++ trunk/avr-libc/NEWS 2011-02-11 06:58:02 UTC (rev 2206)
@@ -156,6 +156,7 @@
   [#30735] bug in example twitest
   [#31086] ATTINY88 RAMEND value not set to correct value in iotn88.h
   [#30363] _delay_xx() functions in <util/delay.h> are broken
+  [#31990] PRPSC0 used in power.h for AT90PWM81 instead of PRPSCR
 
 * Other changes:
 

Modified: trunk/avr-libc/include/avr/io90pwm81.h
===================================================================
--- trunk/avr-libc/include/avr/io90pwm81.h      2011-02-09 20:53:04 UTC (rev 
2205)
+++ trunk/avr-libc/include/avr/io90pwm81.h      2011-02-11 06:58:02 UTC (rev 
2206)
@@ -854,7 +854,7 @@
 #define PRADC 0
 #define PRSPI 2
 #define PRTIM1 4
-#define PRPSC0 5
+#define PRPSCR 5
 #define PRPSC2 7
 
 #define PLLCSR _SFR_MEM8(0x87)

Modified: trunk/avr-libc/include/avr/power.h
===================================================================
--- trunk/avr-libc/include/avr/power.h  2011-02-09 20:53:04 UTC (rev 2205)
+++ trunk/avr-libc/include/avr/power.h  2011-02-11 06:58:02 UTC (rev 2206)
@@ -74,13 +74,13 @@
   <tr>
     <td>power_adc_enable()</td>
     <td>Enable the Analog to Digital Converter module.</td>
-    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, ATmega165, 
ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, ATmega645, 
ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, ATmega3290, 
ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, ATmega644, 
ATmega48, ATmega88, ATmega168, ATtiny24, ATtiny44, ATtiny84, ATtiny84A, 
ATtiny25, ATtiny45, ATtiny85, ATtiny261, ATtiny461, ATtiny861</td>
+    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, AT90PWM81, 
ATmega165, ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, 
ATmega645, ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, 
ATmega3290, ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, 
ATmega644, ATmega48, ATmega88, ATmega168, ATtiny24, ATtiny44, ATtiny84, 
ATtiny84A, ATtiny25, ATtiny45, ATtiny85, ATtiny261, ATtiny461, ATtiny861</td>
   </tr>
 
   <tr>
     <td>power_adc_disable()</td>
     <td>Disable the Analog to Digital Converter module.</td>
-    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, ATmega165, 
ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, ATmega645, 
ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, ATmega3290, 
ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, ATmega644, 
ATmega48, ATmega88, ATmega168, ATtiny24, ATtiny44, ATtiny84, ATtiny84A, 
ATtiny25, ATtiny45, ATtiny85, ATtiny261, ATtiny461, ATtiny861</td>
+    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, AT90PWM81, 
ATmega165, ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, 
ATmega645, ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, 
ATmega3290, ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, 
ATmega644, ATmega48, ATmega88, ATmega168, ATtiny24, ATtiny44, ATtiny84, 
ATtiny84A, ATtiny25, ATtiny45, ATtiny85, ATtiny261, ATtiny461, ATtiny861</td>
   </tr>
 
   <tr>
@@ -96,6 +96,18 @@
   </tr>
 
   <tr>
+    <td>power_pscr_enable()</td>
+    <td>Enable the Reduced Power Stage Controller module.</td>
+    <td>AT90PWM81</td>
+  </tr>
+
+  <tr>
+    <td>power_pscr_disable()</td>
+    <td>Disable the Reduced Power Stage Controller module.</td>
+    <td>AT90PWM81</td>
+  </tr>
+
+  <tr>
     <td>power_psc0_enable()</td>
     <td>Enable the Power Stage Controller 0 module.</td>
     <td>AT90PWM1, AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B</td>
@@ -122,25 +134,25 @@
   <tr>
     <td>power_psc2_enable()</td>
     <td>Enable the Power Stage Controller 2 module.</td>
-    <td>AT90PWM1, AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B</td>
+    <td>AT90PWM1, AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM81</td>
   </tr>
 
   <tr>
     <td>power_psc2_disable()</td>
     <td>Disable the Power Stage Controller 2 module.</td>
-    <td>AT90PWM1, AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B</td>
+    <td>AT90PWM1, AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM81</td>
   </tr>
 
   <tr>
     <td>power_spi_enable()</td>
     <td>Enable the Serial Peripheral Interface module.</td>
-    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, ATmega165, 
ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, ATmega645, 
ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, ATmega3290, 
ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, ATmega644, 
ATmega48, ATmega88, ATmega168</td>
+    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, AT90PWM81, 
ATmega165, ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, 
ATmega645, ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, 
ATmega3290, ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, 
ATmega644, ATmega48, ATmega88, ATmega168</td>
   </tr>
 
   <tr>
     <td>power_spi_disable()</td>
     <td>Disable the Serial Peripheral Interface module.</td>
-    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, ATmega165, 
ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, ATmega645, 
ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, ATmega3290, 
ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, ATmega644, 
ATmega48, ATmega88, ATmega168</td>
+    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, AT90PWM81, 
ATmega165, ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, 
ATmega645, ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, 
ATmega3290, ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, 
ATmega644, ATmega48, ATmega88, ATmega168</td>
   </tr>
 
   <tr>
@@ -158,13 +170,13 @@
   <tr>
     <td>power_timer1_enable()</td>
     <td>Enable the Timer 1 module.</td>
-    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, ATmega165, 
ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, ATmega645, 
ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, ATmega3290, 
ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, ATmega644, 
ATmega406, ATmega48, ATmega88, ATmega168, ATtiny24, ATtiny44, ATtiny84, 
ATtiny84A, ATtiny25, ATtiny45, ATtiny85, ATtiny261, ATtiny461, ATtiny861</td>
+    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, AT90PWM81, 
ATmega165, ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, 
ATmega645, ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, 
ATmega3290, ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, 
ATmega644, ATmega406, ATmega48, ATmega88, ATmega168, ATtiny24, ATtiny44, 
ATtiny84, ATtiny84A, ATtiny25, ATtiny45, ATtiny85, ATtiny261, ATtiny461, 
ATtiny861</td>
   </tr>
 
   <tr>
     <td>power_timer1_disable()</td>
     <td>Disable the Timer 1 module.</td>
-    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, ATmega165, 
ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, ATmega645, 
ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, ATmega3290, 
ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, ATmega644, 
ATmega406, ATmega48, ATmega88, ATmega168, ATtiny24, ATtiny44, ATtiny84, 
ATtiny84A, ATtiny25, ATtiny45, ATtiny85, ATtiny261, ATtiny461, ATtiny861</td>
+    <td>ATmega640, ATmega1280, ATmega1281, ATmega128RFA1, ATmega2560, 
ATmega2561, AT90USB646, AT90USB647, AT90USB1286, AT90USB1287, AT90PWM1, 
AT90PWM2, AT90PWM2B, AT90PWM3, AT90PWM3B, AT90PWM216, AT90PWM316, AT90PWM81, 
ATmega165, ATmega165P, ATmega325, ATmega325A, ATmega3250, ATmega3250A, 
ATmega645, ATmega6450, ATmega169, ATmega169P, ATmega329, ATmega329A, 
ATmega3290, ATmega3290A, ATmega649, ATmega6490, ATmega164P, ATmega324P, 
ATmega644, ATmega406, ATmega48, ATmega88, ATmega168, ATtiny24, ATtiny44, 
ATtiny84, ATtiny84A, ATtiny25, ATtiny45, ATtiny85, ATtiny261, ATtiny461, 
ATtiny861</td>
   </tr>
 
   <tr>
@@ -800,16 +812,16 @@
 #define power_timer1_enable()   (PRR &= (uint8_t)~(1 << PRTIM1))
 #define power_timer1_disable()  (PRR |= (uint8_t)(1 << PRTIM1))
 
-/* Power Stage Controller 0 */
-#define power_psc0_enable()     (PRR &= (uint8_t)~(1 << PRPSC0))
-#define power_psc0_disable()    (PRR |= (uint8_t)(1 << PRPSC0))
+/* Reduced Power Stage Controller */
+#define power_pscr_enable()     (PRR &= (uint8_t)~(1 << PRPSCR))
+#define power_pscr_disable()    (PRR |= (uint8_t)(1 << PRPSCR))
 
 /* Power Stage Controller 2 */
 #define power_psc2_enable()     (PRR &= (uint8_t)~(1 << PRPSC2))
 #define power_psc2_disable()    (PRR |= (uint8_t)(1 << PRPSC2))
 
-#define power_all_enable()      (PRR &= 
(uint8_t)~((1<<PRADC)|(1<<PRSPI)|(1<<PRTIM1)|(1<<PRPSC0)|(1<<PRPSC2)))
-#define power_all_disable()     (PRR |= 
(uint8_t)((1<<PRADC)|(1<<PRSPI)|(1<<PRTIM1)|(1<<PRPSC0)|(1<<PRPSC2)))
+#define power_all_enable()      (PRR &= 
(uint8_t)~((1<<PRADC)|(1<<PRSPI)|(1<<PRTIM1)|(1<<PRPSCR)|(1<<PRPSC2)))
+#define power_all_disable()     (PRR |= 
(uint8_t)((1<<PRADC)|(1<<PRSPI)|(1<<PRTIM1)|(1<<PRPSCR)|(1<<PRPSC2)))
 
 
 #elif defined(__AVR_ATmega165__) \




reply via email to

[Prev in Thread] Current Thread [Next in Thread]