X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fsignal.c;h=e4e0522a1bd3c36a019b00dd94a91d9fabdc9eb4;hb=2646e1680b741e6e8bef3e76c02efe4687fe1793;hp=0243987be76ac237b4b0c9ce8704b294f9584498;hpb=294f744f2676575fa3704a2fc321eac0b894e1da;p=bertos.git

diff --git a/kern/signal.c b/kern/signal.c
index 0243987b..e4e0522a 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.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.
+ *#*
  *#* Revision 1.8  2004/09/14 21:06:44  bernie
  *#* Use debug.h instead of kdebug.h.
  *#*
@@ -98,24 +110,24 @@
 #include "proc.h"
 #include "proc_p.h"
 #include "hw.h"
-#include <debug.h>
+#include <cfg/debug.h>
 
-// FIXME
 #if CONFIG_KERN_SIGNALS
 
 /*!
  * Check if any of the signals in \a sigs has occurred and clear them.
  * Return the signals that have occurred.
  */
-sigset_t sig_check(sigset_t sigs)
+sigmask_t sig_check(sigmask_t sigs)
 {
-	sigset_t result;
+	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;
 }
 
@@ -124,12 +136,12 @@ sigset_t sig_check(sigset_t sigs)
  * Sleep until any of the signals in \a sigs occurs.
  * Return the signal(s) that have awaked the process.
  */
-sigset_t sig_wait(sigset_t sigs)
+sigmask_t sig_wait(sigmask_t sigs)
 {
-	sigset_t result;
+	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))
@@ -145,7 +157,8 @@ sigset_t sig_wait(sigset_t sigs)
 
 	/* Signals found: clear them and return */
 	CurrentProcess->sig_recv &= ~sigs;
-	ENABLE_IRQRESTORE(flags);
+
+	IRQ_RESTORE(flags);
 	return result;
 }
 
@@ -156,10 +169,10 @@ sigset_t sig_wait(sigset_t sigs)
  *
  * \note This call is interrupt safe.
  */
-void sig_signal(Process *proc, sigset_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;
@@ -172,7 +185,7 @@ void sig_signal(Process *proc, sigset_t sigs)
 		SCHED_ENQUEUE(proc);
 	}
 
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
 }
 
 #endif /* CONFIG_KERN_SIGNALS */