From bb105980505d770c77044a7bb69568c50a904d19 Mon Sep 17 00:00:00 2001 From: smckown Date: Tue, 9 Sep 2008 16:49:27 +0000 Subject: [PATCH] Update HplMsp430Interrupt(P|C) to support msp430 parts with pullup/pulldown resistors. --- tos/chips/msp430/pins/HplMsp430InterruptC.nc | 8 ++++---- tos/chips/msp430/pins/HplMsp430InterruptP.nc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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; 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; -- 2.39.2