CVS: msp430-libc/include msp430x41x.h,1.7,1.8

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-serv16078/msp430-libc/include

Modified Files:
	msp430x41x.h 
Log Message:
Fix interrupt definitions for F415 and F417, and bring timer A naming into
line with TI


Index: msp430x41x.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x41x.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -d -r1.7 -r1.8
--- msp430x41x.h	27 Feb 2004 14:48:18 -0000	1.7
+++ msp430x41x.h	21 Oct 2004 19:41:00 -0000	1.8
@@ -21,10 +21,10 @@
 #define __msp430_have_port5
 #define __msp430_have_port6
 #define __msp430_have_fll
-#if defined(__MSP430_412__) || defined(__MSP430_413__)
-#define __msp430_have_non_variable_svs_threshold
-#else
+#if defined(__MSP430_415__) || defined(__MSP430_417__)
 #define __msp430_have_timer1_a5
+#else
+#define __msp430_have_non_variable_svs_threshold
 #endif
 #define LCD_BASE 0x90
 
@@ -63,10 +63,18 @@
 #define BASICTIMER_VECTOR   0	    /* 0xFFE0 Basic Timer */
 #define PORT2_VECTOR        2	    /* 0xFFE2 Port 2 */
 #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 TIMER0_A1_VECTOR    10	    /* 0xFFEA Timer A CC1-2, TA */
+#define TIMER0_A0_VECTOR    12	    /* 0xFFEC Timer A CC0 */
 #define WDT_VECTOR          20	    /* 0xFFF4 Watchdog Timer */
 #define COMPARATORA_VECTOR  22	    /* 0xFFF6 Comparator A */
+#if defined(__MSP430_415__) || defined(__MSP430_417__)
+#define TIMER0_A1_VECTOR    24	    /* 0xFFEA Timer1_A CC1-2, TA */
+#define TIMER0_A0_VECTOR    26	    /* 0xFFEC Timer1_A CC0 */
+#endif
 #define NMI_VECTOR          28	    /* 0xFFFC Non-maskable */ 
 
+/* Alternate names */
+#define TIMERA1_VECTOR      TIMER0_A1_VECTOR
+#define TIMERA0_VECTOR      TIMER0_A0_VECTOR
+
 #endif /* #ifndef __msp430x41x */



-------------------------------------------------------
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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.