CVS: msp430-libc/include msp430x22x4.h,1.2,1.3

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

Modified Files:
	msp430x22x4.h 
Log Message:
Interrupt vectors and the size of timer B were wrong


Index: msp430x22x4.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x22x4.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- msp430x22x4.h	5 Apr 2006 12:06:34 -0000	1.2
+++ msp430x22x4.h	18 Apr 2006 13:42:17 -0000	1.3
@@ -21,13 +21,12 @@
 #define __MSP430_HAS_PORT3_R__
 #define __MSP430_HAS_PORT4_R__
 #define __MSP430_HAS_TA3__
-#define __MSP430_HAS_TB5__
+#define __MSP430_HAS_TB3__
 #define __MSP430_HAS_BC2__
 #define __MSP430_HAS_FLASH2__
 #define __MSP430_HAS_OA_2__
 #define __MSP430_HAS_USCI__
 
-#define __msp430_have_compa_extended mux
 #define __msp430_have_flash_extra_flags
 
 #include <msp430/basic_clock.h>
@@ -95,15 +94,17 @@
 sfrb(CALBC1_1MHZ, CALBC1_1MHZ_);
 
 #endif /* #ifndef __DisableCalData */
+
 #define PORT1_VECTOR        4       /* 0xFFE4 Port 1 */
 #define PORT2_VECTOR        6       /* 0xFFE6 Port 2 */
 #define ADC10_VECTOR        10      /* 0xFFEA ADC10 */
-#define USCITX_VECTOR       12      /* 0xFFEC USCI A/B Transmit */
-#define USCIRX_VECTOR       14      /* 0xFFEE USCI A/B Receive */
+#define USCIAB0TX_VECTOR    12      /* 0xFFEC USCI A0/B0 Transmit */
+#define USCIAB0RX_VECTOR    14      /* 0xFFEE USCI A0/B0 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 TIMERB1_VECTOR      24      /* 0xFFF8 Timer B CC1-2, TB */
+#define TIMERB0_VECTOR      26      /* 0xFFFA Timer B CC0 */
 
 #define NMI_VECTOR          28      /* 0xFFFC Non-maskable */
 



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
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.