[avr-libc-commit] [2246] Add new names for CLKSTA/CLKSEL0/1 for AT90USB82/162.

[Joerg Wunsch]

Revision: 2246
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2246
Author:   joerg_wunsch
Date:     2011-05-14 20:02:02 +0000 (Sat, 14 May 2011)
Log Message:
-----------
Add new names for CLKSTA/CLKSEL0/1 for AT90USB82/162.

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

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2011-05-12 22:42:21 UTC (rev 2245)
+++ trunk/avr-libc/ChangeLog    2011-05-14 20:02:02 UTC (rev 2246)
@@ -1,3 +1,9 @@
+2011-05-14  Joerg Wunsch <address@hidden>
+
+       Reported by Markus Lampert:
+       * include/avr/iousbxx2.h: Add new names for CLKSTA, CLKSEL0,
+       CLKSEL1 (old names have been without the `L').
+
 2011-05-12  Eric B. Weddington  <address@hidden>
 
        Patch #7226. Thanks to Avik Juneja for the patch.

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2011-05-12 22:42:21 UTC (rev 2245)
+++ trunk/avr-libc/NEWS 2011-05-14 20:02:02 UTC (rev 2246)
@@ -14,6 +14,7 @@
   [#33130] twitest.c source code is broken
   [#33230] Sleep modes have incorrect names for ATtiny261/461/861
   [#33238] Wrong _VECTORS_SIZE for mega8U2 et al
+  [no-id]  New names for CLKSTA/CLKSEL0/1 for AT90USB82/162
   system when power_all_disable() is used
 
 * New devices supported:

Modified: trunk/avr-libc/include/avr/iousbxx2.h
===================================================================
--- trunk/avr-libc/include/avr/iousbxx2.h       2011-05-12 22:42:21 UTC (rev 
2245)
+++ trunk/avr-libc/include/avr/iousbxx2.h       2011-05-14 20:02:02 UTC (rev 
2246)
@@ -507,7 +507,8 @@
 
 /* Reserved [0xCF] */
 
-#define CKSEL0  _SFR_MEM8(0XD0)
+#define CKSEL0  _SFR_MEM8(0XD0)        /* old name; up to AVR Studio v 4.13 */
+#define CLKSEL0 _SFR_MEM8(0XD0)        /* since AVR Studio v 4.14 */
 #define RCSUT1  7
 #define RCSUT0  6
 #define EXSUT1  5
@@ -516,7 +517,8 @@
 #define EXTE    2
 #define CLKS    0
 
-#define CKSEL1  _SFR_MEM8(0XD1)
+#define CKSEL1  _SFR_MEM8(0XD1)        /* old name */
+#define CLKSEL1 _SFR_MEM8(0XD1)
 #define RCCKSEL3 7
 #define RCCKSEL2 6
 #define RCCKSEL1 5
@@ -526,7 +528,8 @@
 #define EXCKSEL1 1
 #define EXCKSEL0 0
 
-#define CKSTA   _SFR_MEM8(0XD2)
+#define CKSTA   _SFR_MEM8(0XD2)        /* old name */
+#define CLKSTA  _SFR_MEM8(0XD2)
 #define RCON    1
 #define EXTON   0