From 9d75781a78d2b902d3f09e4f2b25c1973ed6daf5 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Tue, 10 Feb 2009 23:51:12 +0000
Subject: [PATCH] Added packet attributes for energy spent on a packet
 (RIMEBUF_ATTR_LISTEN_ENERGY and RIMEBUF_ATTR_TRANSMIT_ENERGY)

---
 core/net/rime/rimebuf.c |  6 +++++-
 core/net/rime/rimebuf.h | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/net/rime/rimebuf.c b/core/net/rime/rimebuf.c
index 2678d2aac..f01a980c3 100644
--- a/core/net/rime/rimebuf.c
+++ b/core/net/rime/rimebuf.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rimebuf.c,v 1.16 2008/06/30 19:57:10 adamdunkels Exp $
+ * $Id: rimebuf.c,v 1.17 2009/02/10 23:51:12 adamdunkels Exp $
  */
 
 /**
@@ -68,6 +68,10 @@ const char *rimebuf_attr_strings[] =
     "RIMEBUF_ATTR_LINK_QUALITY",
     "RIMEBUF_ATTR_RSSI",
     "RIMEBUF_ATTR_TIMESTAMP",
+
+    "RIMEBUF_ATTR_LISTEN_ENERGY",
+    "RIMEBUF_ATTR_TRANSMIT_ENERGY",
+    
     "RIMEBUF_ATTR_NETWORK_ID",
 
     "RIMEBUF_ATTR_RELIABLE",
diff --git a/core/net/rime/rimebuf.h b/core/net/rime/rimebuf.h
index 1634e7782..5d37bc4ec 100644
--- a/core/net/rime/rimebuf.h
+++ b/core/net/rime/rimebuf.h
@@ -40,7 +40,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rimebuf.h,v 1.16 2009/01/15 22:15:51 adamdunkels Exp $
+ * $Id: rimebuf.h,v 1.17 2009/02/10 23:51:12 adamdunkels Exp $
  */
 
 /**
@@ -331,8 +331,12 @@ enum {
   RIMEBUF_ATTR_LINK_QUALITY,
   RIMEBUF_ATTR_RSSI,
   RIMEBUF_ATTR_TIMESTAMP,
-  RIMEBUF_ATTR_NETWORK_ID,
 
+  RIMEBUF_ATTR_LISTEN_ENERGY,
+  RIMEBUF_ATTR_TRANSMIT_ENERGY,
+  
+  RIMEBUF_ATTR_NETWORK_ID,
+  
   RIMEBUF_ATTR_RELIABLE,
   RIMEBUF_ATTR_ERELIABLE,
 
@@ -340,7 +344,7 @@ enum {
   RIMEBUF_ADDR_RECEIVER,
   RIMEBUF_ADDR_ESENDER,
   RIMEBUF_ADDR_ERECEIVER,
-
+  
   RIMEBUF_ATTR_MAX
 };