* }
*/
-
#ifndef _TMR_H
#define _TMR_H
#include "isr.h"
#include "bit.h"
-/* Only access when in ISR or if interrupts are disabled */
+/* Used by 'inline' functions, etc. User code should not access _tmr_ticks
+ * directly unless interrupts are off; otherwise use tmr_time().
+ */
extern persistent tmr_time_t _tmr_ticks;
+extern tmr_bitno_t _tmr_on;
+extern tmr_bitno_t _tmr_periodic;
/* Initialize the tmr subsystem */
void tmr_init();
+/* Return non-zero if any timer events are pending */
+#define tmr_events() (_tmr_on)
+
/* Return non-zero if the timer is on */
/* FIXME: this may not be atomic WRT ISR */
#define tmr_on(t) (bit_get(_tmr_on, (t)))
/* 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 */
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 */
#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. */