Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / msp430 / pins / HplMsp430GeneralIORenP.nc

diff --git a/tos/chips/msp430/pins/HplMsp430GeneralIORenP.nc b/tos/chips/msp430/pins/HplMsp430GeneralIORenP.nc
index e799bcd627af8cab408d34c3543ee9ec5dcffc39..5e272b39ca5aab434bd4678990a14c8e2d88bcf5 100644 (file)
--- a/tos/chips/msp430/pins/HplMsp430GeneralIORenP.nc
+++ b/tos/chips/msp430/pins/HplMsp430GeneralIORenP.nc
@@ -1,4 +1,7 @@
 /*
+ * Copyright (c) 2000-2005 The Regents of the University of California.
+ * All rights reserved.
+ *
  * Copyright (c) 2008, Titanium Mirror, Inc.
  * All rights reserved.
  *
@@ -26,11 +29,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
- /**
- * @author R. Steve McKown <smckown@gmail.com>
+
+/**
+ * Modified from the original HplMsp430GeneralIOP to provide resistor enable
+ * support available on some msp430 parts.
+ *
+ * @author R. Steve McKown <rsmckown@gmail.com>
  */
- 
+
 #include "msp430regtypes.h"
 
 generic module HplMsp430GeneralIORenP(
@@ -69,5 +75,5 @@ implementation
   async command bool IO.isIOFunc() { return (PORTxSEL & (0x01<<pin)) == 0; }
   async command void IO.enableRen() { atomic PORTxREN |= (0x01 << pin); }
   async command void IO.disableRen() { atomic PORTxREN &= ~(0x01 << pin); }
-  async command void IO.isRen() { return PORTxREN = (0x01 << pin) != 0; }
+  async command bool IO.isRen() { return PORTxREN = (0x01 << pin) != 0; }
 }