X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer.c;h=285d67c55e1242bfd772e0f2602c1637424a68e2;hb=0eeba5822b3ff0e76ae0fd0272536d371d272d7d;hp=fbe7c695c9ee3455cd6cdde428c4ca860b6426a8;hpb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;p=bertos.git

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index fbe7c695..285d67c5 100644
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -27,8 +27,7 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
- *
+ * Copyright 2000, 2008 Bernie Innocenti <bernie@codewiz.org>
  * -->
  *
  * \brief Hardware independent timer driver (implementation)
@@ -55,7 +54,8 @@
  * Try the CPU specific one for bare-metal environments.
  */
 #if OS_HOSTED
-	#include OS_CSOURCE(timer)
+	//#include OS_CSOURCE(timer)
+	#include <emul/timer_posix.c>
 #else
 	#include CPU_CSOURCE(timer)
 #endif
@@ -63,8 +63,8 @@
 /*
  * Sanity check for config parameters required by this module.
  */
-#if !defined(CONFIG_KERNEL) || ((CONFIG_KERNEL != 0) && CONFIG_KERNEL != 1)
-	#error CONFIG_KERNEL must be set to either 0 or 1 in config.h
+#if !defined(CONFIG_KERN) || ((CONFIG_KERN != 0) && CONFIG_KERN != 1)
+	#error CONFIG_KERN must be set to either 0 or 1 in config.h
 #endif
 #if !defined(CONFIG_WATCHDOG) || ((CONFIG_WATCHDOG != 0) && CONFIG_WATCHDOG != 1)
 	#error CONFIG_WATCHDOG must be set to either 0 or 1 in config.h
@@ -74,15 +74,10 @@
 	#include <drv/wdt.h>
 #endif
 
-#if CONFIG_KERNEL
-	#if CONFIG_KERN_PREEMPTIVE
-		#include <hw/switch.h>
-	#endif
-	#if CONFIG_KERN_SIGNALS
-		#include <kern/signal.h> /* sig_wait(), sig_check() */
-		#include <kern/proc.h>   /* proc_current() */
-		#include <cfg/macros.h>  /* BV() */
-	#endif
+#if defined (CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
+	#include <kern/signal.h> /* sig_wait(), sig_check() */
+	#include <kern/proc.h>   /* proc_current() */
+	#include <cfg/macros.h>  /* BV() */
 #endif
 
 
@@ -107,7 +102,7 @@
 volatile ticks_t _clock;
 
 
-#ifndef CONFIG_TIMER_DISABLE_EVENTS
+#if CONFIG_TIMER_EVENTS
 
 /**
  * List of active asynchronous timers.
@@ -163,7 +158,10 @@ void timer_add(Timer *timer)
 
 
 /**
- * Remove a timer from the timer queue before it has expired.
+ * Remove a timer from the timers queue before it has expired.
+ *
+ * \note Attempting to remove a timer already expired cause
+ *       undefined behaviour.
  */
 Timer *timer_abort(Timer *timer)
 {
@@ -173,7 +171,7 @@ Timer *timer_abort(Timer *timer)
 	return timer;
 }
 
-#endif /* CONFIG_TIMER_DISABLE_EVENTS */
+#endif /* CONFIG_TIMER_EVENTS */
 
 
 /**
@@ -181,17 +179,14 @@ Timer *timer_abort(Timer *timer)
  */
 void timer_delayTicks(ticks_t delay)
 {
-#if defined(IRQ_ENABLED) && (!(ARCH & ARCH_EMUL))
 	/* We shouldn't sleep with interrupts disabled */
-	ASSERT(IRQ_ENABLED());
-#endif
-
+	IRQ_ASSERT_ENABLED();
 
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 	Timer t;
 
 	ASSERT(!sig_check(SIG_SINGLE));
-	timer_set_event_signal(&t, proc_current(), SIG_SINGLE);
+	timer_setSignal(&t, proc_current(), SIG_SINGLE);
 	timer_setDelay(&t, delay);
 	timer_add(&t);
 	sig_wait(SIG_SINGLE);
@@ -212,7 +207,7 @@ void timer_delayTicks(ticks_t delay)
 }
 
 
-#ifndef CONFIG_TIMER_DISABLE_UDELAY
+#if CONFIG_TIMER_UDELAY
 
 /**
  * Busy wait until the specified amount of high-precision ticks have elapsed.
@@ -258,7 +253,7 @@ void timer_delayHp(hptime_t delay)
 
 	timer_busyWait(delay);
 }
-#endif /* CONFIG_TIMER_DISABLE_UDELAY */
+#endif /* CONFIG_TIMER_UDELAY */
 
 
 /**
@@ -276,9 +271,10 @@ DEFINE_TIMER_ISR
 	#pragma interrupt saveall
 	#endif
 
-#ifndef CONFIG_TIMER_DISABLE_EVENTS
+#if CONFIG_TIMER_EVENTS
 	Timer *timer;
 #endif
+
 	/*
 	 * On systems sharing IRQ line and vector, this check is needed
 	 * to ensure that IRQ is generated by timer source.
@@ -294,7 +290,7 @@ DEFINE_TIMER_ISR
 	/* Update the master ms counter */
 	++_clock;
 
-#ifndef CONFIG_TIMER_DISABLE_EVENTS
+#if CONFIG_TIMER_EVENTS
 	/*
 	 * Check the first timer request in the list and process
 	 * it when it has expired. Repeat this check until the
@@ -315,7 +311,7 @@ DEFINE_TIMER_ISR
 		/* Execute the associated event */
 		event_do(&timer->expire);
 	}
-#endif /* CONFIG_TIMER_DISABLE_EVENTS */
+#endif /* CONFIG_TIMER_EVENTS */
 
 	TIMER_STROBE_OFF;
 }
@@ -327,11 +323,15 @@ MOD_DEFINE(timer)
  */
 void timer_init(void)
 {
-	TIMER_STROBE_INIT;
+	#if CONFIG_KERN_IRQ
+		MOD_CHECK(irq);
+	#endif
 
-#ifndef CONFIG_TIMER_DISABLE_EVENTS
-	LIST_INIT(&timers_queue);
-#endif
+	#if CONFIG_TIMER_EVENTS
+		LIST_INIT(&timers_queue);
+	#endif
+
+	TIMER_STROBE_INIT;
 
 	_clock = 0;
 
@@ -339,3 +339,19 @@ void timer_init(void)
 
 	MOD_INIT(timer);
 }
+
+
+#if (ARCH & ARCH_EMUL)
+/**
+ * Stop timer (only used by emulator)
+ */
+void timer_cleanup(void)
+{
+	MOD_CLEANUP(timer);
+
+	timer_hw_cleanup();
+
+	// Hmmm... apparently, the demo app does not cleanup properly
+	//ASSERT(LIST_EMPTY(&timers_queue));
+}
+#endif /* ARCH_EMUL */