CVS: msp430-libc/include msp430x11x2.h,1.1,1.2 msp430x12x.h,1.6,1.7 msp430x12x2.h,1.3,1.4 msp430x13x.h,1.7,1.8 msp430x13x1.h,1.1,1.2 msp430x14x.h,1.6,1.7 msp430x14x1.h,1.1,1.2 msp430x15x.h,1.3,1.4 msp430x16x.h,1.3,1.4 msp430x43x.h,1.5,1.6 msp430x44x.h,1.6,1.7 msp430xE42x.h,1.1,1.2
Steve Underwood <[email protected]>
| Newsgroups | gmane.comp.hardware.texas-instruments.msp430.gcc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/mspgcc/msp430-libc/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30926/msp430-libc/include Modified Files: msp430x11x2.h msp430x12x.h msp430x12x2.h msp430x13x.h msp430x13x1.h msp430x14x.h msp430x14x1.h msp430x15x.h msp430x16x.h msp430x43x.h msp430x44x.h msp430xE42x.h Log Message: Updated UART/USART vector definitions to match what TI hve now. Index: msp430x11x2.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x11x2.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -d -r1.1 -r1.2 --- msp430x11x2.h 7 Feb 2003 14:00:58 -0000 1.1 +++ msp430x11x2.h 5 Oct 2004 15:44:05 -0000 1.2 @@ -57,11 +57,14 @@ #define PORT1_VECTOR 4 /* 0xFFE4 Port 1 */ #define PORT2_VECTOR 6 /* 0xFFE6 Port 2 */ #define ADC10_VECTOR 10 /* 0xFFEA ADC 10 */ -#define UART0TX_VECTOR 12 /* 0xFFEC UART 0 Transmit */ -#define UART0RX_VECTOR 14 /* 0xFFEE UART 0 Receive */ +#define USART0TX_VECTOR 12 /* 0xFFEC USART 0 Transmit */ +#define USART0RX_VECTOR 14 /* 0xFFEE USART 0 Receive */ #define TIMERA1_VECTOR 16 /* 0xFFF0 Timer A CC1-2, TA */ #define TIMERA0_VECTOR 18 /* 0xFFF2 Timer A CC0 */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR + #endif /* #ifndef __msp430x11x2 */ Index: msp430x12x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x12x.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -d -r1.6 -r1.7 --- msp430x12x.h 28 Dec 2002 06:48:47 -0000 1.6 +++ msp430x12x.h 5 Oct 2004 15:44:05 -0000 1.7 @@ -58,12 +58,15 @@ #define PORT1_VECTOR 4 /* 0xFFE4 Port 1 */ #define PORT2_VECTOR 6 /* 0xFFE6 Port 2 */ -#define UART0TX_VECTOR 12 /* 0xFFEC UART 0 Transmit */ -#define UART0RX_VECTOR 14 /* 0xFFEE UART 0 Receive */ +#define USART0TX_VECTOR 12 /* 0xFFEC USART 0 Transmit */ +#define USART0RX_VECTOR 14 /* 0xFFEE USART 0 Receive */ #define TIMERA1_VECTOR 16 /* 0xFFF0 Timer A CC1-2, TA */ #define TIMERA0_VECTOR 18 /* 0xFFF2 Timer A CC0 */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR + #endif /* #ifndef __msp430x12x */ Index: msp430x12x2.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x12x2.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -d -r1.3 -r1.4 --- msp430x12x2.h 28 Dec 2002 06:49:02 -0000 1.3 +++ msp430x12x2.h 5 Oct 2004 15:44:05 -0000 1.4 @@ -59,11 +59,14 @@ #define PORT1_VECTOR 4 /* 0xFFE4 Port 1 */ #define PORT2_VECTOR 6 /* 0xFFE6 Port 2 */ #define ADC10_VECTOR 10 /* 0xFFEA ADC 10 */ -#define UART0TX_VECTOR 12 /* 0xFFEC UART 0 Transmit */ -#define UART0RX_VECTOR 14 /* 0xFFEE UART 0 Receive */ +#define USART0TX_VECTOR 12 /* 0xFFEC USART 0 Transmit */ +#define USART0RX_VECTOR 14 /* 0xFFEE USART 0 Receive */ #define TIMERA1_VECTOR 16 /* 0xFFF0 Timer A CC1-2, TA */ #define TIMERA0_VECTOR 18 /* 0xFFF2 Timer A CC0 */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR + #endif /* #ifndef __msp430x12x2 */ Index: msp430x13x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x13x.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -d -r1.7 -r1.8 --- msp430x13x.h 28 Dec 2002 06:48:30 -0000 1.7 +++ msp430x13x.h 5 Oct 2004 15:44:05 -0000 1.8 @@ -77,12 +77,15 @@ #define TIMERA1_VECTOR 10 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 12 /* 0xFFEC Timer A CC0 */ #define ADC_VECTOR 14 /* 0xFFEE ADC */ -#define UART0TX_VECTOR 16 /* 0xFFF0 UART 0 Transmit */ -#define UART0RX_VECTOR 18 /* 0xFFF2 UART 0 Receive */ +#define USART0TX_VECTOR 16 /* 0xFFF0 USART 0 Transmit */ +#define USART0RX_VECTOR 18 /* 0xFFF2 USART 0 Receive */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define TIMERB1_VECTOR 24 /* 0xFFF8 Timer B 1-2 */ #define TIMERB0_VECTOR 26 /* 0xFFFA Timer B 0 */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR + #endif /* #ifndef __msp430x13x */ Index: msp430x13x1.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x13x1.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -d -r1.1 -r1.2 --- msp430x13x1.h 28 Aug 2003 14:43:02 -0000 1.1 +++ msp430x13x1.h 5 Oct 2004 15:44:05 -0000 1.2 @@ -75,12 +75,15 @@ #define PORT1_VECTOR 8 /* 0xFFE8 Port 1 */ #define TIMERA1_VECTOR 10 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 12 /* 0xFFEC Timer A CC0 */ -#define UART0TX_VECTOR 16 /* 0xFFF0 UART 0 Transmit */ -#define UART0RX_VECTOR 18 /* 0xFFF2 UART 0 Receive */ +#define USART0TX_VECTOR 16 /* 0xFFF0 USART 0 Transmit */ +#define USART0RX_VECTOR 18 /* 0xFFF2 USART 0 Receive */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define TIMERB1_VECTOR 24 /* 0xFFF8 Timer B 1-2 */ #define TIMERB0_VECTOR 26 /* 0xFFFA Timer B 0 */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR + #endif /* #ifndef __msp430x13x1 */ Index: msp430x14x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x14x.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -d -r1.6 -r1.7 --- msp430x14x.h 28 Dec 2002 06:48:13 -0000 1.6 +++ msp430x14x.h 5 Oct 2004 15:44:05 -0000 1.7 @@ -75,18 +75,23 @@ #define UTXE1 (1<<5) #define PORT2_VECTOR 2 /* 0xFFE2 Port 2 */ -#define UART1TX_VECTOR 4 /* 0xFFE4 UART 1 Transmit */ -#define UART1RX_VECTOR 6 /* 0xFFE6 UART 1 Receive */ +#define USART1TX_VECTOR 4 /* 0xFFE4 USART 1 Transmit */ +#define USART1RX_VECTOR 6 /* 0xFFE6 USART 1 Receive */ #define PORT1_VECTOR 8 /* 0xFFE8 Port 1 */ #define TIMERA1_VECTOR 10 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 12 /* 0xFFEC Timer A CC0 */ #define ADC_VECTOR 14 /* 0xFFEE ADC */ -#define UART0TX_VECTOR 16 /* 0xFFF0 UART 0 Transmit */ -#define UART0RX_VECTOR 18 /* 0xFFF2 UART 0 Receive */ +#define USART0TX_VECTOR 16 /* 0xFFF0 USART 0 Transmit */ +#define USART0RX_VECTOR 18 /* 0xFFF2 USART 0 Receive */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define TIMERB1_VECTOR 24 /* 0xFFF8 Timer B 1-7 */ #define TIMERB0_VECTOR 26 /* 0xFFFA Timer B 0 */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR +#define UART1TX_VECTOR USART1TX_VECTOR +#define UART1RX_VECTOR USART1RX_VECTOR + #endif /* #ifndef __msp430x14x */ Index: msp430x14x1.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x14x1.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -d -r1.1 -r1.2 --- msp430x14x1.h 28 Aug 2003 14:43:03 -0000 1.1 +++ msp430x14x1.h 5 Oct 2004 15:44:05 -0000 1.2 @@ -74,17 +74,22 @@ #define UTXE1 (1<<5) #define PORT2_VECTOR 2 /* 0xFFE2 Port 2 */ -#define UART1TX_VECTOR 4 /* 0xFFE4 UART 1 Transmit */ -#define UART1RX_VECTOR 6 /* 0xFFE6 UART 1 Receive */ +#define USART1TX_VECTOR 4 /* 0xFFE4 USART 1 Transmit */ +#define USART1RX_VECTOR 6 /* 0xFFE6 USART 1 Receive */ #define PORT1_VECTOR 8 /* 0xFFE8 Port 1 */ #define TIMERA1_VECTOR 10 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 12 /* 0xFFEC Timer A CC0 */ -#define UART0TX_VECTOR 16 /* 0xFFF0 UART 0 Transmit */ -#define UART0RX_VECTOR 18 /* 0xFFF2 UART 0 Receive */ +#define USART0TX_VECTOR 16 /* 0xFFF0 USART 0 Transmit */ +#define USART0RX_VECTOR 18 /* 0xFFF2 USART 0 Receive */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define TIMERB1_VECTOR 24 /* 0xFFF8 Timer B 1-7 */ #define TIMERB0_VECTOR 26 /* 0xFFFA Timer B 0 */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR +#define UART1TX_VECTOR USART1TX_VECTOR +#define UART1RX_VECTOR USART1RX_VECTOR + #endif /* #ifndef __msp430x14x1 */ Index: msp430x15x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x15x.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -d -r1.3 -r1.4 --- msp430x15x.h 19 Dec 2003 12:00:48 -0000 1.3 +++ msp430x15x.h 5 Oct 2004 15:44:05 -0000 1.4 @@ -66,12 +66,15 @@ #define TIMERA1_VECTOR 10 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 12 /* 0xFFEC Timer A CC0 */ #define ADC_VECTOR 14 /* 0xFFEE ADC */ -#define UART0TX_VECTOR 16 /* 0xFFF0 UART 0 transmit */ -#define UART0RX_VECTOR 18 /* 0xFFF2 UART 0 receive, I2C tx/rx */ +#define USART0TX_VECTOR 16 /* 0xFFF0 USART 0 Transmit */ +#define USART0RX_VECTOR 18 /* 0xFFF2 USART 0 Receive, I2C tx/rx */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define TIMERB1_VECTOR 24 /* 0xFFF8 Timer B CC1-2, TB */ #define TIMERB0_VECTOR 26 /* 0xFFFA Timer B CC0 */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR + #endif /* #ifndef __msp430x15x */ Index: msp430x16x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x16x.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -d -r1.3 -r1.4 --- msp430x16x.h 19 Dec 2003 12:00:49 -0000 1.3 +++ msp430x16x.h 5 Oct 2004 15:44:05 -0000 1.4 @@ -81,18 +81,23 @@ #define DACDMA_VECTOR 0 /* 0xFFE0 DAC12/DMA */ #define PORT2_VECTOR 2 /* 0xFFE2 Port 2 */ -#define UART1TX_VECTOR 4 /* 0xFFF4 UART 1 transmit */ -#define UART1RX_VECTOR 6 /* 0xFFF6 UART 1 receive */ +#define USART1TX_VECTOR 4 /* 0xFFF4 USART 1 Transmit */ +#define USART1RX_VECTOR 6 /* 0xFFF6 USART 1 Receive */ #define PORT1_VECTOR 8 /* 0xFFE8 Port 1 */ #define TIMERA1_VECTOR 10 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 12 /* 0xFFEC Timer A CC0 */ #define ADC_VECTOR 14 /* 0xFFEE ADC */ -#define UART0TX_VECTOR 16 /* 0xFFF0 UART 0 transmit */ -#define UART0RX_VECTOR 18 /* 0xFFF2 UART 0 receive, I2C tx/rx */ +#define USART0TX_VECTOR 16 /* 0xFFF0 USART 0 Transmit */ +#define USART0RX_VECTOR 18 /* 0xFFF2 USART 0 Receive, I2C tx/rx */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define TIMERB1_VECTOR 24 /* 0xFFF8 Timer B CC1-2, TB */ #define TIMERB0_VECTOR 26 /* 0xFFFA Timer B CC0 */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR +#define UART1TX_VECTOR USART1TX_VECTOR +#define UART1RX_VECTOR USART1RX_VECTOR + #endif /* #ifndef __msp430x16x */ Index: msp430x43x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x43x.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -d -r1.5 -r1.6 --- msp430x43x.h 23 Mar 2003 02:32:50 -0000 1.5 +++ msp430x43x.h 5 Oct 2004 15:44:05 -0000 1.6 @@ -75,12 +75,15 @@ #define TIMERA1_VECTOR 10 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 12 /* 0xFFEC Timer A CC0 */ #define ADC_VECTOR 14 /* 0xFFEE ADC */ -#define UART0TX_VECTOR 16 /* 0xFFF0 UART 0 transmit */ -#define UART0RX_VECTOR 18 /* 0xFFF2 UART 0 receive */ +#define USART0TX_VECTOR 16 /* 0xFFF0 USART 0 Transmit */ +#define USART0RX_VECTOR 18 /* 0xFFF2 USART 0 Receive */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define TIMERB1_VECTOR 24 /* 0xFFF8 Timer B CC1-2, TB */ #define TIMERB0_VECTOR 26 /* 0xFFFA Timer B CC0 */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR + #endif /* #ifndef __msp430x43x */ Index: msp430x44x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x44x.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -d -r1.6 -r1.7 --- msp430x44x.h 23 Mar 2003 02:33:07 -0000 1.6 +++ msp430x44x.h 5 Oct 2004 15:44:05 -0000 1.7 @@ -84,18 +84,23 @@ #define BASICTIMER_VECTOR 0 /* 0xFFE0 Basic Timer */ #define PORT2_VECTOR 2 /* 0xFFE2 Port 2 */ -#define UART1TX_VECTOR 4 /* 0xFFE4 UART 1 Transmit */ -#define UART1RX_VECTOR 6 /* 0xFFE6 UART 1 Receive */ +#define USART1TX_VECTOR 4 /* 0xFFE4 USART 1 Transmit */ +#define USART1RX_VECTOR 6 /* 0xFFE6 USART 1 Receive */ #define PORT1_VECTOR 8 /* 0xFFE8 Port 1 */ #define TIMERA1_VECTOR 10 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 12 /* 0xFFEC Timer A CC0 */ #define ADC_VECTOR 14 /* 0xFFEE ADC */ -#define UART0TX_VECTOR 16 /* 0xFFF0 UART 0 transmit */ -#define UART0RX_VECTOR 18 /* 0xFFF2 UART 0 receive */ +#define USART0TX_VECTOR 16 /* 0xFFF0 USART 0 Transmit */ +#define USART0RX_VECTOR 18 /* 0xFFF2 USART 0 Receive */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define TIMERB1_VECTOR 24 /* 0xFFF8 Timer B CC1-2, TB */ #define TIMERB0_VECTOR 26 /* 0xFFFA Timer B CC0 */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ +#define UART0TX_VECTOR USART0TX_VECTOR +#define UART0RX_VECTOR USART0RX_VECTOR +#define UART1TX_VECTOR USART1TX_VECTOR +#define UART1RX_VECTOR USART1RX_VECTOR + #endif /* #ifndef __msp430x44x */ Index: msp430xE42x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430xE42x.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -d -r1.1 -r1.2 --- msp430xE42x.h 5 Aug 2003 16:32:36 -0000 1.1 +++ msp430xE42x.h 5 Oct 2004 15:44:05 -0000 1.2 @@ -70,8 +70,8 @@ #define PORT1_VECTOR 8 /* 0xFFE8 Port 1 */ #define TIMERA1_VECTOR 10 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 12 /* 0xFFEC Timer A CC0 */ -#define USART0TX_VECTOR 16 /* 0xFFF0 UART 0 transmit */ -#define USART0RX_VECTOR 18 /* 0xFFF2 UART 0 receive */ +#define USART0TX_VECTOR 16 /* 0xFFF0 USART 0 Transmit */ +#define USART0RX_VECTOR 18 /* 0xFFF2 USART 0 Receive */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define SD16_VECTOR 24 /* 0xFFF8 Sigma Delta ADC */ #define ESP430_VECTOR 26 /* 0xFFFA ESP430 Mailbox */ ------------------------------------------------------- This SF.net email is sponsored by: IT Product Guide on ITManagersJournal Use IT products in your business? Tell us what you think of them. Give us Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more http://productguide.itmanagersjournal.com/guidepromo.tmpl