Fixes from picbtnisr work

[rgblamp.git] / tmr.h

diff --git a/tmr.h b/tmr.h
index 716ff65a6d5b68d24f6f937efe5d100811bb74c0..b25e8ad25473b4145f3e971c9d61627e27a5e1a0 100644 (file)
--- a/tmr.h
+++ b/tmr.h
@@ -33,7 +33,6 @@
  * }
  */
 
-
 #ifndef _TMR_H
 #define _TMR_H
 
@@ -41,12 +40,19 @@
 #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)))
@@ -55,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 */
@@ -75,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 */
@@ -93,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. */