CVS: msp430-libc/include msp430x22x4.h, 1.4, 1.5 msp430xG461x.h, 1.5, 1.6

Update of /cvsroot/mspgcc/msp430-libc/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2171/msp430-libc/include

Modified Files:
	msp430x22x4.h msp430xG461x.h 
Log Message:
Various errors in the interrupt and module enable registers cleaned up


Index: msp430x22x4.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x22x4.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- msp430x22x4.h	16 Nov 2006 01:19:37 -0000	1.4
+++ msp430x22x4.h	13 Jan 2007 13:14:05 -0000	1.5
@@ -54,19 +54,19 @@
 #define RSTIFG              (1<<3)      /* Reset Interrupt Flag */
 #define NMIIFG              (1<<4)      /* NMI Interrupt Flag */
 
-#define IE2_                0x0000  /* Interrupt Enable 2 */
+#define IE2_                0x0001  /* Interrupt Enable 2 */
 sfrb(IE2, IE2_);
-#define UCARXIE             (1<<0)
-#define UCATXIE             (1<<1)
-#define UCBRXIE             (1<<2)
-#define UCBTXIE             (1<<3)
+#define UCA0RXIE            (1<<0)
+#define UCA0TXIE            (1<<1)
+#define UCB0RXIE            (1<<2)
+#define UCB0TXIE            (1<<3)
 
-#define IFG2_               0x0002  /* Interrupt Flag 2 */
-sfrb(IFG1,IFG2_);
-#define UCARXIFG            (1<<0)
-#define UCATXIFG            (1<<1)
-#define UCBRXIFG            (1<<2)
-#define UCBTXIFG            (1<<3)
+#define IFG2_               0x0003  /* Interrupt Flag 2 */
+sfrb(IFG2,IFG2_);
+#define UCA0RXIFG           (1<<0)
+#define UCA0TXIFG           (1<<1)
+#define UCB0RXIFG           (1<<2)
+#define UCB0TXIFG           (1<<3)
 
 /************************************************************
 * Calibration Data in Info Mem

Index: msp430xG461x.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430xG461x.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- msp430xG461x.h	15 Nov 2006 14:34:57 -0000	1.5
+++ msp430xG461x.h	13 Jan 2007 13:14:05 -0000	1.6
@@ -74,30 +74,41 @@
 #define OFIE                (1<<1)
 #define NMIIE               (1<<4)
 #define ACCVIE              (1<<5)
-#define URXIE0              (1<<6)
-#define UTXIE0              (1<<7)
 
 #define IFG1_               0x0002  /* Interrupt Flag 1 */
 sfrb(IFG1,IFG1_);
 #define WDTIFG              (1<<0)
 #define OFIFG               (1<<1)
 #define NMIIFG              (1<<4)
-#define URXIFG0             (1<<6)
-#define UTXIFG0             (1<<7)
 
 #define IE2_                0x0001  /* Interrupt Enable 2 */
 sfrb(IE2,IE2_);
+#define UCA0RXIE            (1<<0)
+#define UCA0TXIE            (1<<1)
+#define UCB0RXIE            (1<<2)
+#define UCB0TXIE            (1<<3)
+#define URXIE1              (1<<4)
+#define UTXIE1              (1<<5)
 #define BTIE                (1<<7)
 
 #define IFG2_               0x0003  /* Interrupt Flag 2 */
 sfrb(IFG2,IFG2_);
+#define UCA0RXIFG           (1<<0)
+#define UCA0TXIFG           (1<<1)
+#define UCB0RXIFG           (1<<2)
+#define UCB0TXIFG           (1<<3)
+#define URXIFG1             (1<<4)
+#define UTXIFG1             (1<<5)
 #define BTIFG               (1<<7)
 
 #define ME1_                0x0004  /* Module Enable 1 */
 sfrb(ME1,ME1_);
-#define URXE0               (1<<6)
-#define USPIE0              (1<<6)
-#define UTXE0               (1<<7)
+
+#define ME2_                0x0005  /* Module Enable 2 */
+sfrb(ME2,ME2_);
+#define USPIE1              (1<<4)
+#define URXE1               (1<<4)
+#define UTXE1               (1<<5)
 
 #define DAC12_VECTOR        28      /* 0xFFDC DAC 12 */
 #define DMA_VECTOR          30      /* 0xFFDE DMA */


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV