X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Firq.c;h=dba432ef890a2d8af77a5257f9d1fc35db35b113;hb=ba26d23f6c7f0561c4c2197285a1116f85d9d5b9;hp=9b87d69b25420b03798c027adad670524a1ff65f;hpb=cfa8814ca45e8bae9b36713bc534ecb581834016;p=bertos.git

diff --git a/bertos/kern/irq.c b/bertos/kern/irq.c
index 9b87d69b..dba432ef 100644
--- a/bertos/kern/irq.c
+++ b/bertos/kern/irq.c
@@ -38,6 +38,7 @@
 
 #include <cfg/module.h>
 #include <kern/proc_p.h>
+#include <kern/proc.h>
 
 #include <cfg/cfg_kern.h>
 
@@ -52,7 +53,9 @@ static void (*irq_handlers[100])(void);
 /* signal handler */
 void irq_entry(int signum)
 {
+#if CONFIG_KERN_PREEMPT
 	Process * const old_process = CurrentProcess;
+#endif
 
 	irq_handlers[signum]();
 
@@ -61,18 +64,20 @@ void irq_entry(int signum)
 
 	if (old_process != CurrentProcess)
 	{
+		IRQ_DISABLE;
+
 		TRACEMSG("switching from %p:%s to %p:%s",
 			old_process, old_process ? old_process->monitor.name : "---",
-			CurrentProcess, CurrentProcess->monitor.name);
+			CurrentProcess, proc_currentName());
 
 		if (old_process)
 			swapcontext(&old_process->context, &CurrentProcess->context);
 		else
 			setcontext(&CurrentProcess->context);
 
-		// not reached
+		IRQ_ENABLE;
 	}
-	//TRACEMSG("keeping %p:%s", CurrentProcess, CurrentProcess->monitor.name);
+	TRACEMSG("resuming %p:%s", CurrentProcess, CurrentProcess->monitor.name);
 #endif // CONFIG_KERN_PREEMPT
 }
 
@@ -84,6 +89,7 @@ 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);