From 304898cd797eee5327ecf575b3666ac8d26040ad Mon Sep 17 00:00:00 2001
From: thiemovoigt <thiemovoigt>
Date: Mon, 14 Jan 2008 16:18:39 +0000
Subject: [PATCH] added support for devices with power levels (e.g. TX radio)

---
 core/lib/energest.c | 20 +++++++++++++++++++-
 core/lib/energest.h | 20 ++++++++++++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/core/lib/energest.c b/core/lib/energest.c
index 0cd1b2cca..a6d084d5d 100644
--- a/core/lib/energest.c
+++ b/core/lib/energest.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: energest.c,v 1.5 2007/11/12 22:27:21 adamdunkels Exp $
+ * $Id: energest.c,v 1.6 2008/01/14 16:18:39 thiemovoigt Exp $
  */
 
 /**
@@ -46,6 +46,9 @@
 int energest_total_count;
 energest_t energest_total_time[ENERGEST_TYPE_MAX];
 unsigned short energest_current_time[ENERGEST_TYPE_MAX];
+#ifdef ENERGEST_CONF_LEVELDEVICE_LEVELS
+energest_t energest_leveldevice_current_leveltime[ENERGEST_CONF_LEVELDEVICE_LEVELS];
+#endif
 
 /*---------------------------------------------------------------------------*/
 void
@@ -55,6 +58,11 @@ energest_init(void)
   for(i = 0; i < ENERGEST_TYPE_MAX; ++i) {
     energest_total_time[i].current = energest_current_time[i] = 0;
   }
+#ifdef ENERGEST_CONF_LEVELDEVICE_LEVELS 
+  for(i = 0; i < ENERGEST_CONF_LEVELDEVICE_LEVELS; ++i) {
+    energest_leveldevice_current_leveltime[i].current = 0;
+  }
+#endif
 }
 /*---------------------------------------------------------------------------*/
 unsigned long
@@ -63,6 +71,16 @@ energest_type_time(int type)
   return energest_total_time[type].current;
 }
 /*---------------------------------------------------------------------------*/
+unsigned long
+energest_leveldevice_leveltime(int powerlevel)
+{
+#ifdef ENERGEST_CONF_LEVELDEVICE_LEVELS
+  return energest_leveldevice_current_leveltime[powerlevel].current;
+#else
+  return 0;
+#endif
+}
+/*---------------------------------------------------------------------------*/
 void
 energest_type_set(int type, unsigned long val)
 {
diff --git a/core/lib/energest.h b/core/lib/energest.h
index 97d55c4c5..b85e17d51 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.7 2007/11/17 21:24:50 oliverschmidt Exp $
+ * $Id: energest.h,v 1.8 2008/01/14 16:18:39 thiemovoigt Exp $
  */
 
 /**
@@ -67,6 +67,9 @@ enum energest_type {
 
 void energest_init(void);
 unsigned long energest_type_time(int type);
+#ifdef ENERGEST_CONF_LEVELDEVICE_LEVELS
+unsigned long energest_leveldevice_leveltime(int powerlevel);
+#endif
 void energest_type_set(int type, unsigned long value);
 
 #if ENERGEST_CONF_ON
@@ -74,17 +77,30 @@ void energest_type_set(int type, unsigned long value);
 extern energest_t energest_total_time[ENERGEST_TYPE_MAX];
 extern unsigned short energest_current_time[ENERGEST_TYPE_MAX];
 
+#ifdef ENERGEST_CONF_LEVELDEVICE_LEVELS
+extern energest_t energest_leveldevice_current_leveltime[ENERGEST_CONF_LEVELDEVICE_LEVELS];
+#endif
+
 #define ENERGEST_ON(type)  do { \
                            /*++energest_total_count;*/ \
                            energest_current_time[type] = RTIMER_NOW(); \
                            } while(0)
+
 #define ENERGEST_OFF(type) do { \
                            energest_total_time[type].current += (unsigned long)((signed short)RTIMER_NOW() - \
                            (signed short)energest_current_time[type]); \
-                           } while(0)
+                           } while(0) 
+
+#define ENERGEST_OFF_LEVEL(type,level) do { \
+                                        energest_leveldevice_current_leveltime[level].current += (unsigned long)((signed short)RTIMER_NOW() - \
+			                (signed short)energest_current_time[type]); \
+                                        } while(0) 
+
+
 #else /* ENERGEST_CONF_ON */
 #define ENERGEST_ON(type) do { } while(0)
 #define ENERGEST_OFF(type) do { } while(0)
+#define ENERGEST_OFF_LEVEL(type,level) do { } while(0)
 #endif /* ENERGEST_CONF_ON */
 
 unsigned long energest_arch_current_estimate(void);