CVS: msp430-libc/include/msp430 usart.h, 1.11, 1.12

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

Modified Files:
	usart.h 
Log Message:
- G461x implements USART1 instead of USART0
- do not include definitions if __MSP430_HAS_UART0__ isn't defined (used for the G461x)

Index: usart.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430/usart.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- usart.h	27 Mar 2006 21:06:36 -0000	1.11
+++ usart.h	16 Feb 2007 13:07:23 -0000	1.12
@@ -59,6 +59,7 @@
 #define SSEL_SMCLK          SSEL_2
 /*#define SSEL_SMCLK          SSEL_3*/
 
+#if defined(__MSP430_HAS_UART0__)
 /*UART0 ME/IE/IFG is different on F12x and F13x/F14x devices.
   With these defines, the right sfrs are choosen automaticaly.
   These defines should only be used with bit set and clear
@@ -78,6 +79,7 @@
   #define U0IE              IE1         /* RX and TX interrupt of UART0 */
   #define U0IFG             IFG1        /* RX and TX interrupt flags of UART0 */
 #endif
+#endif /*__MSP430_HAS_UART0__*/
 
 /* UART1 aliases for consistency with UART0 */
 #if defined(__MSP430_HAS_UART1__)
@@ -86,6 +88,9 @@
   #define U1IFG             IFG2        /* RX and TX interrupt flags of UART1 */
 #endif
 
+
+#if defined(__MSP430_HAS_UART0__)
+
 /* -------- USART 0 */
 
 #define U0CTL_              0x0070      /* UART 0 Control */
@@ -266,6 +271,7 @@
 //~ #define I2CSSEL_SMCLK       I2CSSEL_3      /* I2C clock select 3: SMCLK */
 
 #endif /* __MSP430_HAS_I2C__ */
+#endif /*__MSP430_HAS_UART0__*/
 
 #if defined(__MSP430_HAS_UART1__)
 


-------------------------------------------------------------------------
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