- rel 4

[packages/crossavr-libc.git] / 502-avr-libc-bug12838.patch

diff --git a/502-avr-libc-bug12838.patch b/502-avr-libc-bug12838.patch
index 112c49c86fb6ea243b652677c999779e00cba1c4..bca4fc06c2bc1bc52c345f533316b0d0fc2271b5 100644 (file)
--- a/502-avr-libc-bug12838.patch
+++ b/502-avr-libc-bug12838.patch
@@ -1,7 +1,7 @@
 diff -Naurp include/avr/power.h include/avr/power.h
---- include/avr/power.h        2012-11-03 00:55:56.898279648 +0530
-+++ include/avr/power.h        2012-11-03 00:56:08.170335618 +0530
-@@ -2011,9 +2011,18 @@ do{ \
+--- include/avr/power.h        2013-03-15 12:22:13.000000000 +0530
++++ include/avr/power.h        2013-03-15 12:22:26.000000000 +0530
+@@ -2171,9 +2171,18 @@ do{ \
  #define power_spi_enable()      (PRR &= (uint8_t)~(1 << PRSPI))
  #define power_spi_disable()     (PRR |= (uint8_t)(1 << PRSPI))
  
@@ -20,7 +20,7 @@ diff -Naurp include/avr/power.h include/avr/power.h
  #define power_timer0_enable()   (PRR &= (uint8_t)~(1 << PRTIM0))
  #define power_timer0_disable()  (PRR |= (uint8_t)(1 << PRTIM0))
  
-@@ -2032,9 +2041,18 @@ do{ \
+@@ -2192,9 +2201,18 @@ do{ \
  #define power_psc2_enable()     (PRR &= (uint8_t)~(1 << PRPSC2))
  #define power_psc2_disable()    (PRR |= (uint8_t)(1 << PRPSC2))
  
@@ -39,7 +39,7 @@ diff -Naurp include/avr/power.h include/avr/power.h
  
  #elif defined(__AVR_AT90PWM81__) \
  || defined(__AVR_AT90PWM161__)
-@@ -2066,9 +2084,11 @@ do{ \
+@@ -2226,9 +2244,11 @@ do{ \
  || defined(__AVR_ATmega165PA__) \
  || defined(__AVR_ATmega325__) \
  || defined(__AVR_ATmega325A__) \
@@ -51,7 +51,7 @@ diff -Naurp include/avr/power.h include/avr/power.h
  || defined(__AVR_ATmega3250PA__) \
  || defined(__AVR_ATmega645__) \
  || defined(__AVR_ATmega645A__) \
-@@ -2229,8 +2249,6 @@ do{ \
+@@ -2389,8 +2409,6 @@ do{ \
  || defined(__AVR_ATmega168PA__) \
  || defined(__AVR_ATmega328__) \
  || defined(__AVR_ATmega328P__) \
@@ -60,7 +60,7 @@ diff -Naurp include/avr/power.h include/avr/power.h
  || defined(__AVR_ATtiny828__)
  
  #define power_adc_enable()      (PRR &= (uint8_t)~(1 << PRADC))
-@@ -2270,6 +2288,28 @@ do{ \
+@@ -2430,6 +2448,28 @@ do{ \
  
  #endif
  
@@ -89,32 +89,17 @@ diff -Naurp include/avr/power.h include/avr/power.h
  #elif defined(__AVR_ATtiny24__) \
  || defined(__AVR_ATtiny24A__) \
  || defined(__AVR_ATtiny44__) \
-@@ -2477,6 +2517,24 @@ do{ \
+@@ -2639,7 +2679,8 @@ do{ \
  
  #endif
  
-+#elif defined(__AVR_ATmega64HVE__)
-+
-+
-+#define power_lin_enable()      (PRR0 &= (uint8_t)~(1 << PRLIN))
-+#define power_lin_disable()     (PRR0 |= (uint8_t)(1 << PRLIN))
-+
-+#define power_timer0_enable()   (PRR0 &= (uint8_t)~(1 << PRTIM0))
-+#define power_timer0_disable()  (PRR0 |= (uint8_t)(1 << PRTIM0))
-+
-+#define power_timer1_enable()   (PRR0 &= (uint8_t)~(1 << PRTIM1))
-+#define power_timer1_disable()  (PRR0 |= (uint8_t)(1 << PRTIM1))
-+
-+#define power_spi_enable()      (PRR0 &= (uint8_t)~(1 << PRSPI))
-+#define power_spi_disable()     (PRR0 |= (uint8_t)(1 << PRSPI))
-+
-+#define power_all_enable()      (PRR0 &= (uint8_t)~((1<<PRLIN)|(1<<PRTIM0)|(1<<PRTIM1)|(1<<PRSPI)))
-+#define power_all_disable()     (PRR0 |= (uint8_t)((1<<PRLIN)|(1<<PRTIM0)|(1<<PRTIM1)|(1<<PRSPI)))
-+
- #elif defined(__AVR_ATmega16M1__) \
- || defined(__AVR_ATmega32C1__) \
- || defined(__AVR_ATmega32M1__) \
-@@ -2741,9 +2799,11 @@ do{ \
+-#elif defined(__AVR_ATmega64HVE2__) 
++#elif defined(__AVR_ATmega64HVE__) \
++|| defined(__AVR_ATmega64HVE2__) 
+ 
+ #define power_lin_enable()      (PRR0 &= (uint8_t)~(1 << PRLIN))
+ #define power_lin_disable()     (PRR0 |= (uint8_t)(1 << PRLIN))
+@@ -2995,9 +3036,11 @@ do{ \
  || defined(__AVR_ATmega324P__) \
  || defined(__AVR_ATmega325__) \
  || defined(__AVR_ATmega325A__) \
@@ -126,11 +111,11 @@ diff -Naurp include/avr/power.h include/avr/power.h
  || defined(__AVR_ATmega3250PA__) \
  || defined(__AVR_ATmega328__) \
  || defined(__AVR_ATmega328P__) \
-@@ -2885,6 +2945,7 @@ Gets and returns the clock prescaler reg
+@@ -3143,6 +3186,7 @@ Gets and returns the clock prescaler reg
  
  #elif defined(__AVR_ATmega16HVB__) \
  || defined(__AVR_ATmega16HVBREVB__) \
 +|| defined(__AVR_ATmega64HVE__) \
  || defined(__AVR_ATmega32HVB__) \
- || defined(__AVR_ATmega32HVBREVB__)
- 
+ || defined(__AVR_ATmega32HVBREVB__) \
+ || defined(__AVR_ATmega64HVE2__)