From 1f005b62990da2aac00aec7242a319fe8508ca93 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Thu, 3 Jul 2008 23:36:30 +0000
Subject: [PATCH] Moved energest.{c,h} from core/lib to core/sys: power
 profiling is a system mechanism, not a library

---
 core/contiki.h               | 4 ++--
 core/dev/leds.c              | 4 ++--
 core/lib/print-stats.c       | 4 ++--
 core/{lib => sys}/energest.c | 4 ++--
 core/{lib => sys}/energest.h | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename core/{lib => sys}/energest.c (98%)
 rename core/{lib => sys}/energest.h (98%)

diff --git a/core/contiki.h b/core/contiki.h
index 03a4453fe..cf3128095 100644
--- a/core/contiki.h
+++ b/core/contiki.h
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki.h,v 1.4 2007/05/26 23:23:56 oliverschmidt Exp $
+ * $Id: contiki.h,v 1.5 2008/07/03 23:36:30 adamdunkels Exp $
  */
 #ifndef __CONTIKI_H__
 #define __CONTIKI_H__
@@ -52,6 +52,6 @@
 #include "sys/loader.h"
 #include "sys/clock.h"
 
-#include "lib/energest.h"
+#include "sys/energest.h"
 
 #endif /* __CONTIKI_H__ */
diff --git a/core/dev/leds.c b/core/dev/leds.c
index 6394826f1..a44878e50 100644
--- a/core/dev/leds.c
+++ b/core/dev/leds.c
@@ -28,12 +28,12 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: leds.c,v 1.4 2007/03/19 00:33:25 adamdunkels Exp $
+ * @(#)$Id: leds.c,v 1.5 2008/07/03 23:36:30 adamdunkels Exp $
  */
 
 #include "dev/leds.h"
 #include "sys/clock.h"
-#include "lib/energest.h"
+#include "sys/energest.h"
 
 static unsigned char leds, invert;
 /*---------------------------------------------------------------------------*/
diff --git a/core/lib/print-stats.c b/core/lib/print-stats.c
index f9681f9c0..cdb299db2 100644
--- a/core/lib/print-stats.c
+++ b/core/lib/print-stats.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: print-stats.c,v 1.3 2007/11/17 10:46:25 adamdunkels Exp $
+ * $Id: print-stats.c,v 1.4 2008/07/03 23:36:30 adamdunkels Exp $
  */
 
 /**
@@ -41,7 +41,7 @@
 #include "lib/print-stats.h"
 
 #include "net/rime.h"
-#include "lib/energest.h"
+#include "sys/energest.h"
 
 #include <stdio.h>
 
diff --git a/core/lib/energest.c b/core/sys/energest.c
similarity index 98%
rename from core/lib/energest.c
rename to core/sys/energest.c
index 394cd7a4c..60c52d0d4 100644
--- a/core/lib/energest.c
+++ b/core/sys/energest.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: energest.c,v 1.7 2008/06/02 13:12:07 nifi Exp $
+ * $Id: energest.c,v 1.1 2008/07/03 23:36:30 adamdunkels Exp $
  */
 
 /**
@@ -38,7 +38,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "lib/energest.h"
+#include "sys/energest.h"
 #include "contiki-conf.h"
 
 #if ENERGEST_CONF_ON
diff --git a/core/lib/energest.h b/core/sys/energest.h
similarity index 98%
rename from core/lib/energest.h
rename to core/sys/energest.h
index 54189a370..5327c1212 100644
--- a/core/lib/energest.h
+++ b/core/sys/energest.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: energest.h,v 1.10 2008/06/02 13:12:07 nifi Exp $
+ * $Id: energest.h,v 1.1 2008/07/03 23:36:30 adamdunkels Exp $
  */
 
 /**