Add TOS_SLEEP_NONE enum so components can prevent

low power states.

diff --git a/tos/platforms/btnode3/hardware.h b/tos/platforms/btnode3/hardware.h
index 14103ceb921d295abda66c0ccb37d741b6f712db..99484b8ba2b8407f120c40b713961185a807283e 100644 (file)
--- a/tos/platforms/btnode3/hardware.h
+++ b/tos/platforms/btnode3/hardware.h
@@ -53,6 +53,12 @@
 #include <Atm128Adc.h>
 #include <MicaTimer.h>
 
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = ATM128_POWER_IDLE,
+};
+
 // A/D constants (channels, etc)
 enum {
   CHANNEL_RSSI       = ATM128_ADC_SNGL_ADC2,

diff --git a/tos/platforms/epic/hardware.h b/tos/platforms/epic/hardware.h
index c295356eaf3fac5b7b5641cae3de938c6274218e..e69eb74e773fbfbf69f35fb39586d75a2c2c3763 100644 (file)
--- a/tos/platforms/epic/hardware.h
+++ b/tos/platforms/epic/hardware.h
@@ -42,6 +42,12 @@
 
 #include "msp430hardware.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, 4, 0);
 TOSH_ASSIGN_PIN(GREEN_LED, 4, 3);

diff --git a/tos/platforms/eyesIFX/eyesIFXv1/hardware.h b/tos/platforms/eyesIFX/eyesIFXv1/hardware.h
index 8c1e786b9944335aa43c13e6f803ecc0d5c420bc..91c4f3066312eead85ce30784e4148376b9fb53f 100644 (file)
--- a/tos/platforms/eyesIFX/eyesIFXv1/hardware.h
+++ b/tos/platforms/eyesIFX/eyesIFXv1/hardware.h
@@ -35,6 +35,12 @@
 
 #include "msp430hardware.h"
 
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = MSP430_POWER_ACTIVE,
+};
+
 // LED assignments
 TOSH_ASSIGN_PIN(RED_LED, 5, 0); // Compatibility with the mica2
 TOSH_ASSIGN_PIN(GREEN_LED, 5, 1);

diff --git a/tos/platforms/eyesIFX/eyesIFXv2/hardware.h b/tos/platforms/eyesIFX/eyesIFXv2/hardware.h
index 212e4d8f27fdfaa2d0836c8a3865fa9b5f425da4..92b29b03e68118e9645e24f20e5cd7073a511a2d 100644 (file)
--- a/tos/platforms/eyesIFX/eyesIFXv2/hardware.h
+++ b/tos/platforms/eyesIFX/eyesIFXv2/hardware.h
@@ -35,6 +35,12 @@
 
 #include "msp430hardware.h"
 
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = MSP430_POWER_ACTIVE,
+};
+
 // LED assignments
 TOSH_ASSIGN_PIN(RED_LED, 5, 0); // Compatibility with the mica2
 TOSH_ASSIGN_PIN(GREEN_LED, 5, 1);

diff --git a/tos/platforms/intelmote2/hardware.h b/tos/platforms/intelmote2/hardware.h
index b6cb5d8baf4886577e7c35e22f6b9dd9778fa9e8..3ff83b7b96a38a131f632be55b48996b00ea6afa 100644 (file)
--- a/tos/platforms/intelmote2/hardware.h
+++ b/tos/platforms/intelmote2/hardware.h
@@ -100,6 +100,15 @@
 #include "pxa27xhardware.h"
 //#include "AM.h"
 
+// enum so components can override power saving,
+// as per TEP 112.
+// Note that currently the pxa27x does not support
+// McuPowerOverride, so SLEEP_NONE is defined to
+// be 0.
+enum {
+  TOS_SLEEP_NONE = 0,
+};
+
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
 /* Watchdog Prescaler

diff --git a/tos/platforms/mica2/hardware.h b/tos/platforms/mica2/hardware.h
index c3dc7a9ac170b6758cc664c42df2d06b4fba7620..bfd66849ad90a99111b2ad9681323b46960560e7 100644 (file)
--- a/tos/platforms/mica2/hardware.h
+++ b/tos/platforms/mica2/hardware.h
@@ -51,6 +51,12 @@
 #include <Atm128Adc.h>
 #include <MicaTimer.h>
 
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = ATM128_POWER_IDLE,
+};
+
 // A/D channels
 enum {
   CHANNEL_RSSI       = ATM128_ADC_SNGL_ADC0,

diff --git a/tos/platforms/mica2dot/hardware.h b/tos/platforms/mica2dot/hardware.h
index fa5788516f6ba63fb5ba52112683a7f629626a3a..d59f5671c7a7146422c5677416cc986e7931d8ad 100644 (file)
--- a/tos/platforms/mica2dot/hardware.h
+++ b/tos/platforms/mica2dot/hardware.h
@@ -51,6 +51,12 @@
 #include <Atm128Adc.h>
 #include <MicaTimer.h>
 
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = ATM128_POWER_IDLE,
+};
+
 // A/D channels
 enum {
   CHANNEL_RSSI       = ATM128_ADC_SNGL_ADC0,

diff --git a/tos/platforms/micaz/hardware.h b/tos/platforms/micaz/hardware.h
index c21554a0eb9d9bbf6b979a3bd5f2e01be50c2575..3276ed8901f6ead6474dbcfeabfb4e2126f64237 100644 (file)
--- a/tos/platforms/micaz/hardware.h
+++ b/tos/platforms/micaz/hardware.h
@@ -51,6 +51,12 @@
 #include <Atm128Adc.h>
 #include <MicaTimer.h>
 
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = ATM128_POWER_IDLE,
+};
+
 // A/D channels
 enum {
   CHANNEL_THERMISTOR = ATM128_ADC_SNGL_ADC1    // normally unpopulated

diff --git a/tos/platforms/null/hardware.h b/tos/platforms/null/hardware.h
index 2321cb159a52422f842d951c849de064b496db9b..59da9bc7215e8808ad47d9958faf815e2f23b792 100644 (file)
--- a/tos/platforms/null/hardware.h
+++ b/tos/platforms/null/hardware.h
@@ -28,4 +28,12 @@ inline float __nesc_hton_afloat(void *COUNT(sizeof(float)) target, float value)
   return value;
 }
 
+// enum so components can override power saving,
+// as per TEP 112.
+// As this is not a real platform, just set it to 0.
+enum {
+  TOS_SLEEP_NONE = 0,
+};
+
+
 #endif

diff --git a/tos/platforms/shimmer/hardware.h b/tos/platforms/shimmer/hardware.h
index d4769930ca60fe01e4f746df0170e3618712a0d2..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);

diff --git a/tos/platforms/telosa/hardware.h b/tos/platforms/telosa/hardware.h
index 405ba4f3c932ff4e9bf26c2ca41c9709b98f1c1b..b1b1939551bc20a85a9d303630e7355f752bda82 100644 (file)
--- a/tos/platforms/telosa/hardware.h
+++ b/tos/platforms/telosa/hardware.h
@@ -4,6 +4,12 @@
 
 #include "msp430hardware.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);
 TOSH_ASSIGN_PIN(GREEN_LED, 5, 5);

diff --git a/tos/platforms/telosb/hardware.h b/tos/platforms/telosb/hardware.h
index 8b720fa288fc8ca3fcdfbe99e6b52f33ed703058..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);

diff --git a/tos/platforms/tinynode/hardware.h b/tos/platforms/tinynode/hardware.h
index eaa8005192d9f8910fc0a0ee4e4b30d14db13821..b5a939cd2950b665f9702b75d67ac4bffef3f4f2 100644 (file)
--- a/tos/platforms/tinynode/hardware.h
+++ b/tos/platforms/tinynode/hardware.h
@@ -44,6 +44,11 @@
 
 #include "msp430hardware.h"
 
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = MSP430_POWER_ACTIVE,
+};
 
 // XE1205 radio
 TOSH_ASSIGN_PIN(NSS_DATA, 1, 0);