Add TOS_SLEEP_NONE enum so components can prevent

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

diff --git a/tos/platforms/shimmer/hardware.h b/tos/platforms/shimmer/hardware.h
index 06013f1a893652bebfed36254355657ae5c924e2..71de14f30f232e015e9cf696c7889a907adae308 100644 (file)
--- a/tos/platforms/shimmer/hardware.h
+++ b/tos/platforms/shimmer/hardware.h
@@ -40,6 +40,12 @@
 
 #define SHIMMER 1
 
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = MSP430_POWER_ACTIVE,
+};
+
 // LEDs
 TOSH_ASSIGN_PIN(RED_LED,    4, 0);
 TOSH_ASSIGN_PIN(ORANGE_LED, 4, 1);
@@ -198,7 +204,7 @@ void TOSH_SET_PIN_DIRECTIONS(void)
   TOSH_MAKE_BT_RTS_INPUT();      
   TOSH_SEL_BT_RTS_IOFUNC();
 
-  TOSH_MAKE_BT_PIO_OUTPUT();
+  TOSH_MAKE_BT_PIO_INPUT();
   TOSH_SEL_BT_PIO_IOFUNC();
 
   TOSH_MAKE_BT_CTS_OUTPUT();
@@ -216,6 +222,25 @@ void TOSH_SET_PIN_DIRECTIONS(void)
   TOSH_SEL_PROG_IN_IOFUNC();
   TOSH_SEL_PROG_OUT_IOFUNC();
 
+  // USART lines, attached to a pullup
+  TOSH_SEL_UCLK0_IOFUNC();
+  TOSH_MAKE_UCLK0_OUTPUT();
+  TOSH_SET_UCLK0_PIN();
+  TOSH_SEL_UCLK1_IOFUNC();
+  TOSH_MAKE_UCLK1_OUTPUT();
+  TOSH_SET_UCLK1_PIN();
+
+  TOSH_SEL_SIMO0_IOFUNC();
+  TOSH_MAKE_SIMO0_OUTPUT();
+  TOSH_SET_SIMO0_PIN();
+  TOSH_SEL_SOMI0_IOFUNC();
+  TOSH_MAKE_SOMI0_INPUT();
+
+  TOSH_SEL_SIMO1_IOFUNC();
+  TOSH_MAKE_SIMO1_OUTPUT();
+  TOSH_SET_SIMO1_PIN();
+  TOSH_SEL_SOMI1_IOFUNC();
+  TOSH_MAKE_SOMI1_INPUT();
 
   // ADC lines
   TOSH_MAKE_ADC_0_OUTPUT();
@@ -253,6 +278,7 @@ void TOSH_SET_PIN_DIRECTIONS(void)
   // 1-wire function
   TOSH_MAKE_ONEWIRE_PWR_OUTPUT();
   TOSH_SEL_ONEWIRE_PWR_IOFUNC();
+  TOSH_MAKE_ONEWIRE_INPUT();
   TOSH_SEL_ONEWIRE_IOFUNC();
 
   // Accelerometer pin definitions
@@ -279,7 +305,7 @@ void TOSH_SET_PIN_DIRECTIONS(void)
   TOSH_SEL_SER0_CTS_IOFUNC();
   TOSH_MAKE_SER0_RTS_OUTPUT();
   TOSH_SEL_SER0_RTS_IOFUNC();
-  TOSH_MAKE_GIO0_OUTPUT();
+  TOSH_MAKE_GIO0_INPUT();
   TOSH_SEL_GIO0_IOFUNC();
   TOSH_MAKE_GIO1_OUTPUT();
   TOSH_SEL_GIO1_IOFUNC();