X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=tmr.h;h=b25e8ad25473b4145f3e971c9d61627e27a5e1a0;hb=be367d7f046a080f1575ac4e918a94dfad24fa73;hp=d748e949ee72f1a5318e816c11285903f47e9efc;hpb=8584c7dd3bf9ad3362f285f065d66c8524340ef4;p=rgblamp.git diff --git a/tmr.h b/tmr.h index d748e94..b25e8ad 100644 --- a/tmr.h +++ b/tmr.h @@ -61,7 +61,7 @@ void tmr_init(); /* FIXME: this may not be atomic WRT ISR */ #define tmr_periodic(t) (bit_get(_tmr_periodic, (t))) -/* Start a timer, expecting it to fire in elapsed ticks */ +/* Start a timer, expecting it to fire in elapsed ticks, user code */ void tmr_start(tmr_bitno_t t, tmr_time_t elapsed); /* Start a timer, expecting it to fire in elapsed ticks from t0 */ @@ -81,7 +81,7 @@ void tmr_startPeriodicAt(tmr_bitno_t t, tmr_time_t t0, tmr_time_t elapsed); nei(); \ } while(0) -/* Return 1 if the timer has fired, resetting the fired bit */ +/* Return 1 if the timer has fired, resetting the fired bit, user code */ bit tmr_fired(tmr_bitno_t t); /* Return the current number of timer ticks, for use outside ISR */ @@ -99,7 +99,7 @@ void tmr_isr(); #define tmr_cwait(c) \ do { \ unsigned t0 = TMR0; \ - while ((unsigned)(TMR0 - t0) <= c); /* cast prevents integral promotion */ \ + while (TMR0 - t0 <= c); /* cast prevents integral promotion */ \ } while (0) /* Wait for a number of us. This is pretty accurate. */