CVS: msp430-libc/include/msp430 opamp.h,1.5,1.6

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

Modified Files:
	opamp.h 
Log Message:
The register definitions were misaligned with the #if/#endif selection
of the op-amps


Index: opamp.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430/opamp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- opamp.h	11 Mar 2005 15:49:50 -0000	1.5
+++ opamp.h	18 Sep 2007 12:37:02 -0000	1.6
@@ -24,19 +24,19 @@
 
 #define OA0CTL0_            0x00C0  /* OA0 Control register 0 */
 sfrb(OA0CTL0, OA0CTL0_);
-#define OA1CTL1_            0x00C3  /* OA1 Control register 1 */
-sfrb(OA1CTL1, OA1CTL1_);
-
-#if defined(__msp430_have_opamp_1)
 #define OA0CTL1_            0x00C1  /* OA0 Control register 1 */
 sfrb(OA0CTL1, OA0CTL1_);
-#define OA2CTL0_            0x00C4  /* OA2 Control register 0 */
-sfrb(OA2CTL0, OA2CTL0_);
-#endif
 
-#if defined(__msp430_have_opamp_2)
+#if defined(__msp430_have_opamp_1)
 #define OA1CTL0_            0x00C2  /* OA1 Control register 0 */
 sfrb(OA1CTL0, OA1CTL0_);
+#define OA1CTL1_            0x00C3  /* OA1 Control register 1 */
+sfrb(OA1CTL1, OA1CTL1_);
+#endif
+
+#if defined(__msp430_have_opamp_2)
+#define OA2CTL0_            0x00C4  /* OA2 Control register 0 */
+sfrb(OA2CTL0, OA2CTL0_);
 #define OA2CTL1_            0x00C5  /* OA2 Control register 1 */
 sfrb(OA2CTL1, OA2CTL1_);
 #endif


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/