[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[avr-libc-commit] [2200] 2010-12-13 Eric B.
|
From: |
Eric Weddington |
|
Subject: |
[avr-libc-commit] [2200] 2010-12-13 Eric B. |
|
Date: |
Tue, 14 Dec 2010 04:24:25 +0000 |
Revision: 2200
http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2200
Author: arcanum
Date: 2010-12-14 04:24:24 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
2010-12-13 Eric B. Weddington <address@hidden>
Fix for Atmel bug #12314.
* include/avr/iox192a3.h: Fix field names and macro names.
* include/avr/iox128a3.h: Same.
* include/avr/iox128a1.h: Same.
* include/avr/iox64a3.h: Same.
* include/avr/iox64a1.h: Same.
* include/avr/iox32d4.h: Same.
* include/avr/iox32a4.h: Same.
* include/avr/iox16d4.h: Same.
* include/avr/iox16a4.h: Same.
* include/avr/iox256a3b.h: Same.
* include/avr/iox256a3.h: Same.
* NEWS: Add to fixed bug list.
Ticket Links:
:-----------
http://savannah.gnu.org/bugs/?12314
Modified Paths:
--------------
trunk/avr-libc/ChangeLog
trunk/avr-libc/NEWS
trunk/avr-libc/include/avr/iox128a1.h
trunk/avr-libc/include/avr/iox128a3.h
trunk/avr-libc/include/avr/iox16a4.h
trunk/avr-libc/include/avr/iox16d4.h
trunk/avr-libc/include/avr/iox192a3.h
trunk/avr-libc/include/avr/iox256a3.h
trunk/avr-libc/include/avr/iox256a3b.h
trunk/avr-libc/include/avr/iox32a4.h
trunk/avr-libc/include/avr/iox32d4.h
trunk/avr-libc/include/avr/iox64a1.h
trunk/avr-libc/include/avr/iox64a3.h
Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog 2010-12-14 00:39:47 UTC (rev 2199)
+++ trunk/avr-libc/ChangeLog 2010-12-14 04:24:24 UTC (rev 2200)
@@ -1,5 +1,21 @@
2010-12-13 Eric B. Weddington <address@hidden>
+ Fix for Atmel bug #12314.
+ * include/avr/iox192a3.h: Fix field names and macro names.
+ * include/avr/iox128a3.h: Same.
+ * include/avr/iox128a1.h: Same.
+ * include/avr/iox64a3.h: Same.
+ * include/avr/iox64a1.h: Same.
+ * include/avr/iox32d4.h: Same.
+ * include/avr/iox32a4.h: Same.
+ * include/avr/iox16d4.h: Same.
+ * include/avr/iox16a4.h: Same.
+ * include/avr/iox256a3b.h: Same.
+ * include/avr/iox256a3.h: Same.
+ * NEWS: Add to fixed bug list.
+
+2010-12-13 Eric B. Weddington <address@hidden>
+
Fix for Atmel bug #11793.
* include/avr/iox32a4.h: Fix 4086 to 4096.
* include/avr/iox16a4.h: Same.
Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2010-12-14 00:39:47 UTC (rev 2199)
+++ trunk/avr-libc/NEWS 2010-12-14 04:24:24 UTC (rev 2200)
@@ -3,6 +3,7 @@
* Bugs fixed:
[Atmel: #11793] XMEGA A devices: 4096-cycle DAC refresh interval setting has
wrong name
+ [Atmel: #12314] Hi-Res(CTRLA) and AWex (FDEMASK)
[Atmel: #12536] Remove CALCTRL in xmega header files.
[#30783] Missing prototype in power.h
Modified: trunk/avr-libc/include/avr/iox128a1.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a1.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox128a1.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -2210,7 +2210,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -3382,7 +3382,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -3550,7 +3550,7 @@
/* AWEXE - Advanced Waveform Extension E */
#define AWEXE_CTRL _SFR_MEM8(0x0A80)
-#define AWEXE_FDEVMASK _SFR_MEM8(0x0A82)
+#define AWEXE_FDEMASK _SFR_MEM8(0x0A82)
#define AWEXE_FDCTRL _SFR_MEM8(0x0A83)
#define AWEXE_STATUS _SFR_MEM8(0x0A84)
#define AWEXE_DTBOTH _SFR_MEM8(0x0A86)
Modified: trunk/avr-libc/include/avr/iox128a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a3.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox128a3.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -2210,7 +2210,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -2232,7 +2232,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -3217,7 +3217,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -3229,7 +3229,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)
@@ -3309,7 +3309,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)
@@ -3385,7 +3385,7 @@
/* AWEXE - Advanced Waveform Extension E */
#define AWEXE_CTRL _SFR_MEM8(0x0A80)
-#define AWEXE_FDEVMASK _SFR_MEM8(0x0A82)
+#define AWEXE_FDEMASK _SFR_MEM8(0x0A82)
#define AWEXE_FDCTRL _SFR_MEM8(0x0A83)
#define AWEXE_STATUS _SFR_MEM8(0x0A84)
#define AWEXE_DTBOTH _SFR_MEM8(0x0A86)
@@ -3397,7 +3397,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)
@@ -3450,7 +3450,7 @@
#define TCF0_CCDBUF _SFR_MEM16(0x0B3E)
/* 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)
Modified: trunk/avr-libc/include/avr/iox16a4.h
===================================================================
--- trunk/avr-libc/include/avr/iox16a4.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox16a4.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -2210,7 +2210,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -2232,7 +2232,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -3138,7 +3138,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -3150,7 +3150,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)
@@ -3230,7 +3230,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)
@@ -3283,7 +3283,7 @@
#define TCE0_CCDBUF _SFR_MEM16(0x0A3E)
/* 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)
Modified: trunk/avr-libc/include/avr/iox16d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox16d4.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox16d4.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -1865,7 +1865,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -1887,7 +1887,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -2642,7 +2642,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -2654,7 +2654,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)
Modified: trunk/avr-libc/include/avr/iox192a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox192a3.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox192a3.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -2210,7 +2210,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -2232,7 +2232,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -3217,7 +3217,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -3229,7 +3229,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)
@@ -3309,7 +3309,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)
@@ -3385,7 +3385,7 @@
/* AWEXE - Advanced Waveform Extension E */
#define AWEXE_CTRL _SFR_MEM8(0x0A80)
-#define AWEXE_FDEVMASK _SFR_MEM8(0x0A82)
+#define AWEXE_FDEMASK _SFR_MEM8(0x0A82)
#define AWEXE_FDCTRL _SFR_MEM8(0x0A83)
#define AWEXE_STATUS _SFR_MEM8(0x0A84)
#define AWEXE_DTBOTH _SFR_MEM8(0x0A86)
@@ -3397,7 +3397,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)
@@ -3450,7 +3450,7 @@
#define TCF0_CCDBUF _SFR_MEM16(0x0B3E)
/* 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)
Modified: trunk/avr-libc/include/avr/iox256a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox256a3.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -2210,7 +2210,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -2232,7 +2232,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -3217,7 +3217,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -3229,7 +3229,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)
@@ -3309,7 +3309,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)
@@ -3385,7 +3385,7 @@
/* AWEXE - Advanced Waveform Extension E */
#define AWEXE_CTRL _SFR_MEM8(0x0A80)
-#define AWEXE_FDEVMASK _SFR_MEM8(0x0A82)
+#define AWEXE_FDEMASK _SFR_MEM8(0x0A82)
#define AWEXE_FDCTRL _SFR_MEM8(0x0A83)
#define AWEXE_STATUS _SFR_MEM8(0x0A84)
#define AWEXE_DTBOTH _SFR_MEM8(0x0A86)
@@ -3397,7 +3397,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)
@@ -3450,7 +3450,7 @@
#define TCF0_CCDBUF _SFR_MEM16(0x0B3E)
/* 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)
Modified: trunk/avr-libc/include/avr/iox256a3b.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3b.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox256a3b.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -2194,7 +2194,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -2216,7 +2216,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -3219,7 +3219,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -3231,7 +3231,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)
@@ -3311,7 +3311,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)
@@ -3387,7 +3387,7 @@
/* AWEXE - Advanced Waveform Extension E */
#define AWEXE_CTRL _SFR_MEM8(0x0A80)
-#define AWEXE_FDEVMASK _SFR_MEM8(0x0A82)
+#define AWEXE_FDEMASK _SFR_MEM8(0x0A82)
#define AWEXE_FDCTRL _SFR_MEM8(0x0A83)
#define AWEXE_STATUS _SFR_MEM8(0x0A84)
#define AWEXE_DTBOTH _SFR_MEM8(0x0A86)
@@ -3399,7 +3399,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)
@@ -3437,7 +3437,7 @@
#define TCF0_CCDBUF _SFR_MEM16(0x0B3E)
/* 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)
Modified: trunk/avr-libc/include/avr/iox32a4.h
===================================================================
--- trunk/avr-libc/include/avr/iox32a4.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox32a4.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -2210,7 +2210,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -2232,7 +2232,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -3138,7 +3138,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -3150,7 +3150,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)
@@ -3230,7 +3230,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)
@@ -3283,7 +3283,7 @@
#define TCE0_CCDBUF _SFR_MEM16(0x0A3E)
/* 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)
Modified: trunk/avr-libc/include/avr/iox32d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox32d4.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox32d4.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -1847,7 +1847,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -1869,7 +1869,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -2609,7 +2609,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -2621,7 +2621,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)
Modified: trunk/avr-libc/include/avr/iox64a1.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a1.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox64a1.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -2210,7 +2210,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -2232,7 +2232,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -3382,7 +3382,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -3394,7 +3394,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)
@@ -3474,7 +3474,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)
@@ -3550,7 +3550,7 @@
/* AWEXE - Advanced Waveform Extension E */
#define AWEXE_CTRL _SFR_MEM8(0x0A80)
-#define AWEXE_FDEVMASK _SFR_MEM8(0x0A82)
+#define AWEXE_FDEMASK _SFR_MEM8(0x0A82)
#define AWEXE_FDCTRL _SFR_MEM8(0x0A83)
#define AWEXE_STATUS _SFR_MEM8(0x0A84)
#define AWEXE_DTBOTH _SFR_MEM8(0x0A86)
@@ -3562,7 +3562,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)
@@ -3637,7 +3637,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)
Modified: trunk/avr-libc/include/avr/iox64a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a3.h 2010-12-14 00:39:47 UTC (rev
2199)
+++ trunk/avr-libc/include/avr/iox64a3.h 2010-12-14 04:24:24 UTC (rev
2200)
@@ -2210,7 +2210,7 @@
{
register8_t CTRL; /* Control Register */
register8_t reserved_0x01;
- register8_t FDEVMASK; /* Fault Detection Event Mask */
+ register8_t FDEMASK; /* Fault Detection Event Mask */
register8_t FDCTRL; /* Fault Detection Control Register */
register8_t STATUS; /* Status Register */
register8_t reserved_0x05;
@@ -2232,7 +2232,7 @@
/* High-Resolution Extension */
typedef struct HIRES_struct
{
- register8_t CTRL; /* Control Register */
+ register8_t CTRLA; /* Control Register */
} HIRES_t;
/* Clock Selection */
@@ -3217,7 +3217,7 @@
/* AWEXC - Advanced Waveform Extension C */
#define AWEXC_CTRL _SFR_MEM8(0x0880)
-#define AWEXC_FDEVMASK _SFR_MEM8(0x0882)
+#define AWEXC_FDEMASK _SFR_MEM8(0x0882)
#define AWEXC_FDCTRL _SFR_MEM8(0x0883)
#define AWEXC_STATUS _SFR_MEM8(0x0884)
#define AWEXC_DTBOTH _SFR_MEM8(0x0886)
@@ -3229,7 +3229,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)
@@ -3309,7 +3309,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)
@@ -3385,7 +3385,7 @@
/* AWEXE - Advanced Waveform Extension E */
#define AWEXE_CTRL _SFR_MEM8(0x0A80)
-#define AWEXE_FDEVMASK _SFR_MEM8(0x0A82)
+#define AWEXE_FDEMASK _SFR_MEM8(0x0A82)
#define AWEXE_FDCTRL _SFR_MEM8(0x0A83)
#define AWEXE_STATUS _SFR_MEM8(0x0A84)
#define AWEXE_DTBOTH _SFR_MEM8(0x0A86)
@@ -3397,7 +3397,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)
@@ -3450,7 +3450,7 @@
#define TCF0_CCDBUF _SFR_MEM16(0x0B3E)
/* 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)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [avr-libc-commit] [2200] 2010-12-13 Eric B.,
Eric Weddington <=