X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fplatforms%2Fshimmer%2Fhardware.h;h=d4769930ca60fe01e4f746df0170e3618712a0d2;hb=f0135f27e8f60903c11ebb833d08dd22ef4811b2;hp=06013f1a893652bebfed36254355657ae5c924e2;hpb=bef408170ad6af964a2a8950ea57c5d8fda75678;p=tinyos-2.x.git

diff --git a/tos/platforms/shimmer/hardware.h b/tos/platforms/shimmer/hardware.h
index 06013f1a..d4769930 100644
--- a/tos/platforms/shimmer/hardware.h
+++ b/tos/platforms/shimmer/hardware.h
@@ -198,7 +198,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 +216,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 +272,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 +299,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();