[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[avr-libc-commit] [2194] 2010-11-16 Eric B.
|
From: |
Eric Weddington |
|
Subject: |
[avr-libc-commit] [2194] 2010-11-16 Eric B. |
|
Date: |
Tue, 16 Nov 2010 15:10:52 +0000 |
Revision: 2194
http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2194
Author: arcanum
Date: 2010-11-16 15:10:51 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
2010-11-16 Eric B. Weddington <address@hidden>
Fix Atmel bug #12536.
* include/avr/iox64d3.h: Remove CALCTRL definitions.
* include/avr/iox64a3.h: Same.
* include/avr/iox64a1.h: Same.
* include/avr/iox32d4.h: Same.
* include/avr/iox32a4.h: Same.
* include/avr/iox256a3b.h: Same.
* include/avr/iox256a3.h: Same.
* include/avr/iox192d3.h: Same.
* include/avr/iox192a3.h: Same.
* include/avr/iox16d4.h: Same.
* include/avr/iox16a4.h: Same.
* include/avr/iox128d3.h: Same.
* include/avr/iox128a3.h: Same.
* include/avr/iox128a1.h: Same.
* NEWS: Add to fixed bugs list.
Ticket Links:
:-----------
http://savannah.gnu.org/bugs/?12536
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/iox128d3.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/iox192d3.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
trunk/avr-libc/include/avr/iox64d3.h
Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog 2010-11-08 14:44:33 UTC (rev 2193)
+++ trunk/avr-libc/ChangeLog 2010-11-16 15:10:51 UTC (rev 2194)
@@ -1,3 +1,22 @@
+2010-11-16 Eric B. Weddington <address@hidden>
+
+ Fix Atmel bug #12536.
+ * include/avr/iox64d3.h: Remove CALCTRL definitions.
+ * include/avr/iox64a3.h: Same.
+ * include/avr/iox64a1.h: Same.
+ * include/avr/iox32d4.h: Same.
+ * include/avr/iox32a4.h: Same.
+ * include/avr/iox256a3b.h: Same.
+ * include/avr/iox256a3.h: Same.
+ * include/avr/iox192d3.h: Same.
+ * include/avr/iox192a3.h: Same.
+ * include/avr/iox16d4.h: Same.
+ * include/avr/iox16a4.h: Same.
+ * include/avr/iox128d3.h: Same.
+ * include/avr/iox128a3.h: Same.
+ * include/avr/iox128a1.h: Same.
+ * NEWS: Add to fixed bugs list.
+
2010-11-08 Eric B. Weddington <address@hidden>
* include/avr/iom3000.h: Fix typo.
Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2010-11-08 14:44:33 UTC (rev 2193)
+++ trunk/avr-libc/NEWS 2010-11-16 15:10:51 UTC (rev 2194)
@@ -2,6 +2,7 @@
* Bugs fixed:
+ [Atmel: 12536] Remove CALCTRL in xmega header files.
[#30783] Missing prototype in power.h
* New devices supported:
Modified: trunk/avr-libc/include/avr/iox128a1.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a1.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox128a1.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -1225,7 +1225,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2879,7 +2879,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -2914,7 +2913,6 @@
#define ADCB_REFCTRL _SFR_MEM8(0x0242)
#define ADCB_EVCTRL _SFR_MEM8(0x0243)
#define ADCB_PRESCALER _SFR_MEM8(0x0244)
-#define ADCB_CALCTRL _SFR_MEM8(0x0245)
#define ADCB_INTFLAGS _SFR_MEM8(0x0246)
#define ADCB_CAL _SFR_MEM16(0x024C)
#define ADCB_CH0RES _SFR_MEM16(0x0250)
@@ -5221,11 +5219,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH3IF_bm 0x08 /* Channel 3 Interrupt Flag bit mask. */
#define ADC_CH3IF_bp 3 /* Channel 3 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox128a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a3.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox128a3.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -1225,7 +1225,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2870,7 +2870,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -2905,7 +2904,6 @@
#define ADCB_REFCTRL _SFR_MEM8(0x0242)
#define ADCB_EVCTRL _SFR_MEM8(0x0243)
#define ADCB_PRESCALER _SFR_MEM8(0x0244)
-#define ADCB_CALCTRL _SFR_MEM8(0x0245)
#define ADCB_INTFLAGS _SFR_MEM8(0x0246)
#define ADCB_CAL _SFR_MEM16(0x024C)
#define ADCB_CH0RES _SFR_MEM16(0x0250)
@@ -5034,11 +5032,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH3IF_bm 0x08 /* Channel 3 Interrupt Flag bit mask. */
#define ADC_CH3IF_bp 3 /* Channel 3 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox128d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox128d3.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox128d3.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -978,7 +978,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2377,7 +2377,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -4008,11 +4007,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH0IF_bm 0x01 /* Channel 0 Interrupt Flag bit mask. */
#define ADC_CH0IF_bp 0 /* Channel 0 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox16a4.h
===================================================================
--- trunk/avr-libc/include/avr/iox16a4.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox16a4.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -1225,7 +1225,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2858,7 +2858,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -4848,11 +4847,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH3IF_bm 0x08 /* Channel 3 Interrupt Flag bit mask. */
#define ADC_CH3IF_bp 3 /* Channel 3 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox16d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox16d4.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox16d4.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -996,7 +996,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2408,7 +2408,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -3962,11 +3961,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH0IF_bm 0x01 /* Channel 0 Interrupt Flag bit mask. */
#define ADC_CH0IF_bp 0 /* Channel 0 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox192a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox192a3.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox192a3.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -1225,7 +1225,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2870,7 +2870,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -2905,7 +2904,6 @@
#define ADCB_REFCTRL _SFR_MEM8(0x0242)
#define ADCB_EVCTRL _SFR_MEM8(0x0243)
#define ADCB_PRESCALER _SFR_MEM8(0x0244)
-#define ADCB_CALCTRL _SFR_MEM8(0x0245)
#define ADCB_INTFLAGS _SFR_MEM8(0x0246)
#define ADCB_CAL _SFR_MEM16(0x024C)
#define ADCB_CH0RES _SFR_MEM16(0x0250)
@@ -5034,11 +5032,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH3IF_bm 0x08 /* Channel 3 Interrupt Flag bit mask. */
#define ADC_CH3IF_bp 3 /* Channel 3 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox192d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox192d3.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox192d3.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -978,7 +978,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2377,7 +2377,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -4008,11 +4007,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH0IF_bm 0x01 /* Channel 0 Interrupt Flag bit mask. */
#define ADC_CH0IF_bp 0 /* Channel 0 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox256a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox256a3.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -1225,7 +1225,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2870,7 +2870,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -2905,7 +2904,6 @@
#define ADCB_REFCTRL _SFR_MEM8(0x0242)
#define ADCB_EVCTRL _SFR_MEM8(0x0243)
#define ADCB_PRESCALER _SFR_MEM8(0x0244)
-#define ADCB_CALCTRL _SFR_MEM8(0x0245)
#define ADCB_INTFLAGS _SFR_MEM8(0x0246)
#define ADCB_CAL _SFR_MEM16(0x024C)
#define ADCB_CH0RES _SFR_MEM16(0x0250)
@@ -5034,11 +5032,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH3IF_bm 0x08 /* Channel 3 Interrupt Flag bit mask. */
#define ADC_CH3IF_bp 3 /* Channel 3 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox256a3b.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3b.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox256a3b.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -1226,7 +1226,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2876,7 +2876,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -2911,7 +2910,6 @@
#define ADCB_REFCTRL _SFR_MEM8(0x0242)
#define ADCB_EVCTRL _SFR_MEM8(0x0243)
#define ADCB_PRESCALER _SFR_MEM8(0x0244)
-#define ADCB_CALCTRL _SFR_MEM8(0x0245)
#define ADCB_INTFLAGS _SFR_MEM8(0x0246)
#define ADCB_CAL _SFR_MEM16(0x024C)
#define ADCB_CH0RES _SFR_MEM16(0x0250)
@@ -5021,11 +5019,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH3IF_bm 0x08 /* Channel 3 Interrupt Flag bit mask. */
#define ADC_CH3IF_bp 3 /* Channel 3 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox32a4.h
===================================================================
--- trunk/avr-libc/include/avr/iox32a4.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox32a4.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -1225,7 +1225,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2858,7 +2858,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -4848,11 +4847,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH3IF_bm 0x08 /* Channel 3 Interrupt Flag bit mask. */
#define ADC_CH3IF_bp 3 /* Channel 3 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox32d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox32d4.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox32d4.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -978,7 +978,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2373,7 +2373,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -3929,11 +3928,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH0IF_bm 0x01 /* Channel 0 Interrupt Flag bit mask. */
#define ADC_CH0IF_bp 0 /* Channel 0 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox64a1.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a1.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox64a1.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -1225,7 +1225,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2879,7 +2879,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -2914,7 +2913,6 @@
#define ADCB_REFCTRL _SFR_MEM8(0x0242)
#define ADCB_EVCTRL _SFR_MEM8(0x0243)
#define ADCB_PRESCALER _SFR_MEM8(0x0244)
-#define ADCB_CALCTRL _SFR_MEM8(0x0245)
#define ADCB_INTFLAGS _SFR_MEM8(0x0246)
#define ADCB_CAL _SFR_MEM16(0x024C)
#define ADCB_CH0RES _SFR_MEM16(0x0250)
@@ -5221,11 +5219,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH3IF_bm 0x08 /* Channel 3 Interrupt Flag bit mask. */
#define ADC_CH3IF_bp 3 /* Channel 3 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox64a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a3.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox64a3.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -1225,7 +1225,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2870,7 +2870,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -2905,7 +2904,6 @@
#define ADCB_REFCTRL _SFR_MEM8(0x0242)
#define ADCB_EVCTRL _SFR_MEM8(0x0243)
#define ADCB_PRESCALER _SFR_MEM8(0x0244)
-#define ADCB_CALCTRL _SFR_MEM8(0x0245)
#define ADCB_INTFLAGS _SFR_MEM8(0x0246)
#define ADCB_CAL _SFR_MEM16(0x024C)
#define ADCB_CH0RES _SFR_MEM16(0x0250)
@@ -5034,11 +5032,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH3IF_bm 0x08 /* Channel 3 Interrupt Flag bit mask. */
#define ADC_CH3IF_bp 3 /* Channel 3 Interrupt Flag bit position. */
Modified: trunk/avr-libc/include/avr/iox64d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox64d3.h 2010-11-08 14:44:33 UTC (rev
2193)
+++ trunk/avr-libc/include/avr/iox64d3.h 2010-11-16 15:10:51 UTC (rev
2194)
@@ -978,7 +978,7 @@
register8_t REFCTRL; /* Reference Control */
register8_t EVCTRL; /* Event Control */
register8_t PRESCALER; /* Clock Prescaler */
- register8_t CALCTRL; /* Calibration Control Register */
+ register8_t reserved_0x05;
register8_t INTFLAGS; /* Interrupt Flags */
register8_t reserved_0x07;
register8_t reserved_0x08;
@@ -2379,7 +2379,6 @@
#define ADCA_REFCTRL _SFR_MEM8(0x0202)
#define ADCA_EVCTRL _SFR_MEM8(0x0203)
#define ADCA_PRESCALER _SFR_MEM8(0x0204)
-#define ADCA_CALCTRL _SFR_MEM8(0x0205)
#define ADCA_INTFLAGS _SFR_MEM8(0x0206)
#define ADCA_CAL _SFR_MEM16(0x020C)
#define ADCA_CH0RES _SFR_MEM16(0x0210)
@@ -4022,11 +4021,6 @@
#define ADC_PRESCALER2_bp 2 /* Clock Prescaler Selection bit 2 position. */
-/* ADC.CALCTRL bit masks and bit positions */
-#define ADC_CAL_bm 0x01 /* ADC Calibration Start bit mask. */
-#define ADC_CAL_bp 0 /* ADC Calibration Start bit position. */
-
-
/* ADC.INTFLAGS bit masks and bit positions */
#define ADC_CH0IF_bm 0x01 /* Channel 0 Interrupt Flag bit mask. */
#define ADC_CH0IF_bp 0 /* Channel 0 Interrupt Flag bit position. */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [avr-libc-commit] [2194] 2010-11-16 Eric B.,
Eric Weddington <=