Imported msp430-libc-20100207

[msp430-libc.git] / include / msp430 / esp430e.h

diff --git a/include/msp430/esp430e.h b/include/msp430/esp430e.h
index 69043e487e801e15b2f15d103cd2bdb2a7b4c13c..a098de6acfc95cdb5548c767219caad087800517 100644 (file)
--- a/include/msp430/esp430e.h
+++ b/include/msp430/esp430e.h
@@ -9,7 +9,7 @@
  * (c) 2003 by Steve Underwood <steveu@coppice.org>
  * Originally based in part on work by Texas Instruments Inc.
  *
- * $Id: esp430e.h,v 1.5 2006/12/26 10:33:14 coppice Exp $
+ * $Id: esp430e.h,v 1.6 2008/10/09 15:00:14 sb-sf Exp $
  */
 
 /* Switches: none */
@@ -96,19 +96,28 @@ sfrw(RET31, RET31_);
 #define ESP430_STAT1        RET1      /* STATUS1 of ESP430 */
 #define WAVEFSV1            RET2      /* Waveform Sample V1 offset corrected*/
 #define WAVEFSI1            RET5      /* Waveform Sample I1 offset corrected*/
+#if defined __MSP430_HAS_ESP430E1A__
 #define WAVEFSI2            RET6      /* Waveform Sample I2 offset corrected*/
+#endif
 #define ACTENERGY1_LO       RET8      /* Active energy I1 Low Word */
 #define ACTENERGY1_HI       RET9      /* Active energy I1 High Word */
+#if defined __MSP430_HAS_ESP430E1A__
 #define ACTENERGY2_LO       RET10     /* Active energy I2 Low Word */
 #define ACTENERGY2_HI       RET11     /* Active energy I2 High Word*/
+#endif
 #define REACTENERGY_LO      RET12     /* Reactive energy Low Word */
 #define REACTENERGY_HI      RET13     /* Reactive energy High Word */
 #define APPENERGY_LO        RET14     /* Apparent energy Low Word */
 #define APPENERGY_HI        RET15     /* Apparent energy High Word */
 #define ACTENSPER1_LO       RET16     /* Active energy I1 for last mains period Low Word */
 #define ACTENSPER1_HI       RET17     /* Active energy I1 for last mains period High Word */
+#if defined __MSP430_HAS_ESP430E1A__
 #define ACTENSPER2_LO       RET18     /* Active energy I2 for last mains period Low Word */
 #define ACTENSPER2_HI       RET19     /* Active energy I2 for last mains period High Word */
+#elif defined __MSP430_HAS_ESP430E1B__
+#define IRMS_2_LO           RET18     /* RMS_2 Low Word */
+#define IRMS_2_HI           RET19     /* RMS_2 High Word */
+#endif
 #define POWERFCT            RET20     /* Power factor */
 #define CAPIND              RET21     /* Power factor: neg: inductive pos: cap. (LowByte)*/
 #define MAINSPERIOD         RET22     /* Mains period */