Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / telosb / hardware.h

diff --git a/tos/platforms/telosb/hardware.h b/tos/platforms/telosb/hardware.h
index 62754f8864141704491633ec57926336dfb4d539..50bac24689954ccec386ff08e0268e2c9b8d5555 100644 (file)
--- a/tos/platforms/telosb/hardware.h
+++ b/tos/platforms/telosb/hardware.h
@@ -2,9 +2,12 @@
 #define _H_hardware_h
 
 #include "msp430hardware.h"
-//#include "MSP430ADC12.h"
-//#include "CC2420Const.h"
-//#include "AM.h"
+
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = MSP430_POWER_ACTIVE,
+};
 
 // LEDs
 TOSH_ASSIGN_PIN(RED_LED, 5, 4);
@@ -60,15 +63,15 @@ TOSH_ASSIGN_PIN(GIO3, 2, 6);
 // 1-Wire
 TOSH_ASSIGN_PIN(ONEWIRE, 2, 4);
 
-void HUMIDITY_MAKE_CLOCK_OUTPUT() { TOSH_MAKE_HUM_SCL_OUTPUT(); }
-void HUMIDITY_MAKE_CLOCK_INPUT() { TOSH_MAKE_HUM_SCL_INPUT(); }
-void HUMIDITY_CLEAR_CLOCK() { TOSH_CLR_HUM_SCL_PIN(); }
-void HUMIDITY_SET_CLOCK() { TOSH_SET_HUM_SCL_PIN(); }
-void HUMIDITY_MAKE_DATA_OUTPUT() { TOSH_MAKE_HUM_SDA_OUTPUT(); }
-void HUMIDITY_MAKE_DATA_INPUT() { TOSH_MAKE_HUM_SDA_INPUT(); }
-void HUMIDITY_CLEAR_DATA() { TOSH_CLR_HUM_SDA_PIN(); }
-void HUMIDITY_SET_DATA() { TOSH_SET_HUM_SDA_PIN(); }
-char HUMIDITY_GET_DATA() { return TOSH_READ_HUM_SDA_PIN(); }
+void HUMIDITY_MAKE_CLOCK_OUTPUT() @safe() { TOSH_MAKE_HUM_SCL_OUTPUT(); }
+void HUMIDITY_MAKE_CLOCK_INPUT() @safe() { TOSH_MAKE_HUM_SCL_INPUT(); }
+void HUMIDITY_CLEAR_CLOCK() @safe() { TOSH_CLR_HUM_SCL_PIN(); }
+void HUMIDITY_SET_CLOCK() @safe() { TOSH_SET_HUM_SCL_PIN(); }
+void HUMIDITY_MAKE_DATA_OUTPUT() @safe() { TOSH_MAKE_HUM_SDA_OUTPUT(); }
+void HUMIDITY_MAKE_DATA_INPUT() @safe() { TOSH_MAKE_HUM_SDA_INPUT(); }
+void HUMIDITY_CLEAR_DATA() @safe() { TOSH_CLR_HUM_SDA_PIN(); }
+void HUMIDITY_SET_DATA() @safe() { TOSH_SET_HUM_SDA_PIN(); }
+char HUMIDITY_GET_DATA() @safe() { return TOSH_READ_HUM_SDA_PIN(); }
 
 #define HUMIDITY_TIMEOUT_MS          30
 #define HUMIDITY_TIMEOUT_TRIES       20