deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moved energest.{c,h} from core/lib to core/sys: power profiling is a system mechanism, not a library

Browse source
This commit is contained in:
adamdunkels 2008-07-03 23:36:30 +00:00
parent 93ce938d8d
commit 1f005b6299
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/contiki.h
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * 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__ #ifndef __CONTIKI_H__
#define __CONTIKI_H__ #define __CONTIKI_H__
@ -52,6 +52,6 @@
#include "sys/loader.h" #include "sys/loader.h"
#include "sys/clock.h" #include "sys/clock.h"
#include "lib/energest.h" #include "sys/energest.h"
#endif /* __CONTIKI_H__ */ #endif /* __CONTIKI_H__ */

4
core/dev/leds.c
View file

@ -28,12 +28,12 @@
* *
* This file is part of the Contiki operating system. * 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 "dev/leds.h"
#include "sys/clock.h" #include "sys/clock.h"
#include "lib/energest.h" #include "sys/energest.h"
static unsigned char leds, invert; static unsigned char leds, invert;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

4
core/lib/print-stats.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * 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 "lib/print-stats.h"
#include "net/rime.h" #include "net/rime.h"
#include "lib/energest.h" #include "sys/energest.h"
#include <stdio.h> #include <stdio.h>

4
core/lib/energest.c → core/sys/energest.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * 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> * Adam Dunkels <adam@sics.se>
*/ */
#include "lib/energest.h" #include "sys/energest.h"
#include "contiki-conf.h" #include "contiki-conf.h"
#if ENERGEST_CONF_ON #if ENERGEST_CONF_ON

2
core/lib/energest.h → core/sys/energest.h
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * 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 $
*/ */
/** /**