Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / kern / signal.c

diff --git a/kern/signal.c b/kern/signal.c
old mode 100755 (executable)
new mode 100644 (file)
index 88ab109..3e6fd1c
--- a/kern/signal.c
+++ b/kern/signal.c
@@ -1,9 +1,9 @@
-/*!
+/**
  * \file
  * <!--
  * 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,27 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.14  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* 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.
+ *#*
+ *#* Revision 1.8  2004/09/14 21:06:44  bernie
+ *#* Use debug.h instead of kdebug.h.
+ *#*
  *#* Revision 1.7  2004/08/25 14:12:09  rasky
  *#* Aggiornato il comment block dei log RCS
  *#*
@@ -92,41 +113,41 @@
  *#*/
 
 #include "signal.h"
-#include "proc.h"
-#include "proc_p.h"
-#include "hw.h"
-#include <drv/kdebug.h>
 
-// FIXME
+#include <kern/proc.h>
+#include <kern/proc_p.h>
+#include <cfg/debug.h>
+
 #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;
 }
 
 
-/*!
+/**
  * 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))
@@ -142,21 +163,22 @@ 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;
 }
 
 
-/*!
+/**
  * Send the signals \a sigs to the process \a proc.
  * The process will be awaken if it was waiting for any of them.
  *
  * \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;
@@ -169,7 +191,7 @@ void sig_signal(Process *proc, sigset_t sigs)
                SCHED_ENQUEUE(proc);
        }
 
-       ENABLE_IRQRESTORE(flags);
+       IRQ_RESTORE(flags);
 }
 
 #endif /* CONFIG_KERN_SIGNALS */