X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.c;h=e0208b8843675763eee70025a7cdbf850451c568;hb=d026292ceba279d56f2540a02cff974e7ca9e5ae;hp=60261e1f80328f928623947cdebfb53ed3502c45;hpb=00e009957d70dab15575ab310ed83f0b78cc8656;p=bertos.git

diff --git a/drv/timer.c b/drv/timer.c
index 60261e1f..e0208b88 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.23  2004/12/13 12:07:06  bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
+ *#* Revision 1.22  2004/12/08 09:12:09  bernie
+ *#* Rename time_t to mtime_t.
+ *#*
  *#* Revision 1.21  2004/11/28 23:20:25  bernie
  *#* Remove obsolete INITLIST macro.
  *#*
@@ -120,7 +126,7 @@
 
 
 //! Master system clock (1ms accuracy)
-volatile time_t _clock;
+volatile mtime_t _clock;
 
 
 #ifndef CONFIG_TIMER_DISABLE_EVENTS
@@ -143,7 +149,7 @@ void timer_add(Timer *timer)
 	Timer *node;
 	cpuflags_t flags;
 
-	DISABLE_IRQSAVE(flags);
+	IRQ_SAVE_DISABLE(flags);
 
 	/* Calculate expiration time for this timer */
 	timer->tick = _clock + timer->delay;
@@ -169,19 +175,16 @@ void timer_add(Timer *timer)
 	/* Enqueue timer request into the list */
 	INSERTBEFORE(&timer->link, &node->link);
 
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
 }
 
 
 /*!
- * Remove a timer from the timer queue before it has expired
+ * Remove a timer from the timer queue before it has expired.
  */
 Timer *timer_abort(Timer *timer)
 {
-	cpuflags_t flags;
-	DISABLE_IRQSAVE(flags);
-	REMOVE(&timer->link);
-	ENABLE_IRQRESTORE(flags);
+	ATOMIC(REMOVE(&timer->link));
 
 	return timer;
 }
@@ -190,9 +193,9 @@ Timer *timer_abort(Timer *timer)
 
 
 /*!
- * Wait for the specified amount of time (expressed in ms)
+ * Wait for the specified amount of time (expressed in ms).
  */
-void timer_delay(time_t time)
+void timer_delay(mtime_t time)
 {
 #if defined(IRQ_GETSTATE)
 	/* We shouldn't sleep with interrupts disabled */
@@ -210,7 +213,7 @@ void timer_delay(time_t time)
 
 #else /* !CONFIG_KERN_SIGNALS */
 
-	time_t start = timer_ticks();
+	mtime_t start = timer_ticks();
 
 	/* Busy wait */
 	while (timer_ticks() - start < time)
@@ -226,7 +229,7 @@ void timer_delay(time_t time)
 
 #ifndef CONFIG_TIMER_DISABLE_UDELAY
 /*!
- * Wait for the specified amount of time (expressed in microseconds)
+ * Wait for the specified amount of time (expressed in microseconds).
  *
  * \bug In AVR arch the maximum amount of time that can be used as
  *      delay could be very limited, depending on the hardware timer