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

changed timer comparison to avoid crashing mspgcc4

Browse source
This commit is contained in:
joxe 2010-06-21 09:41:49 +00:00
parent ab7f3bd8e3
commit 546504516b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/sys/timer.c
View file

@ -42,7 +42,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: timer.c,v 1.6 2010/02/23 18:40:08 adamdunkels Exp $ * $Id: timer.c,v 1.7 2010/06/21 09:41:49 joxe Exp $
*/ */
#include "contiki-conf.h" #include "contiki-conf.h"
@ -122,9 +122,10 @@ int
timer_expired(struct timer *t) timer_expired(struct timer *t)
{ {
clock_time_t diff = clock_time() - t->start; clock_time_t diff = clock_time() - t->start;
/* This somewhat ugly way of returning (diff >= t->interval) is /* Can not return diff >= t->interval so we need to return
required to avoid an internal error in mspgcc. */ t->interval < diff - required to avoid an internal error in mspgcc. */
return diff > t->interval || diff == t->interval; return t->interval < diff;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**