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

Renamed the rimebuf module to packetbuf to signal that the module is used outside of a pure Rime context (e.g., the sicslowpan code uses it).

Browse source
This commit is contained in:
adamdunkels 2009-03-12 21:58:20 +00:00
parent 932fc9f748
commit 65eb5fd4e8
90 changed files with 690 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/sys/compower.c
View file

@ -33,7 +33,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: compower.c,v 1.2 2009/03/02 22:00:41 adamdunkels Exp $
* $Id: compower.c,v 1.3 2009/03/12 21:58:21 adamdunkels Exp $
*/
/**
@ -46,7 +46,7 @@
#include "contiki-conf.h"
#include "sys/energest.h"
#include "sys/compower.h"
#include "net/rime/rimebuf.h"
#include "net/rime/packetbuf.h"
struct compower_activity compower_idle_activity;
@ -81,15 +81,15 @@ compower_clear(struct compower_activity *e)
void
compower_attrconv(struct compower_activity *e)
{
rimebuf_set_attr(RIMEBUF_ATTR_LISTEN_TIME, e->listen);
rimebuf_set_attr(RIMEBUF_ATTR_TRANSMIT_TIME, e->transmit);
packetbuf_set_attr(PACKETBUF_ATTR_LISTEN_TIME, e->listen);
packetbuf_set_attr(PACKETBUF_ATTR_TRANSMIT_TIME, e->transmit);
}
/*---------------------------------------------------------------------------*/
void
compower_accumulate_attrs(struct compower_activity *e)
{
e->listen += rimebuf_attr(RIMEBUF_ATTR_LISTEN_TIME);
e->transmit += rimebuf_attr(RIMEBUF_ATTR_TRANSMIT_TIME);
e->listen += packetbuf_attr(PACKETBUF_ATTR_LISTEN_TIME);
e->transmit += packetbuf_attr(PACKETBUF_ATTR_TRANSMIT_TIME);
}
/*---------------------------------------------------------------------------*/
/** @} */