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

diff --git a/tos/chips/msp430/pins/HplMsp430InterruptP.nc b/tos/chips/msp430/pins/HplMsp430InterruptP.nc
index 26918456..37d57f0e 100644
--- a/tos/chips/msp430/pins/HplMsp430InterruptP.nc
+++ b/tos/chips/msp430/pins/HplMsp430InterruptP.nc
@@ -24,7 +24,7 @@
  */
 module HplMsp430InterruptP @safe()
 {
-#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;
@@ -34,7 +34,7 @@ module HplMsp430InterruptP @safe()
   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;
@@ -49,7 +49,7 @@ module HplMsp430InterruptP @safe()
 implementation
 {
 
-#ifdef __msp430_have_port1
+#if defined(__MSP430_HAS_PORT1__) || defined(__MSP430_HAS_PORT1_R__)
   TOSH_SIGNAL(PORT1_VECTOR)
   {
     volatile int n = P1IFG & P1IE;
@@ -154,7 +154,7 @@ implementation
   }
 #endif
 
-#ifdef __msp430_have_port2
+#if defined(__MSP430_HAS_PORT2__) || defined(__MSP430_HAS_PORT2_R__)
   TOSH_SIGNAL(PORT2_VECTOR)
   {
     volatile int n = P2IFG & P2IE;