Add proc_pri function to extract a Process priority.

[bertos.git] / bertos / emul / timer_posix.c

diff --git a/bertos/emul/timer_posix.c b/bertos/emul/timer_posix.c
index c372bae1c8b6db7b51a70dfeac34e40cb9bc2bfc..309d5c502c19e7b9343ba6dbadd7ed7994a70605 100644 (file)
--- a/bertos/emul/timer_posix.c
+++ b/bertos/emul/timer_posix.c
@@ -29,17 +29,19 @@
  * Copyright 2005, 2008 Develer S.r.l. (http://www.develer.com/)
  * -->
  *
- * \version $Id$
+ * \brief Low-level timer module for Qt emulator (implementation).
  *
  * \author Bernie Innocenti <bernie@codewiz.org>
- * \brief Low-level timer module for Qt emulator (implementation).
  */
-#include <cfg/compiler.h> // hptime.t
+//#include <cfg/compiler.h> // hptime.t
 #include <os/hptime.h>
+#include <kern/irq.h>     // irq_register()
 
+#if !CONFIG_KERN_IRQ
 #include <signal.h>       // sigaction()
-#include <sys/time.h>     // setitimer()
 #include <string.h>       // memset()
+#endif
+#include <sys/time.h>     // setitimer()
 
 
 // Forward declaration for the user interrupt server routine.
@@ -48,15 +50,19 @@ void timer_isr(int);
 /// HW dependent timer initialization.
 static void timer_hw_init(void)
 {
-       struct sigaction sa;
-       memset(&sa, 0, sizeof(sa));
+       #if CONFIG_KERN_IRQ
+               irq_register(SIGALRM, (void (*)(void))timer_isr);
+       #else // ! CONFIG_KERN_IRQ
+               struct sigaction sa;
+               memset(&sa, 0, sizeof(sa));
 
-       // Setup interrupt callback
-       sa.sa_handler = timer_isr;
-       sigemptyset(&sa.sa_mask);
-       sigaddset(&sa.sa_mask, SIGALRM);
-       sa.sa_flags = SA_RESTART;
-       sigaction(SIGALRM, &sa, NULL);
+               // Setup interrupt callback
+               sa.sa_handler = timer_isr;
+               sigemptyset(&sa.sa_mask);
+               sigaddset(&sa.sa_mask, SIGALRM);
+               sa.sa_flags = SA_RESTART;
+               sigaction(SIGALRM, &sa, NULL);
+       #endif // CONFIG_KERN_IRQ
 
        // Setup POSIX realtime timer to interrupt every 1/TIMER_TICKS_PER_SEC.
        static const struct itimerval itv =
@@ -75,6 +81,7 @@ static void timer_hw_cleanup(void)
                { 0, 0 }  /* it_value */
        };
        setitimer(ITIMER_REAL, &itv, NULL);
+       signal(SIGALRM, SIG_DFL);
 }
 
 INLINE hptime_t timer_hw_hpread(void)