Store the defines for default lpl in a global header file.

diff --git a/tos/chips/cc2420/CC2420.h b/tos/chips/cc2420/CC2420.h
index a350b5b60aafda7039419db1efe49790ab9abffa..91138798702f948c122b7e650d5852b4b2bc3ae8 100644 (file)
--- a/tos/chips/cc2420/CC2420.h
+++ b/tos/chips/cc2420/CC2420.h
@@ -183,17 +183,6 @@ typedef nx_struct cc2420_packet_t {
 #define TINYOS_6LOWPAN_NETWORK_ID 0x3f
 #endif
 
-/**
- * The LPL defaults to stay-on.
- */
-#ifndef LPL_DEF_LOCAL_WAKEUP
-#define LPL_DEF_LOCAL_WAKEUP 0
-#endif
-
-#ifndef LPL_DEF_REMOTE_WAKEUP
-#define LPL_DEF_REMOTE_WAKEUP 0
-#endif
-
 enum {
   // size of the header not including the length byte
   MAC_HEADER_SIZE = sizeof( cc2420_header_t ) - 1,

diff --git a/tos/chips/cc2420/lpl/DefaultLpl.h b/tos/chips/cc2420/lpl/DefaultLpl.h
index f74db43b950c4b3ac211f67b2789230c808cd70d..760ece79ee89c7df5a76d710f8fd0b45f2491f42 100644 (file)
--- a/tos/chips/cc2420/lpl/DefaultLpl.h
+++ b/tos/chips/cc2420/lpl/DefaultLpl.h
@@ -47,14 +47,6 @@ typedef enum {
 } lpl_sendstate_t;
 
 
-/**
- * Amount of time, in milliseconds, to keep the radio on after
- * a successful receive addressed to this node
- */
-#ifndef DELAY_AFTER_RECEIVE
-#define DELAY_AFTER_RECEIVE 100
-#endif
-
 /**
  * This is a measured value of the time in ms the radio is actually on
  * We round this up to err on the side of better performance ratios

diff --git a/tos/chips/cc2420/lpl/DefaultLplP.nc b/tos/chips/cc2420/lpl/DefaultLplP.nc
index 7398f3c94eb9261b5e1e10e9ee229b6b248e7af7..4c5c63b48988cd4b8def306abd9840baa4775a87 100644 (file)
--- a/tos/chips/cc2420/lpl/DefaultLplP.nc
+++ b/tos/chips/cc2420/lpl/DefaultLplP.nc
@@ -40,6 +40,7 @@
  * @author David Moss
  */
 
+#include "Lpl.h"
 #include "DefaultLpl.h"
 #include "AM.h"
 

diff --git a/tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc b/tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc
index 3030f26b078b1828022a5aee646ac15a01abbc58..d290df374ada2dd53ea70e588c9cf874350a49bb 100644 (file)
--- a/tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc
+++ b/tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc
@@ -52,10 +52,6 @@ module LowPowerListeningLayerP
 
 implementation
 {
-#ifndef LPL_DEF_LOCAL_WAKEUP
-#define LPL_DEF_LOCAL_WAKEUP 0
-#endif
-
        enum
        {
                // minimum wakeup time to catch a transmission in milliseconds

diff --git a/tos/system/SystemLowPowerListeningP.nc b/tos/system/SystemLowPowerListeningP.nc
index db91cbf215bbc1545cc32152f136dd2a5bdc7c1e..564db6764a1080327255a8f960f07fe9f56178cd 100644 (file)
--- a/tos/system/SystemLowPowerListeningP.nc
+++ b/tos/system/SystemLowPowerListeningP.nc
@@ -1,3 +1,5 @@
+#include "Lpl.h"
+
 module SystemLowPowerListeningP
 {
   provides interface SystemLowPowerListening;

diff --git a/tos/types/Lpl.h b/tos/types/Lpl.h
new file mode 100644 (file)
index 0000000..05219ba
--- /dev/null
+++ b/tos/types/Lpl.h
@@ -0,0 +1,23 @@
+#ifndef LPL_H
+#define LPL_H
+
+/**
+ * Amount of time, in milliseconds, to keep the radio on after
+ * a successful receive addressed to this node
+ */
+#ifndef DELAY_AFTER_RECEIVE
+#define DELAY_AFTER_RECEIVE 100
+#endif
+
+/**
+ * The LPL defaults to stay-on.
+ */
+#ifndef LPL_DEF_LOCAL_WAKEUP
+#define LPL_DEF_LOCAL_WAKEUP 0
+#endif
+
+#ifndef LPL_DEF_REMOTE_WAKEUP
+#define LPL_DEF_REMOTE_WAKEUP 0
+#endif
+
+#endif