[avr-libc-commit] [2172] 2010-06-15 Eric B.

[Eric Weddington]

Revision: 2172
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2172
Author:   arcanum
Date:     2010-06-16 05:26:35 +0000 (Wed, 16 Jun 2010)
Log Message:
-----------
2010-06-15  Eric B. Weddington  <address@hidden>

        Fix bug #30148.
        * include/avr/iox128a1.h: Rename HIRES.CTRL to HIRES.CTRLA.
        * NEWS: Add to fixed bug list.

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

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

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2010-06-15 14:26:56 UTC (rev 2171)
+++ trunk/avr-libc/ChangeLog    2010-06-16 05:26:35 UTC (rev 2172)
@@ -1,5 +1,11 @@
 2010-06-15  Eric B. Weddington  <address@hidden>
 
+       Fix bug #30148.
+       * include/avr/iox128a1.h: Rename HIRES.CTRL to HIRES.CTRLA.
+       * NEWS: Add to fixed bug list.
+
+2010-06-15  Eric B. Weddington  <address@hidden>
+
        * configure.ac: Change ATxemga32A4 from avrxmega3 to avrxmega2.
        * devtools/gen-avr-lib-tree.sh: Same.
        * doc/api/using-tools.dox: Same.

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2010-06-15 14:26:56 UTC (rev 2171)
+++ trunk/avr-libc/NEWS 2010-06-16 05:26:35 UTC (rev 2172)
@@ -125,6 +125,7 @@
   [#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
+  [#30148] XMEGA register discrepancy
 
 * Other changes:
 

Modified: trunk/avr-libc/include/avr/iox128a1.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a1.h       2010-06-15 14:26:56 UTC (rev 
2171)
+++ trunk/avr-libc/include/avr/iox128a1.h       2010-06-16 05:26:35 UTC (rev 
2172)
@@ -2232,7 +2232,7 @@
 /* High-Resolution Extension */
 typedef struct HIRES_struct
 {
-    register8_t CTRL;  /* Control Register */
+    register8_t CTRLA;  /* Control Register A */
 } HIRES_t;
 
 /* Clock Selection */
@@ -3396,7 +3396,7 @@
 #define AWEXC_OUTOVEN  _SFR_MEM8(0x088C)
 
 /* HIRESC - High-Resolution Extension C */
-#define HIRESC_CTRL  _SFR_MEM8(0x0890)
+#define HIRESC_CTRLA  _SFR_MEM8(0x0890)
 
 /* USARTC0 - Universal Asynchronous Receiver-Transmitter C0 */
 #define USARTC0_DATA  _SFR_MEM8(0x08A0)
@@ -3476,7 +3476,7 @@
 #define TCD1_CCBBUF  _SFR_MEM16(0x097A)
 
 /* HIRESD - High-Resolution Extension D */
-#define HIRESD_CTRL  _SFR_MEM8(0x0990)
+#define HIRESD_CTRLA  _SFR_MEM8(0x0990)
 
 /* USARTD0 - Universal Asynchronous Receiver-Transmitter D0 */
 #define USARTD0_DATA  _SFR_MEM8(0x09A0)
@@ -3564,7 +3564,7 @@
 #define AWEXE_OUTOVEN  _SFR_MEM8(0x0A8C)
 
 /* HIRESE - High-Resolution Extension E */
-#define HIRESE_CTRL  _SFR_MEM8(0x0A90)
+#define HIRESE_CTRLA  _SFR_MEM8(0x0A90)
 
 /* USARTE0 - Universal Asynchronous Receiver-Transmitter E0 */
 #define USARTE0_DATA  _SFR_MEM8(0x0AA0)
@@ -3639,7 +3639,7 @@
 #define TCF1_CCBBUF  _SFR_MEM16(0x0B7A)
 
 /* HIRESF - High-Resolution Extension F */
-#define HIRESF_CTRL  _SFR_MEM8(0x0B90)
+#define HIRESF_CTRLA  _SFR_MEM8(0x0B90)
 
 /* USARTF0 - Universal Asynchronous Receiver-Transmitter F0 */
 #define USARTF0_DATA  _SFR_MEM8(0x0BA0)
@@ -6415,7 +6415,7 @@
 #define AWEX_DTLSBUFV_bp  0  /* Dead Time Low Side Buffer Valid bit position. 
*/
 
 
-/* HIRES.CTRL  bit masks and bit positions */
+/* HIRES.CTRLA  bit masks and bit positions */
 #define HIRES_HREN_gm  0x03  /* High Resolution Enable group mask. */
 #define HIRES_HREN_gp  0  /* High Resolution Enable group position. */
 #define HIRES_HREN0_bm  (1<<0)  /* High Resolution Enable bit 0 mask. */