X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer.c;h=9e2a1173011d053f1baebc60c0634cfad837abf7;hb=5198a5e6f13185d818d8724da25f8c38e95fd4f8;hp=0d78d198aaa3a6bb5690bab53f2ad59e49acb80f;hpb=8cfe12e5b95974d75b98ec964fc7edaf37919f0e;p=bertos.git

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index 0d78d198..9e2a1173 100644
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -37,10 +37,12 @@
  */
 
 #include "timer.h"
+#include "hw/hw_timer.h"
 
 #include "cfg/cfg_timer.h"
 #include "cfg/cfg_wdt.h"
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
 #include <cfg/os.h>
 #include <cfg/debug.h>
 #include <cfg/module.h>
@@ -48,22 +50,27 @@
 #include <cpu/attr.h>
 #include <cpu/types.h>
 #include <cpu/irq.h>
+#include <cpu/power.h> // cpu_relax()
 
 /*
  * Include platform-specific binding code if we're hosted.
  * 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)
+	#ifndef WIZ_AUTOGEN
+		#warning Deprecated: now you should include timer_<cpu> directly in the makefile. Remove this line and the following once done.
+		#include CPU_CSOURCE(timer)
+	#endif
 #endif
 
 /*
  * 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
@@ -73,12 +80,10 @@
 	#include <drv/wdt.h>
 #endif
 
-#if CONFIG_KERNEL
-	#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
 
 
@@ -103,7 +108,7 @@
 volatile ticks_t _clock;
 
 
-#ifndef CONFIG_TIMER_DISABLE_EVENTS
+#if CONFIG_TIMER_EVENTS
 
 /**
  * List of active asynchronous timers.
@@ -121,7 +126,7 @@ REGISTER static List timers_queue;
 void timer_add(Timer *timer)
 {
 	Timer *node;
-	cpuflags_t flags;
+	cpu_flags_t flags;
 
 
 	/* Inserting timers twice causes mayhem. */
@@ -172,7 +177,7 @@ Timer *timer_abort(Timer *timer)
 	return timer;
 }
 
-#endif /* CONFIG_TIMER_DISABLE_EVENTS */
+#endif /* CONFIG_TIMER_EVENTS */
 
 
 /**
@@ -181,13 +186,13 @@ Timer *timer_abort(Timer *timer)
 void timer_delayTicks(ticks_t delay)
 {
 	/* We shouldn't sleep with interrupts disabled */
-	ASSERT_IRQ_ENABLED();
+	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);
@@ -198,17 +203,13 @@ void timer_delayTicks(ticks_t delay)
 
 	/* Busy wait */
 	while (timer_clock() - start < delay)
-	{
-#if CONFIG_WATCHDOG
-		wdt_reset();
-#endif
-	}
+		cpu_relax();
 
 #endif /* !CONFIG_KERN_SIGNALS */
 }
 
 
-#ifndef CONFIG_TIMER_DISABLE_UDELAY
+#if CONFIG_TIMER_UDELAY
 
 /**
  * Busy wait until the specified amount of high-precision ticks have elapsed.
@@ -254,7 +255,7 @@ void timer_delayHp(hptime_t delay)
 
 	timer_busyWait(delay);
 }
-#endif /* CONFIG_TIMER_DISABLE_UDELAY */
+#endif /* CONFIG_TIMER_UDELAY */
 
 
 /**
@@ -272,9 +273,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.
@@ -290,7 +292,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
@@ -311,7 +313,7 @@ DEFINE_TIMER_ISR
 		/* Execute the associated event */
 		event_do(&timer->expire);
 	}
-#endif /* CONFIG_TIMER_DISABLE_EVENTS */
+#endif /* CONFIG_TIMER_EVENTS */
 
 	TIMER_STROBE_OFF;
 }
@@ -323,11 +325,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;