Merge branch "preempt" in "trunk".

[bertos.git] / bertos / kern / irq.c

diff --git a/bertos/kern/irq.c b/bertos/kern/irq.c
index 23d19afac0ea76fb14abac4e87170822eb714807..85608147e1277af38adbdedb1fd8af89e94575c4 100644 (file)
--- a/bertos/kern/irq.c
+++ b/bertos/kern/irq.c
@@ -31,19 +31,23 @@
  *
  * \brief Process scheduler (public interface).
  *
- * \version $Id: proc.h 1646 2008-08-17 13:49:48Z bernie $
+ * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
+ *
+ * Still in development, disable nightly test for now
+ * notest: avr
+ * notest: arm
  */
 #include "irq.h"
 
 #include <cfg/module.h>
 #include <kern/proc_p.h>
+#include <kern/proc.h>
 
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_proc.h"
 
 #include <unistd.h> // FIXME: move POSIX stuff to irq_posix.h
 
-
 MOD_DEFINE(irq)
 
 // FIXME
@@ -52,35 +56,7 @@ static void (*irq_handlers[100])(void);
 /* signal handler */
 void irq_entry(int signum)
 {
-       Process * const old_process = CurrentProcess;
-
        irq_handlers[signum]();
-
-#if CONFIG_KERN_PREEMPT
-       if (!CurrentProcess)
-       {
-               TRACEMSG("no runnable processes!");
-               IRQ_ENABLE;
-               pause();
-       }
-       else
-       {
-               if (old_process != CurrentProcess)
-               {
-                       TRACEMSG("switching from %p:%s to %p:%s",
-                               old_process, old_process ? old_process->monitor.name : "-",
-                               CurrentProcess, CurrentProcess->monitor.name);
-
-                       if (old_process)
-                               swapcontext(&old_process->context, &CurrentProcess->context);
-                       else
-                               setcontext(&CurrentProcess->context);
-
-                       // not reached
-               }
-               TRACEMSG("keeping %p:%s", CurrentProcess, CurrentProcess->monitor.name);
-       }
-#endif // CONFIG_KERN_PREEMPT
 }
 
 void irq_register(int irq, void (*callback)(void))
@@ -91,15 +67,14 @@ void irq_register(int irq, void (*callback)(void))
 void irq_init(void)
 {
        struct sigaction act;
+
        act.sa_handler = irq_entry;
        sigemptyset(&act.sa_mask);
        //sigaddset(&act.sa_mask, irq);
        act.sa_flags = SA_RESTART; // | SA_SIGINFO;
 
        sigaction(SIGUSR1, &act, NULL);
-       #if !(ARCH & ARCH_QT)
-               sigaction(SIGALRM, &act, NULL);
-       #endif
+       sigaction(SIGALRM, &act, NULL);
 
        MOD_INIT(irq);
 }