From a9e4287cbe71dbd0ad20b7e22ce6c3f771755c7b Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Thu, 25 Oct 2007 09:30:39 +0000
Subject: [PATCH] Changed the energy estimation type ENERGEST_TYPE_RECEIVE to
 ENERGEST_TYPE_LISTEN to highlight that energy is spent on idle listening, not
 just the actual reception of packets

---
 core/dev/simple-cc2420.c      | 6 +++---
 core/lib/energest.h           | 4 ++--
 platform/esb/dev/tr1001-gcr.c | 6 +++---
 platform/esb/dev/tr1001.c     | 6 +++---
 platform/esb/energest-arch.c  | 4 ++--
 platform/sky/energest-arch.c  | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/dev/simple-cc2420.c b/core/dev/simple-cc2420.c
index 7a29dfc10..5f8760e2c 100644
--- a/core/dev/simple-cc2420.c
+++ b/core/dev/simple-cc2420.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: simple-cc2420.c,v 1.10 2007/09/18 10:36:31 nifi Exp $
+ * @(#)$Id: simple-cc2420.c,v 1.11 2007/10/25 09:30:39 adamdunkels Exp $
  */
 /*
  * This code is almost device independent and should be easy to port.
@@ -112,7 +112,7 @@ status(void)
 static void
 on(void)
 {
-  ENERGEST_ON(ENERGEST_TYPE_RECEIVE);
+  ENERGEST_ON(ENERGEST_TYPE_LISTEN);
   PRINTF("on\n");
   receive_on = 1;
   
@@ -134,7 +134,7 @@ off(void)
   
   strobe(CC2420_SRFOFF);
   DISABLE_FIFOP_INT();
-  ENERGEST_OFF(ENERGEST_TYPE_RECEIVE);
+  ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
 }
 /*---------------------------------------------------------------------------*/
 static u8_t locked, lock_on, lock_off;
diff --git a/core/lib/energest.h b/core/lib/energest.h
index 41d8796bd..75627189a 100644
--- a/core/lib/energest.h
+++ b/core/lib/energest.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: energest.h,v 1.4 2007/05/22 20:53:04 adamdunkels Exp $
+ * $Id: energest.h,v 1.5 2007/10/25 09:30:39 adamdunkels Exp $
  */
 
 /**
@@ -56,7 +56,7 @@ enum energest_type {
   ENERGEST_TYPE_LED_YELLOW,
   ENERGEST_TYPE_LED_RED,
   ENERGEST_TYPE_TRANSMIT,
-  ENERGEST_TYPE_RECEIVE,
+  ENERGEST_TYPE_LISTEN,
   
   ENERGEST_TYPE_SENSORS,
 
diff --git a/platform/esb/dev/tr1001-gcr.c b/platform/esb/dev/tr1001-gcr.c
index 105b239d5..a58d7f78f 100644
--- a/platform/esb/dev/tr1001-gcr.c
+++ b/platform/esb/dev/tr1001-gcr.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tr1001-gcr.c,v 1.9 2007/08/07 11:11:19 nifi Exp $
+ * @(#)$Id: tr1001-gcr.c,v 1.10 2007/10/25 09:30:39 adamdunkels Exp $
  */
 /**
  * \addtogroup esb
@@ -243,7 +243,7 @@ tr1001_off(void)
   rxoff();
   rxclear();
 
-  ENERGEST_OFF(ENERGEST_TYPE_RECEIVE);
+  ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
   return 1;
 }
 /*---------------------------------------------------------------------------*/
@@ -258,7 +258,7 @@ tr1001_on(void)
     return 1;
   }
 
-  ENERGEST_ON(ENERGEST_TYPE_RECEIVE);
+  ENERGEST_ON(ENERGEST_TYPE_LISTEN);
 
   onoroff = ON;
   rxon();
diff --git a/platform/esb/dev/tr1001.c b/platform/esb/dev/tr1001.c
index 8ff3cdb3f..0087a2657 100644
--- a/platform/esb/dev/tr1001.c
+++ b/platform/esb/dev/tr1001.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: tr1001.c,v 1.7 2007/08/07 11:11:20 nifi Exp $
+ * @(#)$Id: tr1001.c,v 1.8 2007/10/25 09:30:39 adamdunkels Exp $
  */
 /**
  * \addtogroup esb
@@ -241,7 +241,7 @@ tr1001_off(void)
   rxoff();
   rxclear();
 
-  ENERGEST_OFF(ENERGEST_TYPE_RECEIVE);
+  ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
   return 1;
 }
 /*---------------------------------------------------------------------------*/
@@ -256,7 +256,7 @@ tr1001_on(void)
     return 1;
   }
 
-  ENERGEST_ON(ENERGEST_TYPE_RECEIVE);
+  ENERGEST_ON(ENERGEST_TYPE_LISTEN);
 
   onoroff = ON;
   rxon();
diff --git a/platform/esb/energest-arch.c b/platform/esb/energest-arch.c
index 1107318fc..b4a512a32 100644
--- a/platform/esb/energest-arch.c
+++ b/platform/esb/energest-arch.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: energest-arch.c,v 1.1 2007/05/15 07:42:22 adamdunkels Exp $
+ * $Id: energest-arch.c,v 1.2 2007/10/25 09:30:39 adamdunkels Exp $
  */
 
 /**
@@ -58,7 +58,7 @@ energest_arch_current_estimate(void)
     energest_type_time(ENERGEST_TYPE_LED_RED)    * DEC2FIX(3,69) +
     energest_type_time(ENERGEST_TYPE_SENSORS)    * DEC2FIX(3,76) +
     energest_type_time(ENERGEST_TYPE_TRANSMIT)   * DEC2FIX(5,1) +
-    energest_type_time(ENERGEST_TYPE_RECEIVE)    * DEC2FIX(4,8);
+    energest_type_time(ENERGEST_TYPE_LISTEN)     * DEC2FIX(4,8);
 }
 /*---------------------------------------------------------------------------*/
 unsigned short
diff --git a/platform/sky/energest-arch.c b/platform/sky/energest-arch.c
index fb5d8179e..b4a512a32 100644
--- a/platform/sky/energest-arch.c
+++ b/platform/sky/energest-arch.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: energest-arch.c,v 1.1 2007/05/15 07:42:43 adamdunkels Exp $
+ * $Id: energest-arch.c,v 1.2 2007/10/25 09:30:39 adamdunkels Exp $
  */
 
 /**
@@ -58,7 +58,7 @@ energest_arch_current_estimate(void)
     energest_type_time(ENERGEST_TYPE_LED_RED)    * DEC2FIX(3,69) +
     energest_type_time(ENERGEST_TYPE_SENSORS)    * DEC2FIX(3,76) +
     energest_type_time(ENERGEST_TYPE_TRANSMIT)   * DEC2FIX(5,1) +
-    energest_type_time(ENERGEST_TYPE_RECEIVE)    * DEC2FIX(4,8);
+    energest_type_time(ENERGEST_TYPE_LISTEN)     * DEC2FIX(4,8);
 }
 /*---------------------------------------------------------------------------*/
 unsigned short