AlarmCounter needs the #include depending on component loading order.

Add a typedef for mcu power type for the null platform.

diff --git a/tos/platforms/mica/AlarmCounterMilliP.nc b/tos/platforms/mica/AlarmCounterMilliP.nc
index 8a45e53faa986c91428541c6729528a295034dff..d403580e35b05e98aa8b64a1f9c6cecef83e4e40 100644 (file)
--- a/tos/platforms/mica/AlarmCounterMilliP.nc
+++ b/tos/platforms/mica/AlarmCounterMilliP.nc
@@ -18,6 +18,7 @@
  * @author David Gay <dgay@intel-research.net>
  * @author Martin Turon <mturon@xbow.com>
  */
+#include <Atm128Timer.h>
 
 #include <Atm128Timer.h>
 

diff --git a/tos/platforms/null/hardware.h b/tos/platforms/null/hardware.h
index bd9ff077616c39793fa5fdcbec6228106a4ad252..4e2f7984303223d4f508b52cc39d20d1388f9063 100644 (file)
--- a/tos/platforms/null/hardware.h
+++ b/tos/platforms/null/hardware.h
@@ -5,6 +5,7 @@ inline void __nesc_enable_interrupt() { }
 inline void __nesc_disable_interrupt() { }
 
 typedef uint8_t __nesc_atomic_t;
+typedef uint8_t mcu_power_t;
 
 inline __nesc_atomic_t __nesc_atomic_start(void) @spontaneous() {
   return 0;