[avr-libc-commit] [2185] Fix for bugs 30552 and 30569

[Anitha Boyapati]

Revision: 2185
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2185
Author:   aboyapati
Date:     2010-09-22 07:06:35 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Fix for bugs 30552 and 30569

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/NEWS
    trunk/avr-libc/include/avr/iom16u4.h
    trunk/avr-libc/include/avr/iom32u4.h
    trunk/avr-libc/include/avr/iotn43u.h

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2010-09-21 12:49:00 UTC (rev 2184)
+++ trunk/avr-libc/ChangeLog    2010-09-22 07:06:35 UTC (rev 2185)
@@ -1,3 +1,14 @@
+2010-09-22  Anitha Boyapti  <address@hidden>
+
+       Fix for bugs #30552 and #30569. 
+       Thanks to Frederic Nadeau for the patch.
+       * include/avr/iom16u4.h: Modify ADCTS3 to 3.
+       * include/avr/iom32u4.h: Add definition for ADCW.
+       Add__ASSEMBLER__ macro for ADC.
+       Modify ADCTS3 to 3
+       * include/avr/iotn43u.h: Add definition for ADCW.
+       Add__ASSEMBLER__ macro for ADC.
+
 2010-09-21  Anitha Boyapati  <address@hidden>
 
        * include/avr/io90pwm2b.h: Modified SPM_PAGESIZE to 64 bytes.

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2010-09-21 12:49:00 UTC (rev 2184)
+++ trunk/avr-libc/NEWS 2010-09-22 07:06:35 UTC (rev 2185)
@@ -142,6 +142,8 @@
   [#30600] Missing processor spec - wdt.h include file
   [#30597] Missing definition for ATmega16/32/64m1/c1
   [#30475] SPM_PAGESIZE is incorrect in io90pwm3b.h and io90pwm2b.h
+  [#30552] Missing definition ADCW
+  [#30569] ATmega16U4/32U4 wrong bit definition
 
 * Other changes:
 

Modified: trunk/avr-libc/include/avr/iom16u4.h
===================================================================
--- trunk/avr-libc/include/avr/iom16u4.h        2010-09-21 12:49:00 UTC (rev 
2184)
+++ trunk/avr-libc/include/avr/iom16u4.h        2010-09-22 07:06:35 UTC (rev 
2185)
@@ -561,7 +561,7 @@
 #define ADTS0 0
 #define ADTS1 1
 #define ADTS2 2
-#define ADTS3 4
+#define ADTS3 3
 #define MUX5 5
 #define ACME 6
 #define ADHSM 7

Modified: trunk/avr-libc/include/avr/iom32u4.h
===================================================================
--- trunk/avr-libc/include/avr/iom32u4.h        2010-09-21 12:49:00 UTC (rev 
2184)
+++ trunk/avr-libc/include/avr/iom32u4.h        2010-09-22 07:06:35 UTC (rev 
2185)
@@ -540,7 +540,10 @@
 
 #define TIMSK5 _SFR_MEM8(0x73)
 
+#ifndef _ASSEMBLER_
 #define ADC _SFR_MEM16(0x78)
+#endif
+#define ADCW _SFR_MEM16(0x78)
 
 #define ADCL _SFR_MEM8(0x78)
 #define ADCL0 0
@@ -576,7 +579,7 @@
 #define ADTS0 0
 #define ADTS1 1
 #define ADTS2 2
-#define ADTS3 4
+#define ADTS3 3
 #define MUX5 5
 #define ACME 6
 #define ADHSM 7

Modified: trunk/avr-libc/include/avr/iotn43u.h
===================================================================
--- trunk/avr-libc/include/avr/iotn43u.h        2010-09-21 12:49:00 UTC (rev 
2184)
+++ trunk/avr-libc/include/avr/iotn43u.h        2010-09-22 07:06:35 UTC (rev 
2185)
@@ -74,7 +74,10 @@
 #define ADLAR  4
 #define ACME   6
 
+#ifndef _ASSEMBLER_
 #define ADC _SFR_IO16(0x04)
+#endif
+#define ADCW _SFR_IO16(0x04)
 
 #define ADCL _SFR_IO8(0x04)
 #define ADCL0  0