[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[avr-libc-commit] [2225] 2011-03-02 Eric B.
|
From: |
Eric Weddington |
|
Subject: |
[avr-libc-commit] [2225] 2011-03-02 Eric B. |
|
Date: |
Wed, 02 Mar 2011 16:27:27 +0000 |
Revision: 2225
http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2225
Author: arcanum
Date: 2011-03-02 16:27:26 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
2011-03-02 Eric B. Weddington <address@hidden>
Fix for bug #23234.
* include/avr/iousbxx2.h: Add *_vect_num definitions.
* include/avr/iousbxx6_7.h: Same.
* include/avr/iotnx61.h: Same.
* include/avr/iotn43u.h: Same.
* include/avr/iotn48.h: Same.
* include/avr/iotn88.h: Same.
* include/avr/iotnx4.h: Same.
* include/avr/iotnx5.h: Same.
* include/avr/iotn28.h: Same.
* include/avr/iotn26.h: Same.
* include/avr/iotn11.h: Same.
* include/avr/iotn12.h: Same.
* include/avr/iotn13.h: Same.
* include/avr/iotn15.h: Same.
* include/avr/iotn167.h: Same.
* include/avr/iotn22.h: Same.
* include/avr/iotn2313.h: Same.
* include/avr/iom103.h: Same.
* include/avr/iom128.h: Same.
* include/avr/iom1284.h: Same.
* include/avr/iom16.h: Same.
* include/avr/iom161.h: Same.
* include/avr/iom162.h: Same.
* include/avr/iom163.h: Same.
* include/avr/iomxxhva.h: Same.
* include/avr/iomxx4.h: Same.
* include/avr/iomxx0_1.h: Same.
* include/avr/iomx8.h: Same.
* include/avr/iom88p.h: Same.
* include/avr/iom8535.h: Same.
* include/avr/iom8515.h: Same.
* include/avr/iom165.h: Same.
* include/avr/iom8.h: Same.
* include/avr/iom6490.h: Same.
* include/avr/iom165p.h: Same.
* include/avr/iom649.h: Same.
* include/avr/iom168p.h: Same.
* include/avr/iom169.h: Same.
* include/avr/iom169p.h: Same.
* include/avr/iom32.h: Same.
* include/avr/iom323.h: Same.
* include/avr/iom325.h: Same.
* include/avr/iom3250.h: Same.
* include/avr/iom328p.h: Same.
* include/avr/iom329.h: Same.
* include/avr/iom3290.h: Same.
* include/avr/iom32hvbrevb.h: Same.
* include/avr/iom32u4.h: Same.
* include/avr/iom406.h: Same.
* include/avr/iom48p.h: Same.
* include/avr/iom64.h: Same.
* include/avr/iom645.h: Same.
* include/avr/iom6450.h: Same.
* include/avr/iocanxx.h: Same.
* include/avr/io90pwm1.h: Same.
* include/avr/io90pwm216.h: Same.
* include/avr/io1200.h: Same.
* include/avr/io2343.h: Same.
* include/avr/io2323.h: Same.
* include/avr/io86r401.h: Same.
* include/avr/io2313.h: Same.
* include/avr/io2333.h: Same.
* include/avr/io4434.h: Same.
* include/avr/io4433.h: Same.
* include/avr/io4414.h: Same.
* include/avr/io8535.h: Same.
* include/avr/io8515.h: Same.
* include/avr/io90pwmx.h: Same.
* include/avr/io90pwm3b.h: Same.
* include/avr/io90pwm316.h: Same.
* include/avr/io90pwm2b.h: Same.
* include/avr/iom16hvbrevb: Also, update copyright year, change device
name
(rev b version is the older version).
* include/avr/iom32hvbrevb: Same.
* NEWS: Add item.
Ticket Links:
:-----------
http://savannah.gnu.org/bugs/?23234
Modified Paths:
--------------
trunk/avr-libc/ChangeLog
trunk/avr-libc/NEWS
trunk/avr-libc/include/avr/io1200.h
trunk/avr-libc/include/avr/io2313.h
trunk/avr-libc/include/avr/io2323.h
trunk/avr-libc/include/avr/io2333.h
trunk/avr-libc/include/avr/io2343.h
trunk/avr-libc/include/avr/io4414.h
trunk/avr-libc/include/avr/io4433.h
trunk/avr-libc/include/avr/io4434.h
trunk/avr-libc/include/avr/io8515.h
trunk/avr-libc/include/avr/io8535.h
trunk/avr-libc/include/avr/io86r401.h
trunk/avr-libc/include/avr/io90pwm1.h
trunk/avr-libc/include/avr/io90pwm216.h
trunk/avr-libc/include/avr/io90pwm2b.h
trunk/avr-libc/include/avr/io90pwm316.h
trunk/avr-libc/include/avr/io90pwm3b.h
trunk/avr-libc/include/avr/io90pwmx.h
trunk/avr-libc/include/avr/iocanxx.h
trunk/avr-libc/include/avr/iom103.h
trunk/avr-libc/include/avr/iom128.h
trunk/avr-libc/include/avr/iom1284p.h
trunk/avr-libc/include/avr/iom16.h
trunk/avr-libc/include/avr/iom161.h
trunk/avr-libc/include/avr/iom162.h
trunk/avr-libc/include/avr/iom163.h
trunk/avr-libc/include/avr/iom165.h
trunk/avr-libc/include/avr/iom165p.h
trunk/avr-libc/include/avr/iom168p.h
trunk/avr-libc/include/avr/iom169.h
trunk/avr-libc/include/avr/iom169p.h
trunk/avr-libc/include/avr/iom16hvbrevb.h
trunk/avr-libc/include/avr/iom32.h
trunk/avr-libc/include/avr/iom323.h
trunk/avr-libc/include/avr/iom325.h
trunk/avr-libc/include/avr/iom3250.h
trunk/avr-libc/include/avr/iom328p.h
trunk/avr-libc/include/avr/iom329.h
trunk/avr-libc/include/avr/iom3290.h
trunk/avr-libc/include/avr/iom32hvbrevb.h
trunk/avr-libc/include/avr/iom32u4.h
trunk/avr-libc/include/avr/iom406.h
trunk/avr-libc/include/avr/iom48p.h
trunk/avr-libc/include/avr/iom64.h
trunk/avr-libc/include/avr/iom645.h
trunk/avr-libc/include/avr/iom6450.h
trunk/avr-libc/include/avr/iom649.h
trunk/avr-libc/include/avr/iom6490.h
trunk/avr-libc/include/avr/iom8.h
trunk/avr-libc/include/avr/iom8515.h
trunk/avr-libc/include/avr/iom8535.h
trunk/avr-libc/include/avr/iom88p.h
trunk/avr-libc/include/avr/iomx8.h
trunk/avr-libc/include/avr/iomxx0_1.h
trunk/avr-libc/include/avr/iomxx4.h
trunk/avr-libc/include/avr/iomxxhva.h
trunk/avr-libc/include/avr/iotn11.h
trunk/avr-libc/include/avr/iotn12.h
trunk/avr-libc/include/avr/iotn13.h
trunk/avr-libc/include/avr/iotn15.h
trunk/avr-libc/include/avr/iotn167.h
trunk/avr-libc/include/avr/iotn22.h
trunk/avr-libc/include/avr/iotn2313.h
trunk/avr-libc/include/avr/iotn26.h
trunk/avr-libc/include/avr/iotn28.h
trunk/avr-libc/include/avr/iotn43u.h
trunk/avr-libc/include/avr/iotn48.h
trunk/avr-libc/include/avr/iotn88.h
trunk/avr-libc/include/avr/iotnx4.h
trunk/avr-libc/include/avr/iotnx5.h
trunk/avr-libc/include/avr/iotnx61.h
trunk/avr-libc/include/avr/iousbxx2.h
trunk/avr-libc/include/avr/iousbxx6_7.h
Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/ChangeLog 2011-03-02 16:27:26 UTC (rev 2225)
@@ -1,3 +1,82 @@
+2011-03-02 Eric B. Weddington <address@hidden>
+
+ Fix for bug #23234.
+ * include/avr/iousbxx2.h: Add *_vect_num definitions.
+ * include/avr/iousbxx6_7.h: Same.
+ * include/avr/iotnx61.h: Same.
+ * include/avr/iotn43u.h: Same.
+ * include/avr/iotn48.h: Same.
+ * include/avr/iotn88.h: Same.
+ * include/avr/iotnx4.h: Same.
+ * include/avr/iotnx5.h: Same.
+ * include/avr/iotn28.h: Same.
+ * include/avr/iotn26.h: Same.
+ * include/avr/iotn11.h: Same.
+ * include/avr/iotn12.h: Same.
+ * include/avr/iotn13.h: Same.
+ * include/avr/iotn15.h: Same.
+ * include/avr/iotn167.h: Same.
+ * include/avr/iotn22.h: Same.
+ * include/avr/iotn2313.h: Same.
+ * include/avr/iom103.h: Same.
+ * include/avr/iom128.h: Same.
+ * include/avr/iom1284.h: Same.
+ * include/avr/iom16.h: Same.
+ * include/avr/iom161.h: Same.
+ * include/avr/iom162.h: Same.
+ * include/avr/iom163.h: Same.
+ * include/avr/iomxxhva.h: Same.
+ * include/avr/iomxx4.h: Same.
+ * include/avr/iomxx0_1.h: Same.
+ * include/avr/iomx8.h: Same.
+ * include/avr/iom88p.h: Same.
+ * include/avr/iom8535.h: Same.
+ * include/avr/iom8515.h: Same.
+ * include/avr/iom165.h: Same.
+ * include/avr/iom8.h: Same.
+ * include/avr/iom6490.h: Same.
+ * include/avr/iom165p.h: Same.
+ * include/avr/iom649.h: Same.
+ * include/avr/iom168p.h: Same.
+ * include/avr/iom169.h: Same.
+ * include/avr/iom169p.h: Same.
+ * include/avr/iom32.h: Same.
+ * include/avr/iom323.h: Same.
+ * include/avr/iom325.h: Same.
+ * include/avr/iom3250.h: Same.
+ * include/avr/iom328p.h: Same.
+ * include/avr/iom329.h: Same.
+ * include/avr/iom3290.h: Same.
+ * include/avr/iom32hvbrevb.h: Same.
+ * include/avr/iom32u4.h: Same.
+ * include/avr/iom406.h: Same.
+ * include/avr/iom48p.h: Same.
+ * include/avr/iom64.h: Same.
+ * include/avr/iom645.h: Same.
+ * include/avr/iom6450.h: Same.
+ * include/avr/iocanxx.h: Same.
+ * include/avr/io90pwm1.h: Same.
+ * include/avr/io90pwm216.h: Same.
+ * include/avr/io1200.h: Same.
+ * include/avr/io2343.h: Same.
+ * include/avr/io2323.h: Same.
+ * include/avr/io86r401.h: Same.
+ * include/avr/io2313.h: Same.
+ * include/avr/io2333.h: Same.
+ * include/avr/io4434.h: Same.
+ * include/avr/io4433.h: Same.
+ * include/avr/io4414.h: Same.
+ * include/avr/io8535.h: Same.
+ * include/avr/io8515.h: Same.
+ * include/avr/io90pwmx.h: Same.
+ * include/avr/io90pwm3b.h: Same.
+ * include/avr/io90pwm316.h: Same.
+ * include/avr/io90pwm2b.h: Same.
+ * include/avr/iom16hvbrevb: Also, update copyright year, change device
name
+ (rev b version is the older version).
+ * include/avr/iom32hvbrevb: Same.
+ * NEWS: Add item.
+
2011-02-23 Eric B. Weddington <address@hidden>
Partial fix for bug #28058, comment #2.
Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/NEWS 2011-03-02 16:27:26 UTC (rev 2225)
@@ -3,6 +3,7 @@
* Bugs fixed:
[#17815] Configure does not honor --mandir option
+ [#23234] Alternate interrupt macro
[#24861] Interrupt documentation contains extra include
[#32103] Support for Target-Triplets
[#32419] Incorrect EEPROM size in header for ATxmega192A3
Modified: trunk/avr-libc/include/avr/io1200.h
===================================================================
--- trunk/avr-libc/include/avr/io1200.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io1200.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -115,14 +115,17 @@
/* Interrupt vectors */
/* External Interrupt 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 2
#define TIMER0_OVF_vect _VECTOR(2)
#define SIG_OVERFLOW0 _VECTOR(2)
/* Analog Comparator */
+#define ANA_COMP_vect_num 3
#define ANA_COMP_vect _VECTOR(3)
#define SIG_COMPARATOR _VECTOR(3)
Modified: trunk/avr-libc/include/avr/io2313.h
===================================================================
--- trunk/avr-libc/include/avr/io2313.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io2313.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -147,42 +147,52 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT1_vect_num 3
#define TIMER1_CAPT1_vect _VECTOR(3)
#define SIG_INPUT_CAPTURE1 _VECTOR(3)
/* Timer/Counter1 Compare Match */
+#define TIMER1_COMP1_vect_num 4
#define TIMER1_COMP1_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE1A _VECTOR(4)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF1_vect_num 5
#define TIMER1_OVF1_vect _VECTOR(5)
#define SIG_OVERFLOW1 _VECTOR(5)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF0_vect_num 6
#define TIMER0_OVF0_vect _VECTOR(6)
#define SIG_OVERFLOW0 _VECTOR(6)
/* UART, Rx Complete */
+#define UART_RX_vect_num 7
#define UART_RX_vect _VECTOR(7)
#define SIG_UART_RECV _VECTOR(7)
/* UART Data Register Empty */
+#define UART_UDRE_vect_num 8
#define UART_UDRE_vect _VECTOR(8)
#define SIG_UART_DATA _VECTOR(8)
/* UART, Tx Complete */
+#define UART_TX_vect_num 9
#define UART_TX_vect _VECTOR(9)
#define SIG_UART_TRANS _VECTOR(9)
/* Analog Comparator */
+#define ANA_COMP_vect_num 10
#define ANA_COMP_vect _VECTOR(10)
#define SIG_COMPARATOR _VECTOR(10)
Modified: trunk/avr-libc/include/avr/io2323.h
===================================================================
--- trunk/avr-libc/include/avr/io2323.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io2323.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -102,10 +102,12 @@
/* Interrupt vectors */
/* External Interrupt 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF0_vect_num 2
#define TIMER0_OVF0_vect _VECTOR(2)
#define SIG_OVERFLOW0 _VECTOR(2)
Modified: trunk/avr-libc/include/avr/io2333.h
===================================================================
--- trunk/avr-libc/include/avr/io2333.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io2333.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -176,54 +176,67 @@
/* Interrupt vectors */
/* External Interrupt 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter Capture Event */
+#define TIMER1_CAPT_vect_num 3
#define TIMER1_CAPT_vect _VECTOR(3)
#define SIG_INPUT_CAPTURE1 _VECTOR(3)
/* Timer/Counter1 Compare Match */
+#define TIMER1_COMP_vect_num 4
#define TIMER1_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE1A _VECTOR(4)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 5
#define TIMER1_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW1 _VECTOR(5)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 6
#define TIMER0_OVF_vect _VECTOR(6)
#define SIG_OVERFLOW0 _VECTOR(6)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 7
#define SPI_STC_vect _VECTOR(7)
#define SIG_SPI _VECTOR(7)
/* UART, Rx Complete */
+#define UART_RX_vect_num 8
#define UART_RX_vect _VECTOR(8)
#define SIG_UART_RECV _VECTOR(8)
/* UART Data Register Empty */
+#define UART_UDRE_vect_num 9
#define UART_UDRE_vect _VECTOR(9)
#define SIG_UART_DATA _VECTOR(9)
/* UART, Tx Complete */
+#define UART_TX_vect_num 10
#define UART_TX_vect _VECTOR(10)
#define SIG_UART_TRANS _VECTOR(10)
/* ADC Conversion Complete */
+#define ADC_vect_num 11
#define ADC_vect _VECTOR(11)
#define SIG_ADC _VECTOR(11)
/* EEPROM Ready */
+#define EE_RDY_vect_num 12
#define EE_RDY_vect _VECTOR(12)
#define SIG_EEPROM_READY _VECTOR(12)
/* Analog Comparator */
+#define ANA_COMP_vect_num 13
#define ANA_COMP_vect _VECTOR(13)
#define SIG_COMPARATOR _VECTOR(13)
Modified: trunk/avr-libc/include/avr/io2343.h
===================================================================
--- trunk/avr-libc/include/avr/io2343.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io2343.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -102,10 +102,12 @@
/* Interrupt vectors */
/* External Interrupt 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF0_vect_num 2
#define TIMER0_OVF0_vect _VECTOR(2)
#define SIG_OVERFLOW0 _VECTOR(2)
Modified: trunk/avr-libc/include/avr/io4414.h
===================================================================
--- trunk/avr-libc/include/avr/io4414.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io4414.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -176,50 +176,62 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter Capture Event */
+#define TIMER1_CAPT_vect_num 3
#define TIMER1_CAPT_vect _VECTOR(3)
#define SIG_INPUT_CAPTURE1 _VECTOR(3)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 4
#define TIMER1_COMPA_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE1A _VECTOR(4)
/* Timer/Counter1 Compare MatchB */
+#define TIMER1_COMPB_vect_num 5
#define TIMER1_COMPB_vect _VECTOR(5)
#define SIG_OUTPUT_COMPARE1B _VECTOR(5)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 6
#define TIMER1_OVF_vect _VECTOR(6)
#define SIG_OVERFLOW1 _VECTOR(6)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 7
#define TIMER0_OVF_vect _VECTOR(7)
#define SIG_OVERFLOW0 _VECTOR(7)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 8
#define SPI_STC_vect _VECTOR(8)
#define SIG_SPI _VECTOR(8)
/* UART, Rx Complete */
+#define UART_RX_vect_num 9
#define UART_RX_vect _VECTOR(9)
#define SIG_UART_RECV _VECTOR(9)
/* UART Data Register Empty */
+#define UART_UDRE_vect_num 10
#define UART_UDRE_vect _VECTOR(10)
#define SIG_UART_DATA _VECTOR(10)
/* UART, Tx Complete */
+#define UART_TX_vect_num 11
#define UART_TX_vect _VECTOR(11)
#define SIG_UART_TRANS _VECTOR(11)
/* Analog Comparator */
+#define ANA_COMP_vect_num 12
#define ANA_COMP_vect _VECTOR(12)
#define SIG_COMPARATOR _VECTOR(12)
Modified: trunk/avr-libc/include/avr/io4433.h
===================================================================
--- trunk/avr-libc/include/avr/io4433.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io4433.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -180,54 +180,67 @@
/* Interrupt vectors */
/* External Interrupt 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter Capture Event */
+#define TIMER1_CAPT_vect_num 3
#define TIMER1_CAPT_vect _VECTOR(3)
#define SIG_INPUT_CAPTURE1 _VECTOR(3)
/* Timer/Counter1 Compare Match */
+#define TIMER1_COMP_vect_num 4
#define TIMER1_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE1A _VECTOR(4)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 5
#define TIMER1_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW1 _VECTOR(5)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 6
#define TIMER0_OVF_vect _VECTOR(6)
#define SIG_OVERFLOW0 _VECTOR(6)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 7
#define SPI_STC_vect _VECTOR(7)
#define SIG_SPI _VECTOR(7)
/* UART, Rx Complete */
+#define UART_RX_vect_num 8
#define UART_RX_vect _VECTOR(8)
#define SIG_UART_RECV _VECTOR(8)
/* UART Data Register Empty */
+#define UART_UDRE_vect_num 9
#define UART_UDRE_vect _VECTOR(9)
#define SIG_UART_DATA _VECTOR(9)
/* UART, Tx Complete */
+#define UART_TX_vect_num 10
#define UART_TX_vect _VECTOR(10)
#define SIG_UART_TRANS _VECTOR(10)
/* ADC Conversion Complete */
+#define ADC_vect_num 11
#define ADC_vect _VECTOR(11)
#define SIG_ADC _VECTOR(11)
/* EEPROM Ready */
+#define EE_RDY_vect_num 12
#define EE_RDY_vect _VECTOR(12)
#define SIG_EEPROM_READY _VECTOR(12)
/* Analog Comparator */
+#define ANA_COMP_vect_num 13
#define ANA_COMP_vect _VECTOR(13)
#define SIG_COMPARATOR _VECTOR(13)
Modified: trunk/avr-libc/include/avr/io4434.h
===================================================================
--- trunk/avr-libc/include/avr/io4434.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io4434.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -205,66 +205,82 @@
/* Interrupt vectors */
/* External Interrupt 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 3
#define TIMER2_COMP_vect _VECTOR(3)
#define SIG_OUTPUT_COMPARE2 _VECTOR(3)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 4
#define TIMER2_OVF_vect _VECTOR(4)
#define SIG_OVERFLOW2 _VECTOR(4)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 5
#define TIMER1_CAPT_vect _VECTOR(5)
#define SIG_INPUT_CAPTURE1 _VECTOR(5)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 6
#define TIMER1_COMPA_vect _VECTOR(6)
#define SIG_OUTPUT_COMPARE1A _VECTOR(6)
/* Timer/Counter1 Compare Match B */
+#define TIMER1_COMPB_vect_num 7
#define TIMER1_COMPB_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1B _VECTOR(7)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 8
#define TIMER1_OVF_vect _VECTOR(8)
#define SIG_OVERFLOW1 _VECTOR(8)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 9
#define TIMER0_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW0 _VECTOR(9)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 10
#define SPI_STC_vect _VECTOR(10)
#define SIG_SPI _VECTOR(10)
/* UART, RX Complete */
+#define UART_RX_vect_num 11
#define UART_RX_vect _VECTOR(11)
#define SIG_UART_RECV _VECTOR(11)
/* UART Data Register Empty */
+#define UART_UDRE_vect_num 12
#define UART_UDRE_vect _VECTOR(12)
#define SIG_UART_DATA _VECTOR(12)
/* UART, TX Complete */
+#define UART_TX_vect_num 13
#define UART_TX_vect _VECTOR(13)
#define SIG_UART_TRANS _VECTOR(13)
/* ADC Conversion Complete */
+#define ADC_vect_num 14
#define ADC_vect _VECTOR(14)
#define SIG_ADC _VECTOR(14)
/* EEPROM Ready */
+#define EE_RDY_vect_num 15
#define EE_RDY_vect _VECTOR(15)
#define SIG_EEPROM_READY _VECTOR(15)
/* Analog Comparator */
+#define ANA_COMP_vect_num 16
#define ANA_COMP_vect _VECTOR(16)
#define SIG_COMPARATOR _VECTOR(16)
Modified: trunk/avr-libc/include/avr/io8515.h
===================================================================
--- trunk/avr-libc/include/avr/io8515.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io8515.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -177,50 +177,62 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter Capture Event */
+#define TIMER1_CAPT_vect_num 3
#define TIMER1_CAPT_vect _VECTOR(3)
#define SIG_INPUT_CAPTURE1 _VECTOR(3)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 4
#define TIMER1_COMPA_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE1A _VECTOR(4)
/* Timer/Counter1 Compare MatchB */
+#define TIMER1_COMPB_vect_num 5
#define TIMER1_COMPB_vect _VECTOR(5)
#define SIG_OUTPUT_COMPARE1B _VECTOR(5)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 6
#define TIMER1_OVF_vect _VECTOR(6)
#define SIG_OVERFLOW1 _VECTOR(6)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 7
#define TIMER0_OVF_vect _VECTOR(7)
#define SIG_OVERFLOW0 _VECTOR(7)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 8
#define SPI_STC_vect _VECTOR(8)
#define SIG_SPI _VECTOR(8)
/* UART, Rx Complete */
+#define UART_RX_vect_num 9
#define UART_RX_vect _VECTOR(9)
#define SIG_UART_RECV _VECTOR(9)
/* UART Data Register Empty */
+#define UART_UDRE_vect_num 10
#define UART_UDRE_vect _VECTOR(10)
#define SIG_UART_DATA _VECTOR(10)
/* UART, Tx Complete */
+#define UART_TX_vect_num 11
#define UART_TX_vect _VECTOR(11)
#define SIG_UART_TRANS _VECTOR(11)
/* Analog Comparator */
+#define ANA_COMP_vect_num 12
#define ANA_COMP_vect _VECTOR(12)
#define SIG_COMPARATOR _VECTOR(12)
Modified: trunk/avr-libc/include/avr/io8535.h
===================================================================
--- trunk/avr-libc/include/avr/io8535.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/io8535.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -206,66 +206,82 @@
/* Interrupt vectors */
/* External Interrupt 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 3
#define TIMER2_COMP_vect _VECTOR(3)
#define SIG_OUTPUT_COMPARE2 _VECTOR(3)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 4
#define TIMER2_OVF_vect _VECTOR(4)
#define SIG_OVERFLOW2 _VECTOR(4)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 5
#define TIMER1_CAPT_vect _VECTOR(5)
#define SIG_INPUT_CAPTURE1 _VECTOR(5)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 6
#define TIMER1_COMPA_vect _VECTOR(6)
#define SIG_OUTPUT_COMPARE1A _VECTOR(6)
/* Timer/Counter1 Compare Match B */
+#define TIMER1_COMPB_vect_num 7
#define TIMER1_COMPB_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1B _VECTOR(7)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 8
#define TIMER1_OVF_vect _VECTOR(8)
#define SIG_OVERFLOW1 _VECTOR(8)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 9
#define TIMER0_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW0 _VECTOR(9)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 10
#define SPI_STC_vect _VECTOR(10)
#define SIG_SPI _VECTOR(10)
/* UART, RX Complete */
+#define UART_RX_vect_num 11
#define UART_RX_vect _VECTOR(11)
#define SIG_UART_RECV _VECTOR(11)
/* UART Data Register Empty */
+#define UART_UDRE_vect_num 12
#define UART_UDRE_vect _VECTOR(12)
#define SIG_UART_DATA _VECTOR(12)
/* UART, TX Complete */
+#define UART_TX_vect_num 13
#define UART_TX_vect _VECTOR(13)
#define SIG_UART_TRANS _VECTOR(13)
/* ADC Conversion Complete */
+#define ADC_vect_num 14
#define ADC_vect _VECTOR(14)
#define SIG_ADC _VECTOR(14)
/* EEPROM Ready */
+#define EE_RDY_vect_num 15
#define EE_RDY_vect _VECTOR(15)
#define SIG_EEPROM_READY _VECTOR(15)
/* Analog Comparator */
+#define ANA_COMP_vect_num 16
#define ANA_COMP_vect _VECTOR(16)
#define SIG_COMPARATOR _VECTOR(16)
Modified: trunk/avr-libc/include/avr/io86r401.h
===================================================================
--- trunk/avr-libc/include/avr/io86r401.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/io86r401.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -117,10 +117,12 @@
/* Interrupt vectors */
/* Transmission Done, Bit Timer Flag 2 Interrupt */
+#define TXDONE_vect_num 1
#define TXDONE_vect _VECTOR(1)
#define SIG_TXDONE _VECTOR(1)
/* Transmit Buffer Empty, Bit Itmer Flag 0 Interrupt */
+#define TXEMPTY_vect_num 2
#define TXEMPTY_vect _VECTOR(2)
#define SIG_TXBE _VECTOR(2)
Modified: trunk/avr-libc/include/avr/io90pwm1.h
===================================================================
--- trunk/avr-libc/include/avr/io90pwm1.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/io90pwm1.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -973,95 +973,117 @@
/* Interrupt vectors */
/* PSC2 Capture Event */
+#define PSC2_CAPT_vect_num 1
#define PSC2_CAPT_vect _VECTOR(1)
#define SIG_PSC2_CAPTURE _VECTOR(1)
/* PSC2 End Cycle */
+#define PSC2_EC_vect_num 2
#define PSC2_EC_vect _VECTOR(2)
#define SIG_PSC2_END_CYCLE _VECTOR(2)
/* PSC0 Capture Event */
+#define PSC0_CAPT_vect_num 5
#define PSC0_CAPT_vect _VECTOR(5)
#define SIG_PSC0_CAPTURE _VECTOR(5)
/* PSC0 End Cycle */
+#define PSC0_EC_vect_num 6
#define PSC0_EC_vect _VECTOR(6)
#define SIG_PSC0_END_CYCLE _VECTOR(6)
/* Analog Comparator 0 */
+#define ANALOG_COMP_0_vect_num 7
#define ANALOG_COMP_0_vect _VECTOR(7)
#define SIG_COMPARATOR0 _VECTOR(7)
/* Analog Comparator 2 */
+#define ANALOG_COMP_2_vect_num 9
#define ANALOG_COMP_2_vect _VECTOR(9)
#define SIG_COMPARATOR2 _VECTOR(9)
/* External Interrupt Request 0 */
+#define INT0_vect_num 10
#define INT0_vect _VECTOR(10)
#define SIG_INTERRUPT0 _VECTOR(10)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11)
#define SIG_INPUT_CAPTURE1 _VECTOR(11)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 12
#define TIMER1_COMPA_vect _VECTOR(12)
#define SIG_OUTPUT_COMPARE1A _VECTOR(12)
#define SIG_OUTPUT_COMPARE1_A _VECTOR(12)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13)
#define SIG_OUTPUT_COMPARE1B _VECTOR(13)
#define SIG_OUTPUT_COMPARE1_B _VECTOR(13)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15)
#define SIG_OVERFLOW1 _VECTOR(15)
/* Timer/Counter0 Compare Match A */
+#define TIMER0_COMP_A_vect_num 16
#define TIMER0_COMP_A_vect _VECTOR(16)
#define SIG_OUTPUT_COMPARE0A _VECTOR(16)
#define SIG_OUTPUT_COMPARE0_A _VECTOR(16)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 17
#define TIMER0_OVF_vect _VECTOR(17)
#define SIG_OVERFLOW0 _VECTOR(17)
/* ADC Conversion Complete */
+#define ADC_vect_num 18
#define ADC_vect _VECTOR(18)
#define SIG_ADC _VECTOR(18)
/* External Interrupt Request 1 */
+#define INT1_vect_num 19
#define INT1_vect _VECTOR(19)
#define SIG_INTERRUPT1 _VECTOR(19)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 20
#define SPI_STC_vect _VECTOR(20)
#define SIG_SPI _VECTOR(20)
/* External Interrupt Request 2 */
+#define INT2_vect_num 24
#define INT2_vect _VECTOR(24)
#define SIG_INTERRUPT2 _VECTOR(24)
/* Watchdog Timeout Interrupt */
+#define WDT_vect_num 25
#define WDT_vect _VECTOR(25)
#define SIG_WDT _VECTOR(25)
#define SIG_WATCHDOG_TIMEOUT _VECTOR(25)
/* EEPROM Ready */
+#define EE_READY_vect_num 26
#define EE_READY_vect _VECTOR(26)
#define SIG_EEPROM_READY _VECTOR(26)
/* Timer Counter 0 Compare Match B */
+#define TIMER0_COMPB_vect_num 27
#define TIMER0_COMPB_vect _VECTOR(27)
#define SIG_OUTPUT_COMPARE0B _VECTOR(27)
#define SIG_OUTPUT_COMPARE0_B _VECTOR(27)
/* External Interrupt Request 3 */
+#define INT3_vect_num 28
#define INT3_vect _VECTOR(28)
#define SIG_INTERRUPT3 _VECTOR(28)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 31
#define SPM_READY_vect _VECTOR(31)
#define SIG_SPM_READY _VECTOR(31)
Modified: trunk/avr-libc/include/avr/io90pwm216.h
===================================================================
--- trunk/avr-libc/include/avr/io90pwm216.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/io90pwm216.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -1033,87 +1033,115 @@
/* Interrupt 0 is the reset vector. */
/* PSC2 Capture Event */
+#define PSC2_CAPT_vect_num 1
#define PSC2_CAPT_vect _VECTOR(1)
/* PSC2 End Cycle */
+#define PSC2_EC_vect_num 2
#define PSC2_EC_vect _VECTOR(2)
/* PSC1 Capture Event */
+#define PSC1_CAPT_vect_num 3
#define PSC1_CAPT_vect _VECTOR(3)
/* PSC1 End Cycle */
+#define PSC1_EC_vect_num 4
#define PSC1_EC_vect _VECTOR(4)
/* PSC0 Capture Event */
+#define PSC0_CAPT_vect_num 5
#define PSC0_CAPT_vect _VECTOR(5)
/* PSC0 End Cycle */
+#define PSC0_EC_vect_num 6
#define PSC0_EC_vect _VECTOR(6)
/* Analog Comparator 0 */
+#define ANALOG_COMP_0_vect_num 7
#define ANALOG_COMP_0_vect _VECTOR(7)
/* Analog Comparator 1 */
+#define ANALOG_COMP_1_vect_num 8
#define ANALOG_COMP_1_vect _VECTOR(8)
/* Analog Comparator 2 */
+#define ANALOG_COMP_2_vect_num 9
#define ANALOG_COMP_2_vect _VECTOR(9)
/* External Interrupt Request 0 */
+#define INT0_vect_num 10
#define INT0_vect _VECTOR(10)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 12
#define TIMER1_COMPA_vect _VECTOR(12)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15)
/* Timer/Counter0 Compare Match A */
+#define TIMER0_COMP_A_vect_num 16
#define TIMER0_COMP_A_vect _VECTOR(16)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 17
#define TIMER0_OVF_vect _VECTOR(17)
/* ADC Conversion Complete */
+#define ADC_vect_num 18
#define ADC_vect _VECTOR(18)
/* External Interrupt Request 1 */
+#define INT1_vect_num 19
#define INT1_vect _VECTOR(19)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 20
#define SPI_STC_vect _VECTOR(20)
/* USART, Rx Complete */
+#define USART_RX_vect_num 21
#define USART_RX_vect _VECTOR(21)
/* USART Data Register Empty */
+#define USART_UDRE_vect_num 22
#define USART_UDRE_vect _VECTOR(22)
/* USART, Tx Complete */
+#define USART_TX_vect_num 23
#define USART_TX_vect _VECTOR(23)
/* External Interrupt Request 2 */
+#define INT2_vect_num 24
#define INT2_vect _VECTOR(24)
/* Watchdog Timeout Interrupt */
+#define WDT_vect_num 25
#define WDT_vect _VECTOR(25)
/* EEPROM Ready */
+#define EE_READY_vect_num 26
#define EE_READY_vect _VECTOR(26)
/* Timer Counter 0 Compare Match B */
+#define TIMER0_COMPB_vect_num 27
#define TIMER0_COMPB_vect _VECTOR(27)
/* External Interrupt Request 3 */
+#define INT3_vect_num 28
#define INT3_vect _VECTOR(28)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 31
#define SPM_READY_vect _VECTOR(31)
#define _VECTORS_SIZE (4 * 32)
Modified: trunk/avr-libc/include/avr/io90pwm2b.h
===================================================================
--- trunk/avr-libc/include/avr/io90pwm2b.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/io90pwm2b.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -1291,36 +1291,95 @@
/* Interrupt Vectors */
/* Interrupt vector 0 is the reset vector. */
+
+#define PSC2_CAPT_vect_num 1
#define PSC2_CAPT_vect _VECTOR(1) /* PSC2 Capture Event */
+
+#define PSC2_EC_vect_num 2
#define PSC2_EC_vect _VECTOR(2) /* PSC2 End Cycle */
+
+#define PSC1_CAPT_vect_num 3
#define PSC1_CAPT_vect _VECTOR(3) /* PSC1 Capture Event */
+
+#define PSC1_EC_vect_num 4
#define PSC1_EC_vect _VECTOR(4) /* PSC1 End Cycle */
+
+#define PSC0_CAPT_vect_num 5
#define PSC0_CAPT_vect _VECTOR(5) /* PSC0 Capture Event */
+
+#define PSC0_EC_vect_num 6
#define PSC0_EC_vect _VECTOR(6) /* PSC0 End Cycle */
+
+#define ANALOG_COMP_0_vect_num 7
#define ANALOG_COMP_0_vect _VECTOR(7) /* Analog Comparator 0 */
+
+#define ANALOG_COMP_1_vect_num 8
#define ANALOG_COMP_1_vect _VECTOR(8) /* Analog Comparator 1 */
+
+#define ANALOG_COMP_2_vect_num 9
#define ANALOG_COMP_2_vect _VECTOR(9) /* Analog Comparator 2 */
+
+#define INT0_vect_num 10
#define INT0_vect _VECTOR(10) /* External Interrupt Request 0 */
+
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11) /* Timer/Counter1 Capture Event */
+
+#define TIMER1_COMPA_vect_num 12
#define TIMER1_COMPA_vect _VECTOR(12) /* Timer/Counter1 Compare Match A */
+
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13) /* Timer/Counter Compare Match B */
+
/* Vector 14, Reserved */
+
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15) /* Timer/Counter1 Overflow */
+
+#define TIMER0_COMPA_vect_num 16
#define TIMER0_COMPA_vect _VECTOR(16) /* Timer/Counter0 Compare Match A */
+
+#define TIMER0_OVF_vect_num 17
#define TIMER0_OVF_vect _VECTOR(17) /* Timer/Counter0 Overflow */
+
+#define ADC_vect_num 18
#define ADC_vect _VECTOR(18) /* ADC Conversion Complete */
+
+#define INT1_vect_num 19
#define INT1_vect _VECTOR(19) /* External Interrupt Request 1 */
+
+#define SPI_STC_vect_num 20
#define SPI_STC_vect _VECTOR(20) /* SPI Serial Transfer Complete */
+
+#define USART_RX_vect_num 21
#define USART_RX_vect _VECTOR(21) /* USART, Rx Complete */
+
+#define USART_UDRE_vect_num 22
#define USART_UDRE_vect _VECTOR(22) /* USART Data Register Empty */
+
+#define USART_TX_vect_num 23
#define USART_TX_vect _VECTOR(23) /* USART, Tx Complete */
+
+#define INT2_vect_num 24
#define INT2_vect _VECTOR(24) /* External Interrupt Request 2 */
+
+#define WDT_vect_num 25
#define WDT_vect _VECTOR(25) /* Watchdog Timeout Interrupt */
+
+#define EE_READY_vect_num 26
#define EE_READY_vect _VECTOR(26) /* EEPROM Ready */
+
+#define TIMER0_COMPB_vect_num 27
#define TIMER0_COMPB_vect _VECTOR(27) /* Timer Counter 0 Compare Match B */
+
+#define INT3_vect_num 28
#define INT3_vect _VECTOR(28) /* External Interrupt Request 3 */
+
/* Vector 29, Reserved */
+
/* Vector 30, Reserved */
+
+#define SPM_READY_vect_num 31
#define SPM_READY_vect _VECTOR(31) /* Store Program Memory Read */
#define _VECTORS_SIZE 64
Modified: trunk/avr-libc/include/avr/io90pwm316.h
===================================================================
--- trunk/avr-libc/include/avr/io90pwm316.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/io90pwm316.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -1076,87 +1076,115 @@
/* Interrupt 0 is the reset vector. */
/* PSC2 Capture Event */
+#define PSC2_CAPT_vect_num 1
#define PSC2_CAPT_vect _VECTOR(1)
/* PSC2 End Cycle */
+#define PSC2_EC_vect_num 2
#define PSC2_EC_vect _VECTOR(2)
/* PSC1 Capture Event */
+#define PSC1_CAPT_vect_num 3
#define PSC1_CAPT_vect _VECTOR(3)
/* PSC1 End Cycle */
+#define PSC1_EC_vect_num 4
#define PSC1_EC_vect _VECTOR(4)
/* PSC0 Capture Event */
+#define PSC0_CAPT_vect_num 5
#define PSC0_CAPT_vect _VECTOR(5)
/* PSC0 End Cycle */
+#define PSC0_EC_vect_num 6
#define PSC0_EC_vect _VECTOR(6)
/* Analog Comparator 0 */
+#define ANALOG_COMP_0_vect_num 7
#define ANALOG_COMP_0_vect _VECTOR(7)
/* Analog Comparator 1 */
+#define ANALOG_COMP_1_vect_num 8
#define ANALOG_COMP_1_vect _VECTOR(8)
/* Analog Comparator 2 */
+#define ANALOG_COMP_2_vect_num 9
#define ANALOG_COMP_2_vect _VECTOR(9)
/* External Interrupt Request 0 */
+#define INT0_vect_num 10
#define INT0_vect _VECTOR(10)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 12
#define TIMER1_COMPA_vect _VECTOR(12)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15)
/* Timer/Counter0 Compare Match A */
+#define TIMER0_COMP_A_vect_num 16
#define TIMER0_COMP_A_vect _VECTOR(16)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 17
#define TIMER0_OVF_vect _VECTOR(17)
/* ADC Conversion Complete */
+#define ADC_vect_num 18
#define ADC_vect _VECTOR(18)
/* External Interrupt Request 1 */
+#define INT1_vect_num 19
#define INT1_vect _VECTOR(19)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 20
#define SPI_STC_vect _VECTOR(20)
/* USART, Rx Complete */
+#define USART_RX_vect_num 21
#define USART_RX_vect _VECTOR(21)
/* USART Data Register Empty */
+#define USART_UDRE_vect_num 22
#define USART_UDRE_vect _VECTOR(22)
/* USART, Tx Complete */
+#define USART_TX_vect_num 23
#define USART_TX_vect _VECTOR(23)
/* External Interrupt Request 2 */
+#define INT2_vect_num 24
#define INT2_vect _VECTOR(24)
/* Watchdog Timeout Interrupt */
+#define WDT_vect_num 25
#define WDT_vect _VECTOR(25)
/* EEPROM Ready */
+#define EE_READY_vect_num 26
#define EE_READY_vect _VECTOR(26)
/* Timer Counter 0 Compare Match B */
+#define TIMER0_COMPB_vect_num 27
#define TIMER0_COMPB_vect _VECTOR(27)
/* External Interrupt Request 3 */
+#define INT3_vect_num 28
#define INT3_vect _VECTOR(28)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 31
#define SPM_READY_vect _VECTOR(31)
#define _VECTORS_SIZE (4 * 32)
Modified: trunk/avr-libc/include/avr/io90pwm3b.h
===================================================================
--- trunk/avr-libc/include/avr/io90pwm3b.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/io90pwm3b.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -1291,36 +1291,95 @@
/* Interrupt Vectors */
/* Interrupt vector 0 is the reset vector. */
+
+#define PSC2_CAPT_vect_num 1
#define PSC2_CAPT_vect _VECTOR(1) /* PSC2 Capture Event */
+
+#define PSC2_EC_vect_num 2
#define PSC2_EC_vect _VECTOR(2) /* PSC2 End Cycle */
+
+#define PSC1_CAPT_vect_num 3
#define PSC1_CAPT_vect _VECTOR(3) /* PSC1 Capture Event */
+
+#define PSC1_EC_vect_num 4
#define PSC1_EC_vect _VECTOR(4) /* PSC1 End Cycle */
+
+#define PSC0_CAPT_vect_num 5
#define PSC0_CAPT_vect _VECTOR(5) /* PSC0 Capture Event */
+
+#define PSC0_EC_vect_num 6
#define PSC0_EC_vect _VECTOR(6) /* PSC0 End Cycle */
+
+#define ANALOG_COMP_0_vect_num 7
#define ANALOG_COMP_0_vect _VECTOR(7) /* Analog Comparator 0 */
+
+#define ANALOG_COMP_1_vect_num 8
#define ANALOG_COMP_1_vect _VECTOR(8) /* Analog Comparator 1 */
+
+#define ANALOG_COMP_2_vect_num 9
#define ANALOG_COMP_2_vect _VECTOR(9) /* Analog Comparator 2 */
+
+#define INT0_vect_num 10
#define INT0_vect _VECTOR(10) /* External Interrupt Request 0 */
+
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11) /* Timer/Counter1 Capture Event */
+
+#define TIMER1_COMPA_vect_num 12
#define TIMER1_COMPA_vect _VECTOR(12) /* Timer/Counter1 Compare Match A */
+
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13) /* Timer/Counter Compare Match B */
+
/* Vector 14, Reserved */
+
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15) /* Timer/Counter1 Overflow */
+
+#define TIMER0_COMPA_vect_num 16
#define TIMER0_COMPA_vect _VECTOR(16) /* Timer/Counter0 Compare Match A */
+
+#define TIMER0_OVF_vect_num 17
#define TIMER0_OVF_vect _VECTOR(17) /* Timer/Counter0 Overflow */
+
+#define ADC_vect_num 18
#define ADC_vect _VECTOR(18) /* ADC Conversion Complete */
+
+#define INT1_vect_num 19
#define INT1_vect _VECTOR(19) /* External Interrupt Request 1 */
+
+#define SPI_STC_vect_num 20
#define SPI_STC_vect _VECTOR(20) /* SPI Serial Transfer Complete */
+
+#define USART_RX_vect_num 21
#define USART_RX_vect _VECTOR(21) /* USART, Rx Complete */
+
+#define USART_UDRE_vect_num 22
#define USART_UDRE_vect _VECTOR(22) /* USART Data Register Empty */
+
+#define USART_TX_vect_num 23
#define USART_TX_vect _VECTOR(23) /* USART, Tx Complete */
+
+#define INT2_vect_num 24
#define INT2_vect _VECTOR(24) /* External Interrupt Request 2 */
+
+#define WDT_vect_num 25
#define WDT_vect _VECTOR(25) /* Watchdog Timeout Interrupt */
+
+#define EE_READY_vect_num 26
#define EE_READY_vect _VECTOR(26) /* EEPROM Ready */
+
+#define TIMER0_COMPB_vect_num 27
#define TIMER0_COMPB_vect _VECTOR(27) /* Timer Counter 0 Compare Match B */
+
+#define INT3_vect_num 28
#define INT3_vect _VECTOR(28) /* External Interrupt Request 3 */
+
/* Vector 29, Reserved */
+
/* Vector 30, Reserved */
+
+#define SPM_READY_vect_num 31
#define SPM_READY_vect _VECTOR(31) /* Store Program Memory Read */
#define _VECTORS_SIZE 64
Modified: trunk/avr-libc/include/avr/io90pwmx.h
===================================================================
--- trunk/avr-libc/include/avr/io90pwmx.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/io90pwmx.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -1194,122 +1194,150 @@
/* Interrupt vectors */
/* PSC2 Capture Event */
+#define PSC2_CAPT_vect_num 1
#define PSC2_CAPT_vect _VECTOR(1)
#define SIG_PSC2_CAPTURE _VECTOR(1)
/* PSC2 End Cycle */
+#define PSC2_EC_vect_num 2
#define PSC2_EC_vect _VECTOR(2)
#define SIG_PSC2_END_CYCLE _VECTOR(2)
/* PSC1 Capture Event */
+#define PSC1_CAPT_vect_num 3
#define PSC1_CAPT_vect _VECTOR(3)
#define SIG_PSC1_CAPTURE _VECTOR(3)
/* PSC1 End Cycle */
+#define PSC1_EC_vect_num 4
#define PSC1_EC_vect _VECTOR(4)
#define SIG_PSC1_END_CYCLE _VECTOR(4)
/* PSC0 Capture Event */
+#define PSC0_CAPT_vect_num 5
#define PSC0_CAPT_vect _VECTOR(5)
#define SIG_PSC0_CAPTURE _VECTOR(5)
/* PSC0 End Cycle */
+#define PSC0_EC_vect_num 6
#define PSC0_EC_vect _VECTOR(6)
#define SIG_PSC0_END_CYCLE _VECTOR(6)
/* Analog Comparator 0 */
+#define ANALOG_COMP_0_vect_num 7
#define ANALOG_COMP_0_vect _VECTOR(7)
#define SIG_COMPARATOR0 _VECTOR(7)
/* Analog Comparator 1 */
+#define ANALOG_COMP_1_vect_num 8
#define ANALOG_COMP_1_vect _VECTOR(8)
#define SIG_COMPARATOR1 _VECTOR(8)
/* Analog Comparator 2 */
+#define ANALOG_COMP_2_vect_num 9
#define ANALOG_COMP_2_vect _VECTOR(9)
#define SIG_COMPARATOR2 _VECTOR(9)
/* External Interrupt Request 0 */
+#define INT0_vect_num 10
#define INT0_vect _VECTOR(10)
#define SIG_INTERRUPT0 _VECTOR(10)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11)
#define SIG_INPUT_CAPTURE1 _VECTOR(11)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num _VECTOR(12)
#define TIMER1_COMPA_vect _VECTOR(12)
#define SIG_OUTPUT_COMPARE1A _VECTOR(12)
#define SIG_OUTPUT_COMPARE1_A _VECTOR(12)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13)
#define SIG_OUTPUT_COMPARE1B _VECTOR(13)
#define SIG_OUTPUT_COMPARE1_B _VECTOR(13)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15)
#define SIG_OVERFLOW1 _VECTOR(15)
/* Timer/Counter0 Compare Match A */
+#define TIMER0_COMP_A_vect_num 16
#define TIMER0_COMP_A_vect _VECTOR(16)
#define SIG_OUTPUT_COMPARE0A _VECTOR(16)
#define SIG_OUTPUT_COMPARE0_A _VECTOR(16)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 17
#define TIMER0_OVF_vect _VECTOR(17)
#define SIG_OVERFLOW0 _VECTOR(17)
/* ADC Conversion Complete */
+#define ADC_vect_num 18
#define ADC_vect _VECTOR(18)
#define SIG_ADC _VECTOR(18)
/* External Interrupt Request 1 */
+#define INT1_vect_num 19
#define INT1_vect _VECTOR(19)
#define SIG_INTERRUPT1 _VECTOR(19)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 20
#define SPI_STC_vect _VECTOR(20)
#define SIG_SPI _VECTOR(20)
/* USART, Rx Complete */
+#define USART_RX_vect_num 21
#define USART_RX_vect _VECTOR(21)
#define SIG_USART_RECV _VECTOR(21)
#define SIG_UART_RECV _VECTOR(21)
/* USART Data Register Empty */
+#define USART_UDRE_vect_num 22
#define USART_UDRE_vect _VECTOR(22)
#define SIG_USART_DATA _VECTOR(22)
#define SIG_UART_DATA _VECTOR(22)
/* USART, Tx Complete */
+#define USART_TX_vect_num 23
#define USART_TX_vect _VECTOR(23)
#define SIG_USART_TRANS _VECTOR(23)
#define SIG_UART_TRANS _VECTOR(23)
/* External Interrupt Request 2 */
+#define INT2_vect_num 24
#define INT2_vect _VECTOR(24)
#define SIG_INTERRUPT2 _VECTOR(24)
/* Watchdog Timeout Interrupt */
+#define WDT_vect_num 25
#define WDT_vect _VECTOR(25)
#define SIG_WDT _VECTOR(25)
#define SIG_WATCHDOG_TIMEOUT _VECTOR(25)
/* EEPROM Ready */
+#define EE_READY_vect_num 26
#define EE_READY_vect _VECTOR(26)
#define SIG_EEPROM_READY _VECTOR(26)
/* Timer Counter 0 Compare Match B */
+#define TIMER0_COMPB_vect_num 27
#define TIMER0_COMPB_vect _VECTOR(27)
#define SIG_OUTPUT_COMPARE0B _VECTOR(27)
#define SIG_OUTPUT_COMPARE0_B _VECTOR(27)
/* External Interrupt Request 3 */
+#define INT3_vect_num 28
#define INT3_vect _VECTOR(28)
#define SIG_INTERRUPT3 _VECTOR(28)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 31
#define SPM_READY_vect _VECTOR(31)
#define SIG_SPM_READY _VECTOR(31)
Modified: trunk/avr-libc/include/avr/iocanxx.h
===================================================================
--- trunk/avr-libc/include/avr/iocanxx.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iocanxx.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -471,152 +471,188 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* External Interrupt Request 2 */
+#define INT2_vect_num 3
#define INT2_vect _VECTOR(3)
#define SIG_INTERRUPT2 _VECTOR(3)
/* External Interrupt Request 3 */
+#define INT3_vect_num 4
#define INT3_vect _VECTOR(4)
#define SIG_INTERRUPT3 _VECTOR(4)
/* External Interrupt Request 4 */
+#define INT4_vect_num 5
#define INT4_vect _VECTOR(5)
#define SIG_INTERRUPT4 _VECTOR(5)
/* External Interrupt Request 5 */
+#define INT5_vect_num 6
#define INT5_vect _VECTOR(6)
#define SIG_INTERRUPT5 _VECTOR(6)
/* External Interrupt Request 6 */
+#define INT6_vect_num 7
#define INT6_vect _VECTOR(7)
#define SIG_INTERRUPT6 _VECTOR(7)
/* External Interrupt Request 7 */
+#define INT7_vect_num 8
#define INT7_vect _VECTOR(8)
#define SIG_INTERRUPT7 _VECTOR(8)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 9
#define TIMER2_COMP_vect _VECTOR(9)
#define SIG_OUTPUT_COMPARE2 _VECTOR(9)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 10
#define TIMER2_OVF_vect _VECTOR(10)
#define SIG_OVERFLOW2 _VECTOR(10)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11)
#define SIG_INPUT_CAPTURE1 _VECTOR(11)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 12
#define TIMER1_COMPA_vect _VECTOR(12)
#define SIG_OUTPUT_COMPARE1A _VECTOR(12)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13)
#define SIG_OUTPUT_COMPARE1B _VECTOR(13)
/* Timer/Counter1 Compare Match C */
+#define TIMER1_COMPC_vect_num 14
#define TIMER1_COMPC_vect _VECTOR(14)
#define SIG_OUTPUT_COMPARE1C _VECTOR(14)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15)
#define SIG_OVERFLOW1 _VECTOR(15)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 16
#define TIMER0_COMP_vect _VECTOR(16)
#define SIG_OUTPUT_COMPARE0 _VECTOR(16)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 17
#define TIMER0_OVF_vect _VECTOR(17)
#define SIG_OVERFLOW0 _VECTOR(17)
/* CAN Transfer Complete or Error */
+#define CANIT_vect_num 18
#define CANIT_vect _VECTOR(18)
#define SIG_CAN_INTERRUPT1 _VECTOR(18)
/* CAN Timer Overrun */
+#define OVRIT_vect_num 19
#define OVRIT_vect _VECTOR(19)
#define SIG_CAN_OVERFLOW1 _VECTOR(19)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 20
#define SPI_STC_vect _VECTOR(20)
#define SIG_SPI _VECTOR(20)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 21
#define USART0_RX_vect _VECTOR(21)
#define SIG_UART0_RECV _VECTOR(21)
#define SIG_USART0_RECV _VECTOR(21)
/* USART0 Data Register Empty */
+#define USART0_UDRE_vect_num 22
#define USART0_UDRE_vect _VECTOR(22)
#define SIG_UART0_DATA _VECTOR(22)
#define SIG_USART0_DATA _VECTOR(22)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 23
#define USART0_TX_vect _VECTOR(23)
#define SIG_UART0_TRANS _VECTOR(23)
#define SIG_USART0_TRANS _VECTOR(23)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 24
#define ANALOG_COMP_vect _VECTOR(24)
#define SIG_COMPARATOR _VECTOR(24)
/* ADC Conversion Complete */
+#define ADC_vect_num 25
#define ADC_vect _VECTOR(25)
#define SIG_ADC _VECTOR(25)
/* EEPROM Ready */
+#define EE_READY_vect_num 26
#define EE_READY_vect _VECTOR(26)
#define SIG_EEPROM_READY _VECTOR(26)
/* Timer/Counter3 Capture Event */
+#define TIMER3_CAPT_vect_num 27
#define TIMER3_CAPT_vect _VECTOR(27)
#define SIG_INPUT_CAPTURE3 _VECTOR(27)
/* Timer/Counter3 Compare Match A */
+#define TIMER3_COMPA_vect_num 28
#define TIMER3_COMPA_vect _VECTOR(28)
#define SIG_OUTPUT_COMPARE3A _VECTOR(28)
/* Timer/Counter3 Compare Match B */
+#define TIMER3_COMPB_vect_num 29
#define TIMER3_COMPB_vect _VECTOR(29)
#define SIG_OUTPUT_COMPARE3B _VECTOR(29)
/* Timer/Counter3 Compare Match C */
+#define TIMER3_COMPC_vect_num 30
#define TIMER3_COMPC_vect _VECTOR(30)
#define SIG_OUTPUT_COMPARE3C _VECTOR(30)
/* Timer/Counter3 Overflow */
+#define TIMER3_OVF_vect_num 31
#define TIMER3_OVF_vect _VECTOR(31)
#define SIG_OVERFLOW3 _VECTOR(31)
/* USART1, Rx Complete */
+#define USART1_RX_vect_num 32
#define USART1_RX_vect _VECTOR(32)
#define SIG_UART1_RECV _VECTOR(32)
#define SIG_USART1_RECV _VECTOR(32)
/* USART1, Data Register Empty */
+#define USART1_UDRE_vect_num 33
#define USART1_UDRE_vect _VECTOR(33)
#define SIG_UART1_DATA _VECTOR(33)
#define SIG_USART1_DATA _VECTOR(33)
/* USART1, Tx Complete */
+#define USART1_TX_vect_num 34
#define USART1_TX_vect _VECTOR(34)
#define SIG_UART1_TRANS _VECTOR(34)
#define SIG_USART1_TRANS _VECTOR(34)
/* 2-wire Serial Interface */
+#define TWI_vect_num 35
#define TWI_vect _VECTOR(35)
#define SIG_2WIRE_SERIAL _VECTOR(35)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 36
#define SPM_READY_vect _VECTOR(36)
#define SIG_SPM_READY _VECTOR(36)
Modified: trunk/avr-libc/include/avr/iom103.h
===================================================================
--- trunk/avr-libc/include/avr/iom103.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom103.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -224,94 +224,117 @@
/* Interrupt vectors */
/* External Interrupt 0 */
-#define INT0_vect _VECTOR(1)
+#define INT0_vect_num 1
+#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt 1 */
-#define INT1_vect _VECTOR(2)
+#define INT1_vect_num 2
+#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* External Interrupt 2 */
-#define INT2_vect _VECTOR(3)
+#define INT2_vect_num 3
+#define INT2_vect _VECTOR(3)
#define SIG_INTERRUPT2 _VECTOR(3)
/* External Interrupt 3 */
-#define INT3_vect _VECTOR(4)
+#define INT3_vect_num 4
+#define INT3_vect _VECTOR(4)
#define SIG_INTERRUPT3 _VECTOR(4)
/* External Interrupt 4 */
-#define INT4_vect _VECTOR(5)
+#define INT4_vect_num 5
+#define INT4_vect _VECTOR(5)
#define SIG_INTERRUPT4 _VECTOR(5)
/* External Interrupt 5 */
-#define INT5_vect _VECTOR(6)
+#define INT5_vect_num 6
+#define INT5_vect _VECTOR(6)
#define SIG_INTERRUPT5 _VECTOR(6)
/* External Interrupt 6 */
-#define INT6_vect _VECTOR(7)
+#define INT6_vect_num 7
+#define INT6_vect _VECTOR(7)
#define SIG_INTERRUPT6 _VECTOR(7)
/* External Interrupt 7 */
-#define INT7_vect _VECTOR(8)
+#define INT7_vect_num 8
+#define INT7_vect _VECTOR(8)
#define SIG_INTERRUPT7 _VECTOR(8)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 9
#define TIMER2_COMP_vect _VECTOR(9)
#define SIG_OUTPUT_COMPARE2 _VECTOR(9)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 10
#define TIMER2_OVF_vect _VECTOR(10)
#define SIG_OVERFLOW2 _VECTOR(10)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11)
#define SIG_INPUT_CAPTURE1 _VECTOR(11)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 12
#define TIMER1_COMPA_vect _VECTOR(12)
-#define SIG_OUTPUT_COMPARE1A _VECTOR(12)
+#define SIG_OUTPUT_COMPARE1A _VECTOR(12)
/* Timer/Counter1 Compare Match B */
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13)
-#define SIG_OUTPUT_COMPARE1B _VECTOR(13)
+#define SIG_OUTPUT_COMPARE1B _VECTOR(13)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 14
#define TIMER1_OVF_vect _VECTOR(14)
#define SIG_OVERFLOW1 _VECTOR(14)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 15
#define TIMER0_COMP_vect _VECTOR(15)
#define SIG_OUTPUT_COMPARE0 _VECTOR(15)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 16
#define TIMER0_OVF_vect _VECTOR(16)
#define SIG_OVERFLOW0 _VECTOR(16)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 17
#define SPI_STC_vect _VECTOR(17)
-#define SIG_SPI _VECTOR(17)
+#define SIG_SPI _VECTOR(17)
/* UART, Rx Complete */
+#define UART_RX_vect_num 18
#define UART_RX_vect _VECTOR(18)
#define SIG_UART_RECV _VECTOR(18)
/* UART Data Register Empty */
+#define UART_UDRE_vect_num 19
#define UART_UDRE_vect _VECTOR(19)
#define SIG_UART_DATA _VECTOR(19)
/* UART, Tx Complete */
+#define UART_TX_vect_num 20
#define UART_TX_vect _VECTOR(20)
#define SIG_UART_TRANS _VECTOR(20)
/* ADC Conversion Complete */
-#define ADC_vect _VECTOR(21)
-#define SIG_ADC _VECTOR(21)
+#define ADC_vect_num 21
+#define ADC_vect _VECTOR(21)
+#define SIG_ADC _VECTOR(21)
/* EEPROM Ready */
+#define EE_READY_vect_num 22
#define EE_READY_vect _VECTOR(22)
#define SIG_EEPROM_READY _VECTOR(22)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 23
#define ANALOG_COMP_vect _VECTOR(23)
#define SIG_COMPARATOR _VECTOR(23)
Modified: trunk/avr-libc/include/avr/iom128.h
===================================================================
--- trunk/avr-libc/include/avr/iom128.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom128.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -362,145 +362,180 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
-#define INT0_vect _VECTOR(1)
+#define INT0_vect_num 1
+#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
-#define INT1_vect _VECTOR(2)
+#define INT1_vect_num 2
+#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* External Interrupt Request 2 */
-#define INT2_vect _VECTOR(3)
+#define INT2_vect_num 3
+#define INT2_vect _VECTOR(3)
#define SIG_INTERRUPT2 _VECTOR(3)
/* External Interrupt Request 3 */
-#define INT3_vect _VECTOR(4)
+#define INT3_vect_num 4
+#define INT3_vect _VECTOR(4)
#define SIG_INTERRUPT3 _VECTOR(4)
/* External Interrupt Request 4 */
-#define INT4_vect _VECTOR(5)
+#define INT4_vect_num 5
+#define INT4_vect _VECTOR(5)
#define SIG_INTERRUPT4 _VECTOR(5)
/* External Interrupt Request 5 */
-#define INT5_vect _VECTOR(6)
+#define INT5_vect_num 6
+#define INT5_vect _VECTOR(6)
#define SIG_INTERRUPT5 _VECTOR(6)
/* External Interrupt Request 6 */
-#define INT6_vect _VECTOR(7)
+#define INT6_vect_num 7
+#define INT6_vect _VECTOR(7)
#define SIG_INTERRUPT6 _VECTOR(7)
/* External Interrupt Request 7 */
-#define INT7_vect _VECTOR(8)
+#define INT7_vect_num 8
+#define INT7_vect _VECTOR(8)
#define SIG_INTERRUPT7 _VECTOR(8)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 9
#define TIMER2_COMP_vect _VECTOR(9)
#define SIG_OUTPUT_COMPARE2 _VECTOR(9)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 10
#define TIMER2_OVF_vect _VECTOR(10)
#define SIG_OVERFLOW2 _VECTOR(10)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11)
#define SIG_INPUT_CAPTURE1 _VECTOR(11)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 12
#define TIMER1_COMPA_vect _VECTOR(12)
-#define SIG_OUTPUT_COMPARE1A _VECTOR(12)
+#define SIG_OUTPUT_COMPARE1A _VECTOR(12)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13)
-#define SIG_OUTPUT_COMPARE1B _VECTOR(13)
+#define SIG_OUTPUT_COMPARE1B _VECTOR(13)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 14
#define TIMER1_OVF_vect _VECTOR(14)
#define SIG_OVERFLOW1 _VECTOR(14)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 15
#define TIMER0_COMP_vect _VECTOR(15)
#define SIG_OUTPUT_COMPARE0 _VECTOR(15)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 16
#define TIMER0_OVF_vect _VECTOR(16)
#define SIG_OVERFLOW0 _VECTOR(16)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 17
#define SPI_STC_vect _VECTOR(17)
-#define SIG_SPI _VECTOR(17)
+#define SIG_SPI _VECTOR(17)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 18
#define USART0_RX_vect _VECTOR(18)
#define SIG_USART0_RECV _VECTOR(18)
#define SIG_UART0_RECV _VECTOR(18)
/* USART0 Data Register Empty */
+#define USART0_UDRE_vect_num 19
#define USART0_UDRE_vect _VECTOR(19)
#define SIG_USART0_DATA _VECTOR(19)
#define SIG_UART0_DATA _VECTOR(19)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 20
#define USART0_TX_vect _VECTOR(20)
#define SIG_USART0_TRANS _VECTOR(20)
#define SIG_UART0_TRANS _VECTOR(20)
/* ADC Conversion Complete */
-#define ADC_vect _VECTOR(21)
-#define SIG_ADC _VECTOR(21)
+#define ADC_vect_num 21
+#define ADC_vect _VECTOR(21)
+#define SIG_ADC _VECTOR(21)
/* EEPROM Ready */
#define EE_READY_vect _VECTOR(22)
+#define EE_READY_vect _VECTOR(22)
#define SIG_EEPROM_READY _VECTOR(22)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 23
#define ANALOG_COMP_vect _VECTOR(23)
#define SIG_COMPARATOR _VECTOR(23)
/* Timer/Counter1 Compare Match C */
+#define TIMER1_COMPC_vect_num 24
#define TIMER1_COMPC_vect _VECTOR(24)
-#define SIG_OUTPUT_COMPARE1C _VECTOR(24)
+#define SIG_OUTPUT_COMPARE1C _VECTOR(24)
/* Timer/Counter3 Capture Event */
+#define TIMER3_CAPT_vect_num 25
#define TIMER3_CAPT_vect _VECTOR(25)
#define SIG_INPUT_CAPTURE3 _VECTOR(25)
/* Timer/Counter3 Compare Match A */
+#define TIMER3_COMPA_vect_num 26
#define TIMER3_COMPA_vect _VECTOR(26)
-#define SIG_OUTPUT_COMPARE3A _VECTOR(26)
+#define SIG_OUTPUT_COMPARE3A _VECTOR(26)
/* Timer/Counter3 Compare Match B */
+#define TIMER3_COMPB_vect_num 27
#define TIMER3_COMPB_vect _VECTOR(27)
-#define SIG_OUTPUT_COMPARE3B _VECTOR(27)
+#define SIG_OUTPUT_COMPARE3B _VECTOR(27)
/* Timer/Counter3 Compare Match C */
+#define TIMER3_COMPC_vect_num 28
#define TIMER3_COMPC_vect _VECTOR(28)
-#define SIG_OUTPUT_COMPARE3C _VECTOR(28)
+#define SIG_OUTPUT_COMPARE3C _VECTOR(28)
/* Timer/Counter3 Overflow */
+#define TIMER3_OVF_vect_num 29
#define TIMER3_OVF_vect _VECTOR(29)
#define SIG_OVERFLOW3 _VECTOR(29)
/* USART1, Rx Complete */
+#define USART1_RX_vect_num 30
#define USART1_RX_vect _VECTOR(30)
#define SIG_USART1_RECV _VECTOR(30)
#define SIG_UART1_RECV _VECTOR(30)
/* USART1, Data Register Empty */
+#define USART1_UDRE_vect_num 31
#define USART1_UDRE_vect _VECTOR(31)
#define SIG_USART1_DATA _VECTOR(31)
#define SIG_UART1_DATA _VECTOR(31)
/* USART1, Tx Complete */
+#define USART1_TX_vect_num 32
#define USART1_TX_vect _VECTOR(32)
#define SIG_USART1_TRANS _VECTOR(32)
#define SIG_UART1_TRANS _VECTOR(32)
/* 2-wire Serial Interface */
-#define TWI_vect _VECTOR(33)
+#define TWI_vect_num 33
+#define TWI_vect _VECTOR(33)
#define SIG_2WIRE_SERIAL _VECTOR(33)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 34
#define SPM_READY_vect _VECTOR(34)
+#define SPM_READY_vect _VECTOR(34)
#define SIG_SPM_READY _VECTOR(34)
#define _VECTORS_SIZE 140
Modified: trunk/avr-libc/include/avr/iom1284p.h
===================================================================
--- trunk/avr-libc/include/avr/iom1284p.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom1284p.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -1037,39 +1037,106 @@
/* Interrupt Vectors */
/* Interrupt Vector 0 is the reset vector. */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1) /* External Interrupt Request 0 */
+
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2) /* External Interrupt Request 1 */
+
+#define INT2_vect_num 3
#define INT2_vect _VECTOR(3) /* External Interrupt Request 2 */
+
+#define PCINT0_vect_num 4
#define PCINT0_vect _VECTOR(4) /* Pin Change Interrupt Request 0 */
+
+#define PCINT1_vect_num 5
#define PCINT1_vect _VECTOR(5) /* Pin Change Interrupt Request 1 */
+
+#define PCINT2_vect_num 6
#define PCINT2_vect _VECTOR(6) /* Pin Change Interrupt Request 2 */
+
+#define PCINT3_vect_num 7
#define PCINT3_vect _VECTOR(7) /* Pin Change Interrupt Request 3 */
+
+#define WDT_vect_num 8
#define WDT_vect _VECTOR(8) /* Watchdog Time-out Interrupt */
+
+#define TIMER2_COMPA_vect_num 9
#define TIMER2_COMPA_vect _VECTOR(9) /* Timer/Counter2 Compare Match A */
+
+#define TIMER2_COMPB_vect_num 10
#define TIMER2_COMPB_vect _VECTOR(10) /* Timer/Counter2 Compare Match B */
+
+#define TIMER2_OVF_vect_num 11
#define TIMER2_OVF_vect _VECTOR(11) /* Timer/Counter2 Overflow */
+
+#define TIMER1_CAPT_vect_num 12
#define TIMER1_CAPT_vect _VECTOR(12) /* Timer/Counter1 Capture Event */
+
+#define TIMER1_COMPA_vect_num 13
#define TIMER1_COMPA_vect _VECTOR(13) /* Timer/Counter1 Compare Match A */
+
+#define TIMER1_COMPB_vect_num 14
#define TIMER1_COMPB_vect _VECTOR(14) /* Timer/Counter1 Compare Match B */
+
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15) /* Timer/Counter1 Overflow */
+
+#define TIMER0_COMPA_vect_num 16
#define TIMER0_COMPA_vect _VECTOR(16) /* Timer/Counter0 Compare Match A */
+
+#define TIMER0_COMPB_vect_num 17
#define TIMER0_COMPB_vect _VECTOR(17) /* Timer/Counter0 Compare Match B */
+
+#define TIMER0_OVF_vect_num 18
#define TIMER0_OVF_vect _VECTOR(18) /* Timer/Counter0 Overflow */
+
+#define SPI_STC_vect_num 19
#define SPI_STC_vect _VECTOR(19) /* SPI Serial Transfer Complete */
+
+#define USART0_RX_vect_num 20
#define USART0_RX_vect _VECTOR(20) /* USART0, Rx Complete */
+
+#define USART0_UDRE_vect_num 21
#define USART0_UDRE_vect _VECTOR(21) /* USART0 Data register Empty */
+
+#define USART0_TX_vect_num 22
#define USART0_TX_vect _VECTOR(22) /* USART0, Tx Complete */
+
+#define ANALOG_COMP_vect_num 23
#define ANALOG_COMP_vect _VECTOR(23) /* Analog Comparator */
+
+#define ADC_vect_num 24
#define ADC_vect _VECTOR(24) /* ADC Conversion Complete */
+
+#define EE_READY_vect_num 25
#define EE_READY_vect _VECTOR(25) /* EEPROM Ready */
+
+#define TWI_vect_num 26
#define TWI_vect _VECTOR(26) /* 2-wire Serial Interface */
+
+#define SPM_READY_vect_num 27
#define SPM_READY_vect _VECTOR(27) /* Store Program Memory Read */
+
+#define USART1_RX_vect_num 28
#define USART1_RX_vect _VECTOR(28) /* USART1 RX complete */
+
+#define USART1_UDRE_vect_num 29
#define USART1_UDRE_vect _VECTOR(29) /* USART1 Data Register Empty */
+
+#define USART1_TX_vect_num 30
#define USART1_TX_vect _VECTOR(30) /* USART1 TX complete */
+
+#define TIMER3_CAPT_vect_num 31
#define TIMER3_CAPT_vect _VECTOR(31) /* Timer/Counter3 Capture Event */
+
+#define TIMER3_COMPA_vect_num 32
#define TIMER3_COMPA_vect _VECTOR(32) /* Timer/Counter3 Compare Match A */
+
+#define TIMER3_COMPB_vect_num 33
#define TIMER3_COMPB_vect _VECTOR(33) /* Timer/Counter3 Compare Match B */
+
+#define TIMER3_OVF_vect_num 34
#define TIMER3_OVF_vect _VECTOR(34) /* Timer/Counter3 Overflow */
#define _VECTORS_SIZE (35 * 4)
Modified: trunk/avr-libc/include/avr/iom16.h
===================================================================
--- trunk/avr-libc/include/avr/iom16.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom16.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -478,85 +478,105 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector. */
/* External Interrupt Request 0 */
-#define INT0_vect _VECTOR(1)
+#define INT0_vect_num 1
+#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
-#define INT1_vect _VECTOR(2)
+#define INT1_vect_num 2
+#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 3
#define TIMER2_COMP_vect _VECTOR(3)
#define SIG_OUTPUT_COMPARE2 _VECTOR(3)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 4
#define TIMER2_OVF_vect _VECTOR(4)
#define SIG_OVERFLOW2 _VECTOR(4)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 5
#define TIMER1_CAPT_vect _VECTOR(5)
#define SIG_INPUT_CAPTURE1 _VECTOR(5)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 6
#define TIMER1_COMPA_vect _VECTOR(6)
-#define SIG_OUTPUT_COMPARE1A _VECTOR(6)
+#define SIG_OUTPUT_COMPARE1A _VECTOR(6)
/* Timer/Counter1 Compare Match B */
+#define TIMER1_COMPB_vect_num 7
#define TIMER1_COMPB_vect _VECTOR(7)
-#define SIG_OUTPUT_COMPARE1B _VECTOR(7)
+#define SIG_OUTPUT_COMPARE1B _VECTOR(7)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 8
#define TIMER1_OVF_vect _VECTOR(8)
#define SIG_OVERFLOW1 _VECTOR(8)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 9
#define TIMER0_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW0 _VECTOR(9)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 10
#define SPI_STC_vect _VECTOR(10)
-#define SIG_SPI _VECTOR(10)
+#define SIG_SPI _VECTOR(10)
/* USART, Rx Complete */
+#define USART_RXC_vect_num 11
#define USART_RXC_vect _VECTOR(11)
#define SIG_USART_RECV _VECTOR(11)
#define SIG_UART_RECV _VECTOR(11)
/* USART Data Register Empty */
+#define USART_UDRE_vect_num 12
#define USART_UDRE_vect _VECTOR(12)
#define SIG_USART_DATA _VECTOR(12)
#define SIG_UART_DATA _VECTOR(12)
/* USART, Tx Complete */
+#define USART_TXC_vect_num 13
#define USART_TXC_vect _VECTOR(13)
#define SIG_USART_TRANS _VECTOR(13)
#define SIG_UART_TRANS _VECTOR(13)
/* ADC Conversion Complete */
-#define ADC_vect _VECTOR(14)
-#define SIG_ADC _VECTOR(14)
+#define ADC_vect_num 14
+#define ADC_vect _VECTOR(14)
+#define SIG_ADC _VECTOR(14)
/* EEPROM Ready */
-#define EE_RDY_vect _VECTOR(15)
+#define EE_RDY_vect_num 15
+#define EE_RDY_vect _VECTOR(15)
#define SIG_EEPROM_READY _VECTOR(15)
/* Analog Comparator */
+#define ANA_COMP_vect_num 16
#define ANA_COMP_vect _VECTOR(16)
#define SIG_COMPARATOR _VECTOR(16)
/* 2-wire Serial Interface */
-#define TWI_vect _VECTOR(17)
+#define TWI_vect_num 17
+#define TWI_vect _VECTOR(17)
#define SIG_2WIRE_SERIAL _VECTOR(17)
/* External Interrupt Request 2 */
-#define INT2_vect _VECTOR(18)
+#define INT2_vect_num 18
+#define INT2_vect _VECTOR(18)
#define SIG_INTERRUPT2 _VECTOR(18)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 19
#define TIMER0_COMP_vect _VECTOR(19)
#define SIG_OUTPUT_COMPARE0 _VECTOR(19)
/* Store Program Memory Ready */
+#define SPM_RDY_vect_num 20
#define SPM_RDY_vect _VECTOR(20)
#define SIG_SPM_READY _VECTOR(20)
Modified: trunk/avr-libc/include/avr/iom161.h
===================================================================
--- trunk/avr-libc/include/avr/iom161.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom161.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -228,82 +228,102 @@
/* Interrupt vectors */
/* External Interrupt 0 */
-#define INT0_vect _VECTOR(1)
+#define INT0_vect_num 1
+#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt 1 */
-#define INT1_vect _VECTOR(2)
+#define INT1_vect_num 2
+#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* External Interrupt 2 */
-#define INT2_vect _VECTOR(3)
+#define INT2_vect_num 3
+#define INT2_vect _VECTOR(3)
#define SIG_INTERRUPT2 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
-#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
+#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter1 Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
-#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
+#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
-#define SIG_SPI _VECTOR(12)
+#define SIG_SPI _VECTOR(12)
/* UART0, Rx Complete */
+#define UART0_RX_vect_num 13
#define UART0_RX_vect _VECTOR(13)
#define SIG_UART0_RECV _VECTOR(13)
/* UART1, Rx Complete */
+#define UART1_RX_vect_num 14
#define UART1_RX_vect _VECTOR(14)
#define SIG_UART1_RECV _VECTOR(14)
/* UART0 Data Register Empty */
+#define UART0_UDRE_vect_num 15
#define UART0_UDRE_vect _VECTOR(15)
#define SIG_UART0_DATA _VECTOR(15)
/* UART1 Data Register Empty */
+#define UART1_UDRE_vect_num 16
#define UART1_UDRE_vect _VECTOR(16)
#define SIG_UART1_DATA _VECTOR(16)
/* UART0, Tx Complete */
+#define UART0_TX_vect_num 17
#define UART0_TX_vect _VECTOR(17)
#define SIG_UART0_TRANS _VECTOR(17)
/* UART1, Tx Complete */
+#define UART1_TX_vect_num 18
#define UART1_TX_vect _VECTOR(18)
#define SIG_UART1_TRANS _VECTOR(18)
/* EEPROM Ready */
-#define EE_RDY_vect _VECTOR(19)
+#define EE_RDY_vect_num 19
+#define EE_RDY_vect _VECTOR(19)
#define SIG_EEPROM_READY _VECTOR(19)
/* Analog Comparator */
+#define ANA_COMP_vect_num 20
#define ANA_COMP_vect _VECTOR(20)
#define SIG_COMPARATOR _VECTOR(20)
Modified: trunk/avr-libc/include/avr/iom162.h
===================================================================
--- trunk/avr-libc/include/avr/iom162.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom162.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -169,110 +169,137 @@
/* Interrupt vectors (byte addresses) */
/* External Interrupt Request 0 */
-#define INT0_vect _VECTOR(1)
+#define INT0_vect_num 1
+#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
-#define INT1_vect _VECTOR(2)
+#define INT1_vect_num 2
+#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* External Interrupt Request 2 */
-#define INT2_vect _VECTOR(3)
+#define INT2_vect_num 3
+#define INT2_vect _VECTOR(3)
#define SIG_INTERRUPT2 _VECTOR(3)
/* Pin Change Interrupt Request 0 */
-#define PCINT0_vect _VECTOR(4)
+#define PCINT0_vect_num 4
+#define PCINT0_vect _VECTOR(4)
#define SIG_PIN_CHANGE0 _VECTOR(4)
/* Pin Change Interrupt Request 1 */
-#define PCINT1_vect _VECTOR(5)
+#define PCINT1_vect_num 5
+#define PCINT1_vect _VECTOR(5)
#define SIG_PIN_CHANGE1 _VECTOR(5)
/* Timer/Counter3 Capture Event */
+#define TIMER3_CAPT_vect_num 6
#define TIMER3_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE3 _VECTOR(6)
/* Timer/Counter3 Compare Match A */
-#define TIMER3_COMPA_vect _VECTOR(7)
-#define SIG_OUTPUT_COMPARE3A _VECTOR(7)
+#define TIMER3_COMPA_vect_num 7
+#define TIMER3_COMPA_vect _VECTOR(7)
+#define SIG_OUTPUT_COMPARE3A _VECTOR(7)
/* Timer/Counter3 Compare Match B */
+#define TIMER3_COMPB_vect_num 8
#define TIMER3_COMPB_vect _VECTOR(8)
-#define SIG_OUTPUT_COMPARE3B _VECTOR(8)
+#define SIG_OUTPUT_COMPARE3B _VECTOR(8)
/* Timer/Counter3 Overflow */
+#define TIMER3_OVF_vect_num 9
#define TIMER3_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW3 _VECTOR(9)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 10
#define TIMER2_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE2 _VECTOR(10)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 11
#define TIMER2_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW2 _VECTOR(11)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 12
#define TIMER1_CAPT_vect _VECTOR(12)
#define SIG_INPUT_CAPTURE1 _VECTOR(12)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 13
#define TIMER1_COMPA_vect _VECTOR(13)
-#define SIG_OUTPUT_COMPARE1A _VECTOR(13)
+#define SIG_OUTPUT_COMPARE1A _VECTOR(13)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 14
#define TIMER1_COMPB_vect _VECTOR(14)
-#define SIG_OUTPUT_COMPARE1B _VECTOR(14)
+#define SIG_OUTPUT_COMPARE1B _VECTOR(14)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15)
#define SIG_OVERFLOW1 _VECTOR(15)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 16
#define TIMER0_COMP_vect _VECTOR(16)
#define SIG_OUTPUT_COMPARE0 _VECTOR(16)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 17
#define TIMER0_OVF_vect _VECTOR(17)
#define SIG_OVERFLOW0 _VECTOR(17)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 18
#define SPI_STC_vect _VECTOR(18)
-#define SIG_SPI _VECTOR(18)
+#define SIG_SPI _VECTOR(18)
/* USART0, Rx Complete */
+#define USART0_RXC_vect_num 19
#define USART0_RXC_vect _VECTOR(19)
#define SIG_USART0_RECV _VECTOR(19)
/* USART1, Rx Complete */
+#define USART1_RXC_vect_num 20
#define USART1_RXC_vect _VECTOR(20)
#define SIG_USART1_RECV _VECTOR(20)
/* USART0 Data register Empty */
+#define USART0_UDRE_vect_num 21
#define USART0_UDRE_vect _VECTOR(21)
#define SIG_USART0_DATA _VECTOR(21)
/* USART1, Data register Empty */
+#define USART1_UDRE_vect_num 22
#define USART1_UDRE_vect _VECTOR(22)
#define SIG_USART1_DATA _VECTOR(22)
/* USART0, Tx Complete */
+#define USART0_TXC_vect_num 23
#define USART0_TXC_vect _VECTOR(23)
#define SIG_USART0_TRANS _VECTOR(23)
/* USART1, Tx Complete */
+#define USART1_TXC_vect_num 24
#define USART1_TXC_vect _VECTOR(24)
#define SIG_USART1_TRANS _VECTOR(24)
/* EEPROM Ready */
-#define EE_RDY_vect _VECTOR(25)
+#define EE_RDY_vect_num 25
+#define EE_RDY_vect _VECTOR(25)
#define SIG_EEPROM_READY _VECTOR(25)
/* Analog Comparator */
+#define ANA_COMP_vect_num 26
#define ANA_COMP_vect _VECTOR(26)
#define SIG_COMPARATOR _VECTOR(26)
/* Store Program Memory Read */
+#define SPM_RDY_vect_num 27
#define SPM_RDY_vect _VECTOR(27)
#define SIG_SPM_READY _VECTOR(27)
Modified: trunk/avr-libc/include/avr/iom163.h
===================================================================
--- trunk/avr-libc/include/avr/iom163.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom163.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -166,71 +166,88 @@
/* Interrupt vectors */
/* External Interrupt 0 */
-#define INT0_vect _VECTOR(1)
-#define SIG_INTERRUPT0 _VECTOR(1)
+#define INT0_vect_num 1
+#define INT0_vect _VECTOR(1)
+#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt 1 */
-#define INT1_vect _VECTOR(2)
-#define SIG_INTERRUPT1 _VECTOR(2)
+#define INT1_vect_num 2
+#define INT1_vect _VECTOR(2)
+#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 3
#define TIMER2_COMP_vect _VECTOR(3)
#define SIG_OUTPUT_COMPARE2 _VECTOR(3)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 4
#define TIMER2_OVF_vect _VECTOR(4)
#define SIG_OVERFLOW2 _VECTOR(4)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 5
#define TIMER1_CAPT_vect _VECTOR(5)
#define SIG_INPUT_CAPTURE1 _VECTOR(5)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 6
#define TIMER1_COMPA_vect _VECTOR(6)
-#define SIG_OUTPUT_COMPARE1A _VECTOR(6)
+#define SIG_OUTPUT_COMPARE1A _VECTOR(6)
/* Timer/Counter1 Compare Match B */
+#define TIMER1_COMPB_vect_num 7
#define TIMER1_COMPB_vect _VECTOR(7)
-#define SIG_OUTPUT_COMPARE1B _VECTOR(7)
+#define SIG_OUTPUT_COMPARE1B _VECTOR(7)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 8
#define TIMER1_OVF_vect _VECTOR(8)
#define SIG_OVERFLOW1 _VECTOR(8)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 9
#define TIMER0_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW0 _VECTOR(9)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 10
#define SPI_STC_vect _VECTOR(10)
-#define SIG_SPI _VECTOR(10)
+#define SIG_SPI _VECTOR(10)
/* UART, RX Complete */
+#define UART_RX_vect_num 11
#define UART_RX_vect _VECTOR(11)
#define SIG_UART_RECV _VECTOR(11)
/* UART Data Register Empty */
+#define UART_UDRE_vect_num 12
#define UART_UDRE_vect _VECTOR(12)
#define SIG_UART_DATA _VECTOR(12)
/* UART, TX Complete */
+#define UART_TX_vect_num 13
#define UART_TX_vect _VECTOR(13)
#define SIG_UART_TRANS _VECTOR(13)
/* ADC Conversion Complete */
-#define ADC_vect _VECTOR(14)
-#define SIG_ADC _VECTOR(14)
+#define ADC_vect_num 14
+#define ADC_vect _VECTOR(14)
+#define SIG_ADC _VECTOR(14)
/* EEPROM Ready */
-#define EE_RDY_vect _VECTOR(15)
+#define EE_RDY_vect_num 15
+#define EE_RDY_vect _VECTOR(15)
#define SIG_EEPROM_READY _VECTOR(15)
/* Analog Comparator */
+#define ANA_COMP_vect_num 16
#define ANA_COMP_vect _VECTOR(16)
#define SIG_COMPARATOR _VECTOR(16)
/* 2-Wire Serial Interface */
-#define TWI_vect _VECTOR(17)
+#define TWI_vect_num 17
+#define TWI_vect _VECTOR(17)
#define SIG_2WIRE_SERIAL _VECTOR(17)
#define _VECTORS_SIZE 72
Modified: trunk/avr-libc/include/avr/iom165.h
===================================================================
--- trunk/avr-libc/include/avr/iom165.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom165.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -674,89 +674,110 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 13
#define USART0_RX_vect _VECTOR(13)
#define USART_RX_vect _VECTOR(13) /* Alias */
#define SIG_UART_RECV _VECTOR(13)
/* USART0 Data register Empty */
+#define USART0_UDRE_vect_num 14
#define USART0_UDRE_vect _VECTOR(14)
#define USART_UDRE_vect _VECTOR(14) /* Alias */
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define USART_TX_vect _VECTOR(15) /* Alias */
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
Modified: trunk/avr-libc/include/avr/iom165p.h
===================================================================
--- trunk/avr-libc/include/avr/iom165p.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom165p.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -675,90 +675,112 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
+
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 13
#define USART0_RX_vect _VECTOR(13)
#define USART_RX_vect _VECTOR(13) /* Alias */
#define SIG_UART_RECV _VECTOR(13)
/* USART0 Data register Empty */
+#define USART0_UDRE_vect_num 14
#define USART0_UDRE_vect _VECTOR(14)
#define USART_UDRE_vect _VECTOR(14) /* Alias */
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define USART_TX_vect _VECTOR(15) /* Alias */
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
Modified: trunk/avr-libc/include/avr/iom168p.h
===================================================================
--- trunk/avr-libc/include/avr/iom168p.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom168p.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -785,30 +785,80 @@
/* Interrupt Vectors */
/* Interrupt Vector 0 is the reset vector. */
+
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1) /* External Interrupt Request 0 */
+
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2) /* External Interrupt Request 1 */
+
+#define PCINT0_vect_num 3
#define PCINT0_vect _VECTOR(3) /* Pin Change Interrupt Request 0 */
+
+#define PCINT1_vect_num 4
#define PCINT1_vect _VECTOR(4) /* Pin Change Interrupt Request 0 */
+
+#define PCINT2_vect_num 5
#define PCINT2_vect _VECTOR(5) /* Pin Change Interrupt Request 1 */
+
+#define WDT_vect_num 6
#define WDT_vect _VECTOR(6) /* Watchdog Time-out Interrupt */
+
+#define TIMER2_COMPA_vect_num 7
#define TIMER2_COMPA_vect _VECTOR(7) /* Timer/Counter2 Compare Match A */
+
+#define TIMER2_COMPB_vect_num 8
#define TIMER2_COMPB_vect _VECTOR(8) /* Timer/Counter2 Compare Match A */
+
+#define TIMER2_OVF_vect_num 9
#define TIMER2_OVF_vect _VECTOR(9) /* Timer/Counter2 Overflow */
+
+#define TIMER1_CAPT_vect_num 10
#define TIMER1_CAPT_vect _VECTOR(10) /* Timer/Counter1 Capture Event */
+
+#define TIMER1_COMPA_vect_num 11
#define TIMER1_COMPA_vect _VECTOR(11) /* Timer/Counter1 Compare Match A */
+
+#define TIMER1_COMPB_vect_num 12
#define TIMER1_COMPB_vect _VECTOR(12) /* Timer/Counter1 Compare Match B */
+
+#define TIMER1_OVF_vect_num 13
#define TIMER1_OVF_vect _VECTOR(13) /* Timer/Counter1 Overflow */
+
+#define TIMER0_COMPA_vect_num 14
#define TIMER0_COMPA_vect _VECTOR(14) /* TimerCounter0 Compare Match A */
+
+#define TIMER0_COMPB_vect_num 15
#define TIMER0_COMPB_vect _VECTOR(15) /* TimerCounter0 Compare Match B */
+
+#define TIMER0_OVF_vect_num 16
#define TIMER0_OVF_vect _VECTOR(16) /* Timer/Couner0 Overflow */
+
+#define SPI_STC_vect_num 17
#define SPI_STC_vect _VECTOR(17) /* SPI Serial Transfer Complete */
+
+#define USART_RX_vect_num 18
#define USART_RX_vect _VECTOR(18) /* USART Rx Complete */
+
+#define USART_UDRE_vect_num 19
#define USART_UDRE_vect _VECTOR(19) /* USART, Data Register Empty */
+
+#define USART_TX_vect_num 20
#define USART_TX_vect _VECTOR(20) /* USART Tx Complete */
+
+#define ADC_vect_num 21
#define ADC_vect _VECTOR(21) /* ADC Conversion Complete */
+
+#define EE_READY_vect_num 22
#define EE_READY_vect _VECTOR(22) /* EEPROM Ready */
+
+#define ANALOG_COMP_vect_num 23
#define ANALOG_COMP_vect _VECTOR(23) /* Analog Comparator */
+
+#define TWI_vect_num 24
#define TWI_vect _VECTOR(24) /* Two-wire Serial Interface */
+
+#define SPM_READY_vect_num 25
#define SPM_READY_vect _VECTOR(25) /* Store Program Memory Read */
#define _VECTORS_SIZE (26 * 4)
Modified: trunk/avr-libc/include/avr/iom169.h
===================================================================
--- trunk/avr-libc/include/avr/iom169.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom169.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -328,90 +328,112 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 13
#define USART0_RX_vect _VECTOR(13)
#define SIG_USART_RECV _VECTOR(13)
/* USART0 Data register Empty */
+#define USART0_UDRE_vect_num 14
#define USART0_UDRE_vect _VECTOR(14)
#define SIG_USART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define SIG_USART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
/* LCD Start of Frame */
+#define LCD_vect_num 22
#define LCD_vect _VECTOR(22)
#define SIG_LCD _VECTOR(22)
Modified: trunk/avr-libc/include/avr/iom169p.h
===================================================================
--- trunk/avr-libc/include/avr/iom169p.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom169p.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -884,90 +884,112 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 13
#define USART0_RX_vect _VECTOR(13)
#define SIG_USART_RECV _VECTOR(13)
/* USART0 Data register Empty */
+#define USART0_UDRE_vect_num 14
#define USART0_UDRE_vect _VECTOR(14)
#define SIG_USART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define SIG_USART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
/* LCD Start of Frame */
+#define LCD_vect_num 22
#define LCD_vect _VECTOR(22)
#define SIG_LCD _VECTOR(22)
Modified: trunk/avr-libc/include/avr/iom16hvbrevb.h
===================================================================
--- trunk/avr-libc/include/avr/iom16hvbrevb.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom16hvbrevb.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Atmel Corporation
+/* Copyright (c) 2009, 2011 Atmel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -28,9 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. */
-/* $Id: iom16hvb.h 2086 2009-12-15 03:24:16Z arcanum $ */
+/* $Id: iom16hvbrevb.h 2086 2009-12-15 03:24:16Z arcanum $ */
-/* avr/iom16hvb.h - definitions for ATmega16HVB */
+/* avr/iom16hvbrevb.h - definitions for ATmega16HVB revision B */
/* This file should only be included from <avr/io.h>, never directly. */
@@ -39,14 +39,14 @@
#endif
#ifndef _AVR_IOXXX_H_
-# define _AVR_IOXXX_H_ "iom16hvb.h"
+# define _AVR_IOXXX_H_ "iom16hvbrevb.h"
#else
# error "Attempt to include more than one <avr/ioXXX.h> file."
#endif
-#ifndef _AVR_ATmega16HVB_H_
-#define _AVR_ATmega16HVB_H_ 1
+#ifndef _AVR_ATmega16HVBREVB_H_
+#define _AVR_ATmega16HVBREVB_H_ 1
/* Registers and associated bit numbers. */
@@ -1035,5 +1035,5 @@
#define OC_PIN PINOC
#define OC_BIT OC
-#endif /* _AVR_ATmega16HVB_H_ */
+#endif /* _AVR_ATmega16HVBREVB_H_ */
Modified: trunk/avr-libc/include/avr/iom32.h
===================================================================
--- trunk/avr-libc/include/avr/iom32.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom32.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -171,85 +171,105 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* External Interrupt Request 2 */
+#define INT2_vect_num 3
#define INT2_vect _VECTOR(3)
#define SIG_INTERRUPT2 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter1 Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART, Rx Complete */
+#define USART_RXC_vect_num 13
#define USART_RXC_vect _VECTOR(13)
#define SIG_USART_RECV _VECTOR(13)
#define SIG_UART_RECV _VECTOR(13)
/* USART Data Register Empty */
+#define USART_UDRE_vect_num 14
#define USART_UDRE_vect _VECTOR(14)
#define SIG_USART_DATA _VECTOR(14)
#define SIG_UART_DATA _VECTOR(14)
/* USART, Tx Complete */
+#define USART_TXC_vect_num 15
#define USART_TXC_vect _VECTOR(15)
#define SIG_USART_TRANS _VECTOR(15)
#define SIG_UART_TRANS _VECTOR(15)
/* ADC Conversion Complete */
+#define ADC_vect_num 16
#define ADC_vect _VECTOR(16)
#define SIG_ADC _VECTOR(16)
/* EEPROM Ready */
+#define EE_RDY_vect_num 17
#define EE_RDY_vect _VECTOR(17)
#define SIG_EEPROM_READY _VECTOR(17)
/* Analog Comparator */
+#define ANA_COMP_vect_num 18
#define ANA_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* 2-wire Serial Interface */
+#define TWI_vect_num 19
#define TWI_vect _VECTOR(19)
#define SIG_2WIRE_SERIAL _VECTOR(19)
/* Store Program Memory Ready */
+#define SPM_RDY_vect_num 20
#define SPM_RDY_vect _VECTOR(20)
#define SIG_SPM_READY _VECTOR(20)
Modified: trunk/avr-libc/include/avr/iom323.h
===================================================================
--- trunk/avr-libc/include/avr/iom323.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom323.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -171,82 +171,102 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* External Interrupt Request 2 */
+#define INT2_vect_num 3
#define INT2_vect _VECTOR(3)
#define SIG_INTERRUPT2 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter1 Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART, Rx Complete */
+#define USART_RXC_vect_num 13
#define USART_RXC_vect _VECTOR(13)
#define SIG_UART_RECV _VECTOR(13)
/* USART Data Register Empty */
+#define USART_UDRE_vect_num 14
#define USART_UDRE_vect _VECTOR(14)
#define SIG_UART_DATA _VECTOR(14)
/* USART, Tx Complete */
+#define USART_TXC_vect_num 15
#define USART_TXC_vect _VECTOR(15)
#define SIG_UART_TRANS _VECTOR(15)
/* ADC Conversion Complete */
+#define ADC_vect_num 16
#define ADC_vect _VECTOR(16)
#define SIG_ADC _VECTOR(16)
/* EEPROM Ready */
+#define EE_RDY_vect_num 17
#define EE_RDY_vect _VECTOR(17)
#define SIG_EEPROM_READY _VECTOR(17)
/* Analog Comparator */
+#define ANA_COMP_vect_num 18
#define ANA_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* 2-wire Serial Interface */
+#define TWI_vect_num 19
#define TWI_vect _VECTOR(19)
#define SIG_2WIRE_SERIAL _VECTOR(19)
/* Store Program Memory Ready */
+#define SPM_RDY_vect_num 20
#define SPM_RDY_vect _VECTOR(20)
#define _VECTORS_SIZE 80
Modified: trunk/avr-libc/include/avr/iom325.h
===================================================================
--- trunk/avr-libc/include/avr/iom325.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom325.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -675,87 +675,109 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
+
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 13
#define USART0_RX_vect _VECTOR(13)
#define SIG_UART_RECV _VECTOR(13)
/* USART0 Data register Empty */
+#define USART0_UDRE_vect_num 14
#define USART0_UDRE_vect _VECTOR(14)
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
Modified: trunk/avr-libc/include/avr/iom3250.h
===================================================================
--- trunk/avr-libc/include/avr/iom3250.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom3250.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -756,98 +756,122 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
+
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART, Rx Complete */
+#define USART_RX_vect_num 13
#define USART_RX_vect _VECTOR(13)
#define USART0_RX_vect _VECTOR(13) /* Alias */
#define SIG_UART_RECV _VECTOR(13)
/* USART Data register Empty */
+#define USART_UDRE_vect_num 14
#define USART_UDRE_vect _VECTOR(14)
#define USART0_UDRE_vect _VECTOR(14) /* Alias */
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define USART_TX_vect _VECTOR(15) /* Alias */
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
/* Pin Change Interrupt Request 2 */
+#define PCINT2_vect_num 23
#define PCINT2_vect _VECTOR(23)
#define SIG_PIN_CHANGE2 _VECTOR(23)
/* Pin Change Interrupt Request 3 */
+#define PCINT3_vect_num 24
#define PCINT3_vect _VECTOR(24)
#define SIG_PIN_CHANGE3 _VECTOR(24)
Modified: trunk/avr-libc/include/avr/iom328p.h
===================================================================
--- trunk/avr-libc/include/avr/iom328p.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom328p.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -786,30 +786,80 @@
/* Interrupt Vectors */
/* Interrupt Vector 0 is the reset vector. */
+
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1) /* External Interrupt Request 0 */
+
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2) /* External Interrupt Request 1 */
+
+#define PCINT0_vect_num 3
#define PCINT0_vect _VECTOR(3) /* Pin Change Interrupt Request 0 */
+
+#define PCINT1_vect_num 4
#define PCINT1_vect _VECTOR(4) /* Pin Change Interrupt Request 0 */
+
+#define PCINT2_vect_num 5
#define PCINT2_vect _VECTOR(5) /* Pin Change Interrupt Request 1 */
+
+#define WDT_vect_num 6
#define WDT_vect _VECTOR(6) /* Watchdog Time-out Interrupt */
+
+#define TIMER2_COMPA_vect_num 7
#define TIMER2_COMPA_vect _VECTOR(7) /* Timer/Counter2 Compare Match A */
+
+#define TIMER2_COMPB_vect_num 8
#define TIMER2_COMPB_vect _VECTOR(8) /* Timer/Counter2 Compare Match A */
+
+#define TIMER2_OVF_vect_num 9
#define TIMER2_OVF_vect _VECTOR(9) /* Timer/Counter2 Overflow */
+
+#define TIMER1_CAPT_vect_num 10
#define TIMER1_CAPT_vect _VECTOR(10) /* Timer/Counter1 Capture Event */
+
+#define TIMER1_COMPA_vect_num 11
#define TIMER1_COMPA_vect _VECTOR(11) /* Timer/Counter1 Compare Match A */
+
+#define TIMER1_COMPB_vect_num 12
#define TIMER1_COMPB_vect _VECTOR(12) /* Timer/Counter1 Compare Match B */
+
+#define TIMER1_OVF_vect_num 13
#define TIMER1_OVF_vect _VECTOR(13) /* Timer/Counter1 Overflow */
+
+#define TIMER0_COMPA_vect_num 14
#define TIMER0_COMPA_vect _VECTOR(14) /* TimerCounter0 Compare Match A */
+
+#define TIMER0_COMPB_vect_num 15
#define TIMER0_COMPB_vect _VECTOR(15) /* TimerCounter0 Compare Match B */
+
+#define TIMER0_OVF_vect_num 16
#define TIMER0_OVF_vect _VECTOR(16) /* Timer/Couner0 Overflow */
+
+#define SPI_STC_vect_num 17
#define SPI_STC_vect _VECTOR(17) /* SPI Serial Transfer Complete */
+
+#define USART_RX_vect_num 18
#define USART_RX_vect _VECTOR(18) /* USART Rx Complete */
+
+#define USART_UDRE_vect_num 19
#define USART_UDRE_vect _VECTOR(19) /* USART, Data Register Empty */
+
+#define USART_TX_vect_num 20
#define USART_TX_vect _VECTOR(20) /* USART Tx Complete */
+
+#define ADC_vect_num 21
#define ADC_vect _VECTOR(21) /* ADC Conversion Complete */
+
+#define EE_READY_vect_num 22
#define EE_READY_vect _VECTOR(22) /* EEPROM Ready */
+
+#define ANALOG_COMP_vect_num 23
#define ANALOG_COMP_vect _VECTOR(23) /* Analog Comparator */
+
+#define TWI_vect_num 24
#define TWI_vect _VECTOR(24) /* Two-wire Serial Interface */
+
+#define SPM_READY_vect_num 25
#define SPM_READY_vect _VECTOR(25) /* Store Program Memory Read */
#define _VECTORS_SIZE (26 * 4)
Modified: trunk/avr-libc/include/avr/iom329.h
===================================================================
--- trunk/avr-libc/include/avr/iom329.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom329.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -856,90 +856,112 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 13
#define USART0_RX_vect _VECTOR(13)
#define SIG_UART_RECV _VECTOR(13)
/* USART0 Data register Empty */
+#define USART0_UDRE_vect_num 14
#define USART0_UDRE_vect _VECTOR(14)
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
/* LCD Start of Frame */
+#define LCD_vect_num 22
#define LCD_vect _VECTOR(22)
#define SIG_LCD _VECTOR(22)
Modified: trunk/avr-libc/include/avr/iom3290.h
===================================================================
--- trunk/avr-libc/include/avr/iom3290.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom3290.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -999,99 +999,124 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
+
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART, Rx Complete */
+#define USART_RX_vect_num 13
#define USART_RX_vect _VECTOR(13)
#define SIG_UART_RECV _VECTOR(13)
/* USART Data register Empty */
+#define USART_UDRE_vect_num 14
#define USART_UDRE_vect _VECTOR(14)
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
/* LCD Start of Frame */
+#define LCD_vect_num 22
#define LCD_vect _VECTOR(22)
#define SIG_LCD _VECTOR(22)
/* Pin Change Interrupt Request 2 */
+#define PCINT2_vect_num 23
#define PCINT2_vect _VECTOR(23)
#define SIG_PIN_CHANGE2 _VECTOR(23)
/* Pin Change Interrupt Request 3 */
+#define PCINT3_vect_num 24
#define PCINT3_vect _VECTOR(24)
#define SIG_PIN_CHANGE3 _VECTOR(24)
Modified: trunk/avr-libc/include/avr/iom32hvbrevb.h
===================================================================
--- trunk/avr-libc/include/avr/iom32hvbrevb.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom32hvbrevb.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Atmel Corporation
+/* Copyright (c) 2007, 2011 Atmel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -29,9 +29,9 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-/* $Id: iom32hvb.h 2102 2010-03-16 22:52:39Z joerg_wunsch $ */
+/* $Id: iom32hvbrevb.h 2102 2010-03-16 22:52:39Z joerg_wunsch $ */
-/* avr/iom32hvb.h - definitions for ATmega32HVB. */
+/* avr/iom32hvbrevb.h - definitions for ATmega32HVB revision B. */
/* This file should only be included from <avr/io.h>, never directly. */
@@ -40,14 +40,14 @@
#endif
#ifndef _AVR_IOXXX_H_
-# define _AVR_IOXXX_H_ "iom32hvb.h"
+# define _AVR_IOXXX_H_ "iom32hvbrevb.h"
#else
# error "Attempt to include more than one <avr/ioXXX.h> file."
#endif
-#ifndef _AVR_IOM32HVB_H_
-#define _AVR_IOM32HVB_H_ 1
+#ifndef _AVR_IOM32HVBREVB_H_
+#define _AVR_IOM32HVBREVB_H_ 1
/* Registers and associated bit numbers */
@@ -812,33 +812,88 @@
/* Interrupt Vectors */
/* Interrupt Vector 0 is the reset vector. */
+#define BPINT_vect_num 1
#define BPINT_vect _VECTOR(1) /* Battery Protection Interrupt */
+
+#define VREGMON_vect_num 2
#define VREGMON_vect _VECTOR(2) /* Voltage regulator monitor interrupt
*/
+
+#define INT0_vect_num 3
#define INT0_vect _VECTOR(3) /* External Interrupt Request 0 */
+
+#define INT1_vect_num 4
#define INT1_vect _VECTOR(4) /* External Interrupt Request 1 */
+
+#define INT2_vect_num 5
#define INT2_vect _VECTOR(5) /* External Interrupt Request 2 */
+
+#define INT3_vect_num 6
#define INT3_vect _VECTOR(6) /* External Interrupt Request 3 */
+
+#define PCINT0_vect_num 7
#define PCINT0_vect _VECTOR(7) /* Pin Change Interrupt 0 */
+
+#define PCINT1_vect_num 8
#define PCINT1_vect _VECTOR(8) /* Pin Change Interrupt 1 */
+
+#define WDT_vect_num 9
#define WDT_vect _VECTOR(9) /* Watchdog Timeout Interrupt */
+
+#define BGSCD_vect_num 10
#define BGSCD_vect _VECTOR(10) /* Bandgap Buffer Short Circuit
Detected */
+
+#define CHDET_vect_num 11
#define CHDET_vect _VECTOR(11) /* Charger Detect */
+
+#define TIMER1_IC_vect_num 12
#define TIMER1_IC_vect _VECTOR(12) /* Timer 1 Input capture */
+
+#define TIMER1_COMPA_vect_num 13
#define TIMER1_COMPA_vect _VECTOR(13) /* Timer 1 Compare Match A */
+
+#define TIMER1_COMPB_vect_num 14
#define TIMER1_COMPB_vect _VECTOR(14) /* Timer 1 Compare Match B */
+
+#define TIMER1_OVF_vect_num 15
#define TIMER1_OVF_vect _VECTOR(15) /* Timer 1 overflow */
+
+#define TIMER0_IC_vect_num 16
#define TIMER0_IC_vect _VECTOR(16) /* Timer 0 Input Capture */
+
+#define TIMER0_COMPA_vect_num 17
#define TIMER0_COMPA_vect _VECTOR(17) /* Timer 0 Comapre Match A */
+
+#define TIMER0_COMPB_vect_num 18
#define TIMER0_COMPB_vect _VECTOR(18) /* Timer 0 Compare Match B */
+
+#define TIMER0_OVF_vect_num 19
#define TIMER0_OVF_vect _VECTOR(19) /* Timer 0 Overflow */
+
+#define TWIBUSCD_vect_num 20
#define TWIBUSCD_vect _VECTOR(20) /* Two-Wire Bus Connect/Disconnect */
+
+#define TWI_vect_num 21
#define TWI_vect _VECTOR(21) /* Two-Wire Serial Interface */
+
+#define SPI_STC_vect_num 22
#define SPI_STC_vect _VECTOR(22) /* SPI Serial transfer complete */
+
+#define VADC_vect_num 23
#define VADC_vect _VECTOR(23) /* Voltage ADC Conversion Complete */
+
+#define CCADC_CONV_vect_num 24
#define CCADC_CONV_vect _VECTOR(24) /* Coulomb Counter ADC Conversion
Complete */
+
+#define CCADC_REG_CUR_vect_num 25
#define CCADC_REG_CUR_vect _VECTOR(25) /* Coloumb Counter ADC Regular Current
*/
+
+#define CCADC_ACC_vect_num 26
#define CCADC_ACC_vect _VECTOR(26) /* Coloumb Counter ADC Accumulator */
+
+#define EE_READY_vect_num 27
#define EE_READY_vect _VECTOR(27) /* EEPROM Ready */
+
+#define SPM_vect_num 28
#define SPM_vect _VECTOR(28) /* SPM Ready */
#define _VECTORS_SIZE (29 * 4)
@@ -882,4 +937,4 @@
#define __LOCK_BITS_EXIST
-#endif /* _AVR_IOM32HVB_H_ */
+#endif /* _AVR_IOM32HVBREVB_H_ */
Modified: trunk/avr-libc/include/avr/iom32u4.h
===================================================================
--- trunk/avr-libc/include/avr/iom32u4.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom32u4.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -1401,41 +1401,113 @@
/* Interrupt Vectors */
/* Interrupt Vector 0 is the reset vector. */
+
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1) /* External Interrupt Request 0 */
+
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2) /* External Interrupt Request 1 */
+
+#define INT2_vect_num 3
#define INT2_vect _VECTOR(3) /* External Interrupt Request 2 */
+
+#define INT3_vect_num 4
#define INT3_vect _VECTOR(4) /* External Interrupt Request 3 */
+
+#define INT6_vect_num 7
#define INT6_vect _VECTOR(7) /* External Interrupt Request 6 */
+
+#define PCINT0_vect_num 9
#define PCINT0_vect _VECTOR(9) /* Pin Change Interrupt Request 0 */
+
+#define USB_GEN_vect_num 10
#define USB_GEN_vect _VECTOR(10) /* USB General Interrupt Request */
+
+#define USB_COM_vect_num 11
#define USB_COM_vect _VECTOR(11) /* USB Endpoint/Pipe Interrupt
Communication Request */
+
+#define WDT_vect_num 12
#define WDT_vect _VECTOR(12) /* Watchdog Time-out Interrupt */
+
+#define TIMER1_CAPT_vect_num 16
#define TIMER1_CAPT_vect _VECTOR(16) /* Timer/Counter1 Capture Event */
+
+#define TIMER1_COMPA_vect_num 17
#define TIMER1_COMPA_vect _VECTOR(17) /* Timer/Counter1 Compare Match A */
+
+#define TIMER1_COMPB_vect_num 18
#define TIMER1_COMPB_vect _VECTOR(18) /* Timer/Counter1 Compare Match B */
+
+#define TIMER1_COMPC_vect_num 19
#define TIMER1_COMPC_vect _VECTOR(19) /* Timer/Counter1 Compare Match C */
+
+#define TIMER1_OVF_vect_num 20
#define TIMER1_OVF_vect _VECTOR(20) /* Timer/Counter1 Overflow */
+
+#define TIMER0_COMPA_vect_num 21
#define TIMER0_COMPA_vect _VECTOR(21) /* Timer/Counter0 Compare Match A */
+
+#define TIMER0_COMPB_vect_num 22
#define TIMER0_COMPB_vect _VECTOR(22) /* Timer/Counter0 Compare Match B */
+
+#define TIMER0_OVF_vect_num 23
#define TIMER0_OVF_vect _VECTOR(23) /* Timer/Counter0 Overflow */
+
+#define SPI_STC_vect_num 24
#define SPI_STC_vect _VECTOR(24) /* SPI Serial Transfer Complete */
+
+#define USART1_RX_vect_num 25
#define USART1_RX_vect _VECTOR(25) /* USART1, Rx Complete */
+
+#define USART1_UDRE_vect_num 26
#define USART1_UDRE_vect _VECTOR(26) /* USART1 Data register Empty */
+
+#define USART1_TX_vect_num 27
#define USART1_TX_vect _VECTOR(27) /* USART1, Tx Complete */
+
+#define ANALOG_COMP_vect_num 28
#define ANALOG_COMP_vect _VECTOR(28) /* Analog Comparator */
+
+#define ADC_vect_num 29
#define ADC_vect _VECTOR(29) /* ADC Conversion Complete */
+
+#define EE_READY_vect_num 30
#define EE_READY_vect _VECTOR(30) /* EEPROM Ready */
+
+#define TIMER3_CAPT_vect_num 31
#define TIMER3_CAPT_vect _VECTOR(31) /* Timer/Counter3 Capture Event */
+
+#define TIMER3_COMPA_vect_num 32
#define TIMER3_COMPA_vect _VECTOR(32) /* Timer/Counter3 Compare Match A */
+
+#define TIMER3_COMPB_vect_num 33
#define TIMER3_COMPB_vect _VECTOR(33) /* Timer/Counter3 Compare Match B */
+
+#define TIMER3_COMPC_vect_num 34
#define TIMER3_COMPC_vect _VECTOR(34) /* Timer/Counter3 Compare Match C */
+
+#define TIMER3_OVF_vect_num 35
#define TIMER3_OVF_vect _VECTOR(35) /* Timer/Counter3 Overflow */
+
+#define TWI_vect_num 36
#define TWI_vect _VECTOR(36) /* 2-wire Serial Interface */
+
+#define SPM_READY_vect_num 37
#define SPM_READY_vect _VECTOR(37) /* Store Program Memory Read */
+
+#define TIMER4_COMPA_vect_num 38
#define TIMER4_COMPA_vect _VECTOR(38) /* Timer/Counter4 Compare Match A */
+
+#define TIMER4_COMPB_vect_num 39
#define TIMER4_COMPB_vect _VECTOR(39) /* Timer/Counter4 Compare Match B */
+
+#define TIMER4_COMPD_vect_num 40
#define TIMER4_COMPD_vect _VECTOR(40) /* Timer/Counter4 Compare Match D */
+
+#define TIMER4_OVF_vect_num 41
#define TIMER4_OVF_vect _VECTOR(41) /* Timer/Counter4 Overflow */
+
+#define TIMER4_FPF_vect_num 42
#define TIMER4_FPF_vect _VECTOR(42) /* Timer/Counter4 Fault Protection
Interrupt */
#define _VECTORS_SIZE (43 * 4)
Modified: trunk/avr-libc/include/avr/iom406.h
===================================================================
--- trunk/avr-libc/include/avr/iom406.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom406.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -635,90 +635,93 @@
/* Reserved [0xF9..0xFF] */
/* Interrupt vectors */
+
/* Battery Protection Interrupt */
+#define BPINT_vect_num 1
#define BPINT_vect _VECTOR(1)
-
/* External Interrupt Request 0 */
+#define INT0_vect_num 2
#define INT0_vect _VECTOR(2)
-
/* External Interrupt Request 1 */
+#define INT1_vect_num 3
#define INT1_vect _VECTOR(3)
-
/* External Interrupt Request 2 */
+#define INT2_vect_num 4
#define INT2_vect _VECTOR(4)
-
/* External Interrupt Request 3 */
+#define INT3_vect_num 5
#define INT3_vect _VECTOR(5)
-
/* Pin Change Interrupt 0 */
+#define PCINT0_vect_num 6
#define PCINT0_vect _VECTOR(6)
-
/* Pin Change Interrupt 1 */
+#define PCINT1_vect_num 7
#define PCINT1_vect _VECTOR(7)
-
/* Watchdog Timeout Interrupt */
+#define WDT_vect_num 8
#define WDT_vect _VECTOR(8)
-
/* Wakeup timer overflow */
+#define WAKE_UP_vect_num 9
#define WAKE_UP_vect _VECTOR(9)
-
/* Timer/Counter 1 Compare Match */
+#define TIM1_COMP_vect_num 10
#define TIM1_COMP_vect _VECTOR(10)
-
/* Timer/Counter 1 Overflow */
+#define TIM1_OVF_vect_num 11
#define TIM1_OVF_vect _VECTOR(11)
-
/* Timer/Counter0 Compare A Match */
+#define TIM0_COMPA_vect_num 12
#define TIM0_COMPA_vect _VECTOR(12)
-
/* Timer/Counter0 Compare B Match */
+#define TIM0_COMPB_vect_num 13
#define TIM0_COMPB_vect _VECTOR(13)
-
/* Timer/Counter0 Overflow */
+#define TIM0_OVF_vect_num 14
#define TIM0_OVF_vect _VECTOR(14)
-
/* Two-Wire Bus Connect/Disconnect */
+#define TWI_BUS_CD_vect_num 15
#define TWI_BUS_CD_vect _VECTOR(15)
-
/* Two-Wire Serial Interface */
+#define TWI_vect_num 16
#define TWI_vect _VECTOR(16)
-
/* Voltage ADC Conversion Complete */
+#define VADC_vect_num 17
#define VADC_vect _VECTOR(17)
-
/* Coulomb Counter ADC Conversion Complete */
+#define CCADC_CONV_vect_num 18
#define CCADC_CONV_vect _VECTOR(18)
/* Coloumb Counter ADC Regular Current */
+#define CCADC_REG_CUR_vect_num 19
#define CCADC_REG_CUR_vect _VECTOR(19)
-
/* Coloumb Counter ADC Accumulator */
+#define CCADC_ACC_vect_num 20
#define CCADC_ACC_vect _VECTOR(20)
-
/* EEPROM Ready */
+#define EE_READY_vect_num 21
#define EE_READY_vect _VECTOR(21)
-
/* Store Program Memory Ready */
+#define SPM_READY_vect_num 22
#define SPM_READY_vect _VECTOR(22)
#define _VECTORS_SIZE 92
Modified: trunk/avr-libc/include/avr/iom48p.h
===================================================================
--- trunk/avr-libc/include/avr/iom48p.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom48p.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -781,30 +781,80 @@
/* Interrupt Vectors */
/* Interrupt Vector 0 is the reset vector. */
+
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1) /* External Interrupt Request 0 */
+
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2) /* External Interrupt Request 1 */
+
+#define PCINT0_vect_num 3
#define PCINT0_vect _VECTOR(3) /* Pin Change Interrupt Request 0 */
+
+#define PCINT1_vect_num 4
#define PCINT1_vect _VECTOR(4) /* Pin Change Interrupt Request 0 */
+
+#define PCINT2_vect_num 5
#define PCINT2_vect _VECTOR(5) /* Pin Change Interrupt Request 1 */
+
+#define WDT_vect_num 6
#define WDT_vect _VECTOR(6) /* Watchdog Time-out Interrupt */
+
+#define TIMER2_COMPA_vect_num 7
#define TIMER2_COMPA_vect _VECTOR(7) /* Timer/Counter2 Compare Match A */
+
+#define TIMER2_COMPB_vect_num 8
#define TIMER2_COMPB_vect _VECTOR(8) /* Timer/Counter2 Compare Match A */
+
+#define TIMER2_OVF_vect_num 9
#define TIMER2_OVF_vect _VECTOR(9) /* Timer/Counter2 Overflow */
+
+#define TIMER1_CAPT_vect_num 10
#define TIMER1_CAPT_vect _VECTOR(10) /* Timer/Counter1 Capture Event */
+
+#define TIMER1_COMPA_vect_num 11
#define TIMER1_COMPA_vect _VECTOR(11) /* Timer/Counter1 Compare Match A */
+
+#define TIMER1_COMPB_vect_num 12
#define TIMER1_COMPB_vect _VECTOR(12) /* Timer/Counter1 Compare Match B */
+
+#define TIMER1_OVF_vect_num 13
#define TIMER1_OVF_vect _VECTOR(13) /* Timer/Counter1 Overflow */
+
+#define TIMER0_COMPA_vect_num 14
#define TIMER0_COMPA_vect _VECTOR(14) /* TimerCounter0 Compare Match A */
+
+#define TIMER0_COMPB_vect_num 15
#define TIMER0_COMPB_vect _VECTOR(15) /* TimerCounter0 Compare Match B */
+
+#define TIMER0_OVF_vect_num 16
#define TIMER0_OVF_vect _VECTOR(16) /* Timer/Couner0 Overflow */
+
+#define SPI_STC_vect_num 17
#define SPI_STC_vect _VECTOR(17) /* SPI Serial Transfer Complete */
+
+#define USART_RX_vect_num 18
#define USART_RX_vect _VECTOR(18) /* USART Rx Complete */
+
+#define USART_UDRE_vect_num 19
#define USART_UDRE_vect _VECTOR(19) /* USART, Data Register Empty */
+
+#define USART_TX_vect_num 20
#define USART_TX_vect _VECTOR(20) /* USART Tx Complete */
+
+#define ADC_vect_num 21
#define ADC_vect _VECTOR(21) /* ADC Conversion Complete */
+
+#define EE_READY_vect_num 22
#define EE_READY_vect _VECTOR(22) /* EEPROM Ready */
+
+#define ANALOG_COMP_vect_num 23
#define ANALOG_COMP_vect _VECTOR(23) /* Analog Comparator */
+
+#define TWI_vect_num 24
#define TWI_vect _VECTOR(24) /* Two-wire Serial Interface */
+
+#define SPM_READY_vect_num 25
#define SPM_READY_vect _VECTOR(25) /* Store Program Memory Read */
#define _VECTORS_SIZE (26 * 2)
Modified: trunk/avr-libc/include/avr/iom64.h
===================================================================
--- trunk/avr-libc/include/avr/iom64.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom64.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -361,138 +361,172 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* External Interrupt Request 2 */
+#define INT2_vect_num 3
#define INT2_vect _VECTOR(3)
#define SIG_INTERRUPT2 _VECTOR(3)
/* External Interrupt Request 3 */
+#define INT3_vect_num 4
#define INT3_vect _VECTOR(4)
#define SIG_INTERRUPT3 _VECTOR(4)
/* External Interrupt Request 4 */
+#define INT4_vect_num 5
#define INT4_vect _VECTOR(5)
#define SIG_INTERRUPT4 _VECTOR(5)
/* External Interrupt Request 5 */
+#define INT5_vect_num 6
#define INT5_vect _VECTOR(6)
#define SIG_INTERRUPT5 _VECTOR(6)
/* External Interrupt Request 6 */
+#define INT6_vect_num 7
#define INT6_vect _VECTOR(7)
#define SIG_INTERRUPT6 _VECTOR(7)
/* External Interrupt Request 7 */
+#define INT7_vect_num 8
#define INT7_vect _VECTOR(8)
#define SIG_INTERRUPT7 _VECTOR(8)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 9
#define TIMER2_COMP_vect _VECTOR(9)
#define SIG_OUTPUT_COMPARE2 _VECTOR(9)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 10
#define TIMER2_OVF_vect _VECTOR(10)
#define SIG_OVERFLOW2 _VECTOR(10)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 11
#define TIMER1_CAPT_vect _VECTOR(11)
#define SIG_INPUT_CAPTURE1 _VECTOR(11)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 12
#define TIMER1_COMPA_vect _VECTOR(12)
#define SIG_OUTPUT_COMPARE1A _VECTOR(12)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 13
#define TIMER1_COMPB_vect _VECTOR(13)
#define SIG_OUTPUT_COMPARE1B _VECTOR(13)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 14
#define TIMER1_OVF_vect _VECTOR(14)
#define SIG_OVERFLOW1 _VECTOR(14)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 15
#define TIMER0_COMP_vect _VECTOR(15)
#define SIG_OUTPUT_COMPARE0 _VECTOR(15)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 16
#define TIMER0_OVF_vect _VECTOR(16)
#define SIG_OVERFLOW0 _VECTOR(16)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 17
#define SPI_STC_vect _VECTOR(17)
#define SIG_SPI _VECTOR(17)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 18
#define USART0_RX_vect _VECTOR(18)
#define SIG_UART0_RECV _VECTOR(18)
/* USART0 Data Register Empty */
+#define USART0_UDRE_vect_num 19
#define USART0_UDRE_vect _VECTOR(19)
#define SIG_UART0_DATA _VECTOR(19)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 20
#define USART0_TX_vect _VECTOR(20)
#define SIG_UART0_TRANS _VECTOR(20)
/* ADC Conversion Complete */
+#define ADC_vect_num 21
#define ADC_vect _VECTOR(21)
#define SIG_ADC _VECTOR(21)
/* EEPROM Ready */
+#define EE_READY_vect_num 22
#define EE_READY_vect _VECTOR(22)
#define SIG_EEPROM_READY _VECTOR(22)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 23
#define ANALOG_COMP_vect _VECTOR(23)
#define SIG_COMPARATOR _VECTOR(23)
/* Timer/Counter1 Compare Match C */
+#define TIMER1_COMPC_vect_num 24
#define TIMER1_COMPC_vect _VECTOR(24)
#define SIG_OUTPUT_COMPARE1C _VECTOR(24)
/* Timer/Counter3 Capture Event */
+#define TIMER3_CAPT_vect_num 25
#define TIMER3_CAPT_vect _VECTOR(25)
#define SIG_INPUT_CAPTURE3 _VECTOR(25)
/* Timer/Counter3 Compare Match A */
+#define TIMER3_COMPA_vect_num 26
#define TIMER3_COMPA_vect _VECTOR(26)
#define SIG_OUTPUT_COMPARE3A _VECTOR(26)
/* Timer/Counter3 Compare Match B */
+#define TIMER3_COMPB_vect_num 27
#define TIMER3_COMPB_vect _VECTOR(27)
#define SIG_OUTPUT_COMPARE3B _VECTOR(27)
/* Timer/Counter3 Compare Match C */
+#define TIMER3_COMPC_vect_num 28
#define TIMER3_COMPC_vect _VECTOR(28)
#define SIG_OUTPUT_COMPARE3C _VECTOR(28)
/* Timer/Counter3 Overflow */
+#define TIMER3_OVF_vect_num 29
#define TIMER3_OVF_vect _VECTOR(29)
#define SIG_OVERFLOW3 _VECTOR(29)
/* USART1, Rx Complete */
+#define USART1_RX_vect_num 30
#define USART1_RX_vect _VECTOR(30)
#define SIG_UART1_RECV _VECTOR(30)
/* USART1, Data Register Empty */
+#define USART1_UDRE_vect_num 31
#define USART1_UDRE_vect _VECTOR(31)
#define SIG_UART1_DATA _VECTOR(31)
/* USART1, Tx Complete */
+#define USART1_TX_vect_num 32
#define USART1_TX_vect _VECTOR(32)
#define SIG_UART1_TRANS _VECTOR(32)
/* 2-wire Serial Interface */
+#define TWI_vect_num 33
#define TWI_vect _VECTOR(33)
#define SIG_2WIRE_SERIAL _VECTOR(33)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 34
#define SPM_READY_vect _VECTOR(34)
#define SIG_SPM_READY _VECTOR(34)
Modified: trunk/avr-libc/include/avr/iom645.h
===================================================================
--- trunk/avr-libc/include/avr/iom645.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom645.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -671,86 +671,107 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 13
#define USART0_RX_vect _VECTOR(13)
#define SIG_UART_RECV _VECTOR(13)
/* USART0 Data register Empty */
+#define USART0_UDRE_vect_num 14
#define USART0_UDRE_vect _VECTOR(14)
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
Modified: trunk/avr-libc/include/avr/iom6450.h
===================================================================
--- trunk/avr-libc/include/avr/iom6450.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom6450.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -752,98 +752,122 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
+
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART, Rx Complete */
+#define USART_RX_vect_num 13
#define USART_RX_vect _VECTOR(13)
#define USART0_RX_vect _VECTOR(13) /* Alias */
#define SIG_UART_RECV _VECTOR(13)
/* USART Data register Empty */
+#define USART_UDRE_vect_num 14
#define USART_UDRE_vect _VECTOR(14)
#define USART0_UDRE_vect _VECTOR(14) /* Alias */
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define USART_TX_vect _VECTOR(15) /* Alias */
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
/* Pin Change Interrupt Request 2 */
+#define PCINT2_vect_num 23
#define PCINT2_vect _VECTOR(23)
#define SIG_PIN_CHANGE2 _VECTOR(23)
/* Pin Change Interrupt Request 3 */
+#define PCINT3_vect_num 24
#define PCINT3_vect _VECTOR(24)
#define SIG_PIN_CHANGE3 _VECTOR(24)
Modified: trunk/avr-libc/include/avr/iom649.h
===================================================================
--- trunk/avr-libc/include/avr/iom649.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom649.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -844,91 +844,114 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
+
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART0, Rx Complete */
+#define USART0_RX_vect_num 13
#define USART0_RX_vect _VECTOR(13)
#define SIG_UART_RECV _VECTOR(13)
/* USART0 Data register Empty */
+#define USART0_UDRE_vect_num 14
#define USART0_UDRE_vect _VECTOR(14)
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
/* LCD Start of Frame */
+#define LCD_vect_num 22
#define LCD_vect _VECTOR(22)
#define SIG_LCD _VECTOR(22)
Modified: trunk/avr-libc/include/avr/iom6490.h
===================================================================
--- trunk/avr-libc/include/avr/iom6490.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom6490.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -988,99 +988,124 @@
/* Interrupt vectors */
/* Vector 0 is the reset vector */
+
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* Pin Change Interrupt Request 0 */
+#define PCINT0_vect_num 2
#define PCINT0_vect _VECTOR(2)
#define SIG_PIN_CHANGE0 _VECTOR(2)
/* Pin Change Interrupt Request 1 */
+#define PCINT1_vect_num 3
#define PCINT1_vect _VECTOR(3)
#define SIG_PIN_CHANGE1 _VECTOR(3)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 4
#define TIMER2_COMP_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE2 _VECTOR(4)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 5
#define TIMER2_OVF_vect _VECTOR(5)
#define SIG_OVERFLOW2 _VECTOR(5)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 6
#define TIMER1_CAPT_vect _VECTOR(6)
#define SIG_INPUT_CAPTURE1 _VECTOR(6)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 7
#define TIMER1_COMPA_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1A _VECTOR(7)
/* Timer/Counter Compare Match B */
+#define TIMER1_COMPB_vect_num 8
#define TIMER1_COMPB_vect _VECTOR(8)
#define SIG_OUTPUT_COMPARE1B _VECTOR(8)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 9
#define TIMER1_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW1 _VECTOR(9)
/* Timer/Counter0 Compare Match */
+#define TIMER0_COMP_vect_num 10
#define TIMER0_COMP_vect _VECTOR(10)
#define SIG_OUTPUT_COMPARE0 _VECTOR(10)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 11
#define TIMER0_OVF_vect _VECTOR(11)
#define SIG_OVERFLOW0 _VECTOR(11)
/* SPI Serial Transfer Complete */
+#define SPI_STC_vect_num 12
#define SPI_STC_vect _VECTOR(12)
#define SIG_SPI _VECTOR(12)
/* USART, Rx Complete */
+#define USART_RX_vect_num 13
#define USART_RX_vect _VECTOR(13)
#define SIG_UART_RECV _VECTOR(13)
/* USART Data register Empty */
+#define USART_UDRE_vect_num 14
#define USART_UDRE_vect _VECTOR(14)
#define SIG_UART_DATA _VECTOR(14)
/* USART0, Tx Complete */
+#define USART0_TX_vect_num 15
#define USART0_TX_vect _VECTOR(15)
#define SIG_UART_TRANS _VECTOR(15)
/* USI Start Condition */
+#define USI_START_vect_num 16
#define USI_START_vect _VECTOR(16)
#define SIG_USI_START _VECTOR(16)
/* USI Overflow */
+#define USI_OVERFLOW_vect_num 17
#define USI_OVERFLOW_vect _VECTOR(17)
#define SIG_USI_OVERFLOW _VECTOR(17)
/* Analog Comparator */
+#define ANALOG_COMP_vect_num 18
#define ANALOG_COMP_vect _VECTOR(18)
#define SIG_COMPARATOR _VECTOR(18)
/* ADC Conversion Complete */
+#define ADC_vect_num 19
#define ADC_vect _VECTOR(19)
#define SIG_ADC _VECTOR(19)
/* EEPROM Ready */
+#define EE_READY_vect_num 20
#define EE_READY_vect _VECTOR(20)
#define SIG_EEPROM_READY _VECTOR(20)
/* Store Program Memory Read */
+#define SPM_READY_vect_num 21
#define SPM_READY_vect _VECTOR(21)
#define SIG_SPM_READY _VECTOR(21)
/* LCD Start of Frame */
+#define LCD_vect_num 22
#define LCD_vect _VECTOR(22)
#define SIG_LCD _VECTOR(22)
/* Pin Change Interrupt Request 2 */
+#define PCINT2_vect_num 23
#define PCINT2_vect _VECTOR(23)
#define SIG_PIN_CHANGE2 _VECTOR(23)
/* Pin Change Interrupt Request 3 */
+#define PCINT3_vect_num 24
#define PCINT3_vect _VECTOR(24)
#define SIG_PIN_CHANGE3 _VECTOR(24)
Modified: trunk/avr-libc/include/avr/iom8.h
===================================================================
--- trunk/avr-libc/include/avr/iom8.h 2011-02-23 19:25:28 UTC (rev 2224)
+++ trunk/avr-libc/include/avr/iom8.h 2011-03-02 16:27:26 UTC (rev 2225)
@@ -166,74 +166,92 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 3
#define TIMER2_COMP_vect _VECTOR(3)
#define SIG_OUTPUT_COMPARE2 _VECTOR(3)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 4
#define TIMER2_OVF_vect _VECTOR(4)
#define SIG_OVERFLOW2 _VECTOR(4)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 5
#define TIMER1_CAPT_vect _VECTOR(5)
#define SIG_INPUT_CAPTURE1 _VECTOR(5)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 6
#define TIMER1_COMPA_vect _VECTOR(6)
#define SIG_OUTPUT_COMPARE1A _VECTOR(6)
/* Timer/Counter1 Compare Match B */
+#define TIMER1_COMPB_vect_num 7
#define TIMER1_COMPB_vect _VECTOR(7)
#define SIG_OUTPUT_COMPARE1B _VECTOR(7)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 8
#define TIMER1_OVF_vect _VECTOR(8)
#define SIG_OVERFLOW1 _VECTOR(8)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 9
#define TIMER0_OVF_vect _VECTOR(9)
#define SIG_OVERFLOW0 _VECTOR(9)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 10
#define SPI_STC_vect _VECTOR(10)
#define SIG_SPI _VECTOR(10)
/* USART, Rx Complete */
+#define USART_RXC_vect_num 11
#define USART_RXC_vect _VECTOR(11)
#define SIG_UART_RECV _VECTOR(11)
/* USART Data Register Empty */
+#define USART_UDRE_vect_num 12
#define USART_UDRE_vect _VECTOR(12)
#define SIG_UART_DATA _VECTOR(12)
/* USART, Tx Complete */
+#define USART_TXC_vect_num 13
#define USART_TXC_vect _VECTOR(13)
#define SIG_UART_TRANS _VECTOR(13)
/* ADC Conversion Complete */
+#define ADC_vect_num 14
#define ADC_vect _VECTOR(14)
#define SIG_ADC _VECTOR(14)
/* EEPROM Ready */
+#define EE_RDY_vect_num 15
#define EE_RDY_vect _VECTOR(15)
#define SIG_EEPROM_READY _VECTOR(15)
/* Analog Comparator */
+#define ANA_COMP_vect_num 16
#define ANA_COMP_vect _VECTOR(16)
#define SIG_COMPARATOR _VECTOR(16)
/* 2-wire Serial Interface */
+#define TWI_vect_num 17
#define TWI_vect _VECTOR(17)
#define SIG_2WIRE_SERIAL _VECTOR(17)
/* Store Program Memory Ready */
+#define SPM_RDY_vect_num 18
#define SPM_RDY_vect _VECTOR(18)
#define SIG_SPM_READY _VECTOR(18)
Modified: trunk/avr-libc/include/avr/iom8515.h
===================================================================
--- trunk/avr-libc/include/avr/iom8515.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom8515.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -209,69 +209,85 @@
/* Interrupt vectors */
/* External Interrupt Request 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt Request 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter1 Capture Event */
+#define TIMER1_CAPT_vect_num 3
#define TIMER1_CAPT_vect _VECTOR(3)
#define SIG_INPUT_CAPTURE1 _VECTOR(3)
/* Timer/Counter1 Compare Match A */
+#define TIMER1_COMPA_vect_num 4
#define TIMER1_COMPA_vect _VECTOR(4)
#define SIG_OUTPUT_COMPARE1A _VECTOR(4)
/* Timer/Counter1 Compare MatchB */
+#define TIMER1_COMPB_vect_num 5
#define TIMER1_COMPB_vect _VECTOR(5)
#define SIG_OUTPUT_COMPARE1B _VECTOR(5)
/* Timer/Counter1 Overflow */
+#define TIMER1_OVF_vect_num 6
#define TIMER1_OVF_vect _VECTOR(6)
#define SIG_OVERFLOW1 _VECTOR(6)
/* Timer/Counter0 Overflow */
+#define TIMER0_OVF_vect_num 7
#define TIMER0_OVF_vect _VECTOR(7)
#define SIG_OVERFLOW0 _VECTOR(7)
/* Serial Transfer Complete */
+#define SPI_STC_vect_num 8
#define SPI_STC_vect _VECTOR(8)
#define SIG_SPI _VECTOR(8)
/* UART, Rx Complete */
+#define USART_RX_vect_num 9
#define USART_RX_vect _VECTOR(9)
#define UART_RX_vect _VECTOR(9) /* For compatability only */
#define SIG_UART_RECV _VECTOR(9) /* For compatability only */
/* UART Data Register Empty */
+#define USART_UDRE_vect_num 10
#define USART_UDRE_vect _VECTOR(10)
#define UART_UDRE_vect _VECTOR(10) /* For compatability only
*/
#define SIG_UART_DATA _VECTOR(10) /* For compatability only
*/
/* UART, Tx Complete */
+#define USART_TX_vect_num 11
#define USART_TX_vect _VECTOR(11)
#define UART_TX_vect _VECTOR(11) /* For compatability only
*/
#define SIG_UART_TRANS _VECTOR(11) /* For compatability only
*/
/* Analog Comparator */
+#define ANA_COMP_vect_num 12
#define ANA_COMP_vect _VECTOR(12)
#define SIG_COMPARATOR _VECTOR(12)
/* External Interrupt Request 2 */
+#define INT2_vect_num 13
#define INT2_vect _VECTOR(13)
#define SIG_INTERRUPT2 _VECTOR(13)
/* Timer 0 Compare Match */
+#define TIMER0_COMP_vect_num 14
#define TIMER0_COMP_vect _VECTOR(14)
#define SIG_OUTPUT_COMPARE0 _VECTOR(14)
/* EEPROM Ready */
+#define EE_RDY_vect_num 15
#define EE_RDY_vect _VECTOR(15)
#define SIG_EEPROM_READY _VECTOR(15)
/* Store Program Memory Ready */
+#define SPM_RDY_vect_num 16
#define SPM_RDY_vect _VECTOR(16)
#define SIG_SPM_READY _VECTOR(16)
Modified: trunk/avr-libc/include/avr/iom8535.h
===================================================================
--- trunk/avr-libc/include/avr/iom8535.h 2011-02-23 19:25:28 UTC (rev
2224)
+++ trunk/avr-libc/include/avr/iom8535.h 2011-03-02 16:27:26 UTC (rev
2225)
@@ -232,82 +232,102 @@
/* Interrupt vectors */
/* External Interrupt 0 */
+#define INT0_vect_num 1
#define INT0_vect _VECTOR(1)
#define SIG_INTERRUPT0 _VECTOR(1)
/* External Interrupt 1 */
+#define INT1_vect_num 2
#define INT1_vect _VECTOR(2)
#define SIG_INTERRUPT1 _VECTOR(2)
/* Timer/Counter2 Compare Match */
+#define TIMER2_COMP_vect_num 3
#define TIMER2_COMP_vect _VECTOR(3)
#define SIG_OUTPUT_COMPARE2 _VECTOR(3)
/* Timer/Counter2 Overflow */
+#define TIMER2_OVF_vect_num 4
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [avr-libc-commit] [2225] 2011-03-02 Eric B.,
Eric Weddington <=