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

style fix; added fas check for cycle_time being a power of two or not.

Browse source
This commit is contained in:
Adam Dunkels 2011-12-05 16:28:04 +01:00
parent 50342fa801
commit 0a428c9489
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/net/mac/phase.c
View file

@ -204,22 +204,24 @@ phase_wait(struct phase_list *list,
sync = (e == NULL) ? now : e->time;
#if PHASE_DRIFT_CORRECT
{ int32_t s;
if (e->drift > cycle_time) {
s = e->drift%cycle_time/(e->drift/cycle_time); //drift per cycle
s = s*(now-sync)/cycle_time; //estimated drift to now
sync += s; //add it in
}
}
{
int32_t s;
if(e->drift > cycle_time) {
s = e->drift % cycle_time / (e->drift / cycle_time); /* drift per cycle */
s = s * (now - sync) / cycle_time; /* estimated drift to now */
sync += s; /* add it in */
}
}
#endif
#if 1
/* Faster if cycle_time is a power of two */
wait = (rtimer_clock_t)((sync - now) & (cycle_time - 1));
#else
/* Works generally */
wait = cycle_time - (rtimer_clock_t)((now - sync) % cycle_time);
#endif
/* Check if cycle_time is a power of two */
if(!(cycle_time & (cycle_time - 1))) {
/* Faster if cycle_time is a power of two */
wait = (rtimer_clock_t)((sync - now) & (cycle_time - 1));
} else {
/* Works generally */
wait = cycle_time - (rtimer_clock_t)((now - sync) % cycle_time);
}
if(wait < guard_time) {
wait += cycle_time;