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

8
examples/energest-demo/energest-demo.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: energest-demo.c,v 1.7 2008/07/02 09:05:41 adamdunkels Exp $
* $Id: energest-demo.c,v 1.8 2009/03/12 21:58:21 adamdunkels Exp $
*/
/**
@ -100,7 +100,7 @@ static int send_amount = 10;
static void
abc_recv(struct abc_conn *c)
{
struct energy_time *incoming= (struct energy_time *)rimebuf_dataptr();
struct energy_time *incoming= (struct energy_time *)packetbuf_dataptr();
read++;
if(node_id == SINK_ID) {
printf("%i SICS %i %u %li %li %li %li\n", node_id, read,
@ -129,7 +129,7 @@ do_sending(void)
cc2420_set_txpower(1);
for(i = 0;i < send_amount; i++) {
rimebuf_copyfrom(send_string, send_length);
packetbuf_copyfrom(send_string, send_length);
mac->on();
abc_send(&abc);
@ -196,7 +196,7 @@ PROCESS_THREAD(output_process, ev, data)
/* printf("%i SICS %i %i %li %li %li %li\n", node_id, send, */
/* diff.source, diff.cpu, diff.lpm, diff.transmit, diff.listen); */
rimebuf_copyfrom((char*)&diff, sizeof(diff));
packetbuf_copyfrom((char*)&diff, sizeof(diff));
mac->on();
abc_send(&abc);