X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fsignal.c;h=841ac6eb9d37c0a00135aecfb2efa39b2e2fe125;hb=0c154bc0927a32f77467f32aac3cc3507baa97ca;hp=9b61120a8e46aa1e243254da302641e0ccffa90b;hpb=23c24a8842abea3355937e9f67c17f4f1f1405a7;p=bertos.git

diff --git a/kern/signal.c b/kern/signal.c
index 9b61120a..841ac6eb 100755
--- a/kern/signal.c
+++ b/kern/signal.c
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999, 2000, 2001 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief IPC signals implementation.
@@ -66,6 +66,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.13  2006/02/24 01:17:05  bernie
+ *#* Update for new emulator.
+ *#*
+ *#* Revision 1.12  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.11  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.10  2004/12/13 12:07:06  bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
  *#* Revision 1.9  2004/12/08 08:57:35  bernie
  *#* Rename sigset_t to sigmask_t.
  *#*
@@ -98,12 +110,11 @@
  *#*/
 
 #include "signal.h"
-#include "proc.h"
-#include "proc_p.h"
-#include "hw.h"
-#include <debug.h>
 
-// FIXME
+#include <kern/proc.h>
+#include <kern/proc_p.h>
+#include <cfg/debug.h>
+
 #if CONFIG_KERN_SIGNALS
 
 /*!
@@ -115,10 +126,11 @@ sigmask_t sig_check(sigmask_t sigs)
 	sigmask_t result;
 	cpuflags_t flags;
 
-	DISABLE_IRQSAVE(flags);
+	IRQ_SAVE_DISABLE(flags);
 	result = CurrentProcess->sig_recv & sigs;
 	CurrentProcess->sig_recv &= ~sigs;
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
+
 	return result;
 }
 
@@ -132,7 +144,7 @@ sigmask_t sig_wait(sigmask_t sigs)
 	sigmask_t result;
 	cpuflags_t flags;
 
-	DISABLE_IRQSAVE(flags);
+	IRQ_SAVE_DISABLE(flags);
 
 	/* Loop until we get at least one of the signals */
 	while (!(result = CurrentProcess->sig_recv & sigs))
@@ -148,7 +160,8 @@ sigmask_t sig_wait(sigmask_t sigs)
 
 	/* Signals found: clear them and return */
 	CurrentProcess->sig_recv &= ~sigs;
-	ENABLE_IRQRESTORE(flags);
+
+	IRQ_RESTORE(flags);
 	return result;
 }
 
@@ -162,7 +175,7 @@ sigmask_t sig_wait(sigmask_t sigs)
 void sig_signal(Process *proc, sigmask_t sigs)
 {
 	cpuflags_t flags;
-	DISABLE_IRQSAVE(flags);
+	IRQ_SAVE_DISABLE(flags);
 
 	/* Set the signals */
 	proc->sig_recv |= sigs;
@@ -175,7 +188,7 @@ void sig_signal(Process *proc, sigmask_t sigs)
 		SCHED_ENQUEUE(proc);
 	}
 
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
 }
 
 #endif /* CONFIG_KERN_SIGNALS */