X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fpins%2FHplMsp430InterruptC.nc;h=e4699473f055ad76dd0ea655f915df34a723088b;hp=50ec746aebead97ed44903f6a3c5672fb79e0fe2;hb=48666eab550362c629ba4dcb7d107b9d44b9ba6c;hpb=da0fc4a07b170b5c2c4b1ead622701be794a4de6

diff --git a/tos/chips/msp430/pins/HplMsp430InterruptC.nc b/tos/chips/msp430/pins/HplMsp430InterruptC.nc
index 50ec746a..e4699473 100644
--- a/tos/chips/msp430/pins/HplMsp430InterruptC.nc
+++ b/tos/chips/msp430/pins/HplMsp430InterruptC.nc
@@ -27,7 +27,7 @@
  */
 configuration HplMsp430InterruptC
 {
-#ifdef __msp430_have_port1
+#if defined(__MSP430_HAS_PORT1__) || defined(__MSP430_HAS_PORT1_R__)
   provides interface HplMsp430Interrupt as Port10;
   provides interface HplMsp430Interrupt as Port11;
   provides interface HplMsp430Interrupt as Port12;
@@ -37,7 +37,7 @@ configuration HplMsp430InterruptC
   provides interface HplMsp430Interrupt as Port16;
   provides interface HplMsp430Interrupt as Port17;
 #endif
-#ifdef __msp430_have_port2
+#if defined(__MSP430_HAS_PORT2__) || defined(__MSP430_HAS_PORT2_R__)
   provides interface HplMsp430Interrupt as Port20;
   provides interface HplMsp430Interrupt as Port21;
   provides interface HplMsp430Interrupt as Port22;
@@ -51,7 +51,7 @@ configuration HplMsp430InterruptC
 implementation
 {
   components HplMsp430InterruptP as HplInterruptP;
-#ifdef __msp430_have_port1
+#if defined(__MSP430_HAS_PORT1__) || defined(__MSP430_HAS_PORT1_R__)
   Port10 = HplInterruptP.Port10;
   Port11 = HplInterruptP.Port11;
   Port12 = HplInterruptP.Port12;
@@ -61,7 +61,7 @@ implementation
   Port16 = HplInterruptP.Port16;
   Port17 = HplInterruptP.Port17;
 #endif
-#ifdef __msp430_have_port2
+#if defined(__MSP430_HAS_PORT2__) || defined(__MSP430_HAS_PORT2_R__)
   Port20 = HplInterruptP.Port20;
   Port21 = HplInterruptP.Port21;
   Port22 = HplInterruptP.Port22;