Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/platforms/mica2/hardware.h b/tos/platforms/mica2/hardware.h
index 54a81d291201b34c8015b1f9d99265643035f1a0..bfd66849ad90a99111b2ad9681323b46960560e7 100644 (file)
--- a/tos/platforms/mica2/hardware.h
+++ b/tos/platforms/mica2/hardware.h
@@ -1,4 +1,4 @@
-/*                                                                     tab:4
+/*                                                                     
  *  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.  By
  *  downloading, copying, installing or using the software you agree to
  *  this license.  If you do not agree to this license, do not download,
@@ -41,8 +41,21 @@
 #ifndef HARDWARE_H
 #define HARDWARE_H
 
+#ifndef MHZ
+/* Clock rate is ~8MHz except if specified by user 
+   (this value must be a power of 2, see MicaTimer.h and MeasureClockC.nc) */
+#define MHZ 8
+#endif
+
 #include <atm128hardware.h>
 #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 {
@@ -51,12 +64,6 @@ enum {
   CHANNEL_BATTERY    = ATM128_ADC_SNGL_ADC7,
 };
 
-#ifndef MHZ
-/* Clock rate is ~8MHz except if specified by user 
-   (this value must be a power of 2, see MicaTimer.h and MeasureClockC.nc) */
-#define MHZ 8
-#endif
-
 enum {
   PLATFORM_BAUDRATE = 57600L
 };