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

Improvements to style and commentary.

Browse source
This commit is contained in:
nvt-se 2010-05-04 22:55:32 +00:00
parent 01881f92a8
commit 361e210751
3 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/net/rpl/rpl-timers.c
View file

@ -32,7 +32,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: rpl-timers.c,v 1.1 2010/04/30 13:43:53 joxe Exp $
* $Id: rpl-timers.c,v 1.2 2010/05/04 22:55:32 nvt-se Exp $
*/
/**
* \file
@ -66,10 +66,10 @@ handle_periodic_timer(void *ptr)
/* handle DIS */
#ifdef RPL_DIS_SEND
next_dis++;
if(rpl_get_dag(RPL_ANY_INSTANCE) == NULL && next_dis >= RPL_DIS_INTERVAL) {
next_dis = 0;
dis_output(NULL);
}
if(rpl_get_dag(RPL_ANY_INSTANCE) == NULL && next_dis >= RPL_DIS_INTERVAL) {
next_dis = 0;
dis_output(NULL);
}
#endif
ctimer_reset(&periodic_timer);
}
@ -79,14 +79,17 @@ new_dio_interval(rpl_dag_t *dag)
{
unsigned long time;
/* TODO!!! too small timer intervals for many cases */
/* TODO: too small timer intervals for many cases */
time = 1L << dag->dio_intcurrent;
/* need to convert from milliseconds to CLOCK_TICKS */
time = (time * CLOCK_SECOND) / 1000;
dag->dio_next_delay = time;
/* random number between I/2 and I */
time = time >> 1;
time += (time * random_rand()) / RANDOM_MAX;
dag->dio_next_delay -= time;
dag->dio_send = 1;