giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

I seem to remember that we wanted to avoid ignoring gcc warnings that might trigger errors with other compilers ;-)

This commit is contained in:
oliverschmidt 2008-05-16 21:31:57 +00:00
parent 532692e5a0
commit a5fcfa2787
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/net/mac/lpp.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: lpp.c,v 1.3 2008/05/16 15:04:10 adamdunkels Exp $ * $Id: lpp.c,v 1.4 2008/05/16 21:31:57 oliverschmidt Exp $
*/ */
/** /**
@ -51,6 +51,7 @@
*/ */
#include "dev/leds.h" #include "dev/leds.h"
#include "lib/random.h"
#include "net/rime.h" #include "net/rime.h"
#include "net/mac/mac.h" #include "net/mac/mac.h"
@ -136,7 +137,7 @@ dutycycle(void *ptr)
/* We are currently sending a packet so we should keep the radio /* We are currently sending a packet so we should keep the radio
turned on and not send any probes at this point. */ turned on and not send any probes at this point. */
ctimer_set(t, OFF_TIME * 2, dutycycle, t); ctimer_set(t, OFF_TIME * 2, (void (*)(void *))dutycycle, t);
PT_YIELD(&pt); PT_YIELD(&pt);
queuebuf_free(queued_packet); queuebuf_free(queued_packet);
queued_packet = NULL; queued_packet = NULL;
@ -144,14 +145,15 @@ dutycycle(void *ptr)
} }
turn_radio_on(); turn_radio_on();
send_probe(); send_probe();
ctimer_set(t, LISTEN_TIME, dutycycle, t); ctimer_set(t, LISTEN_TIME, (void (*)(void *))dutycycle, t);
PT_YIELD(&pt); PT_YIELD(&pt);
turn_radio_off(); turn_radio_off();
/* There is a bit of randomness here right now to avoid collisions /* There is a bit of randomness here right now to avoid collisions
due to synchronization effects. Not sure how needed it is due to synchronization effects. Not sure how needed it is
though. XXX */ though. XXX */
ctimer_set(t, OFF_TIME / 2 + (random_rand() % OFF_TIME / 2), dutycycle, t); ctimer_set(t, OFF_TIME / 2 + (random_rand() % OFF_TIME / 2),
(void (*)(void *))dutycycle, t);
PT_YIELD(&pt); PT_YIELD(&pt);
} }
@ -309,7 +311,7 @@ lpp_init(const struct radio_driver *d)
{ {
radio = d; radio = d;
radio->set_receive_function(input_packet); radio->set_receive_function(input_packet);
ctimer_set(&timer, LISTEN_TIME, dutycycle, &timer); ctimer_set(&timer, LISTEN_TIME, (void (*)(void *))dutycycle, &timer);
return &lpp_driver; return &lpp_driver;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/