projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include <mware/pgm.h> explicitly for non-Harvard archs.
[bertos.git]
/
kern
/
signal.c
diff --git
a/kern/signal.c
b/kern/signal.c
index 0243987be76ac237b4b0c9ce8704b294f9584498..692cd44bf679b0f8c6b772f1a33152ce2532d243 100755
(executable)
--- a/
kern/signal.c
+++ b/
kern/signal.c
@@
-66,6
+66,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.8 2004/09/14 21:06:44 bernie
*#* Use debug.h instead of kdebug.h.
*#*
@@
-100,22
+106,22
@@
#include "hw.h"
#include <debug.h>
#include "hw.h"
#include <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.
*/
#if CONFIG_KERN_SIGNALS
/*!
* Check if any of the signals in \a sigs has occurred and clear them.
* Return the signals that have occurred.
*/
-sig
set_t sig_check(sigset
_t sigs)
+sig
mask_t sig_check(sigmask
_t sigs)
{
{
- sig
set
_t result;
+ sig
mask
_t result;
cpuflags_t flags;
cpuflags_t flags;
-
DISABLE_IRQSAV
E(flags);
+
IRQ_SAVE_DISABL
E(flags);
result = CurrentProcess->sig_recv & sigs;
CurrentProcess->sig_recv &= ~sigs;
result = CurrentProcess->sig_recv & sigs;
CurrentProcess->sig_recv &= ~sigs;
- ENABLE_IRQRESTORE(flags);
+ IRQ_RESTORE(flags);
+
return result;
}
return result;
}
@@
-124,12
+130,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.
*/
* Sleep until any of the signals in \a sigs occurs.
* Return the signal(s) that have awaked the process.
*/
-sig
set_t sig_wait(sigset
_t sigs)
+sig
mask_t sig_wait(sigmask
_t sigs)
{
{
- sig
set
_t result;
+ sig
mask
_t result;
cpuflags_t flags;
cpuflags_t flags;
-
DISABLE_IRQSAV
E(flags);
+
IRQ_SAVE_DISABL
E(flags);
/* Loop until we get at least one of the signals */
while (!(result = CurrentProcess->sig_recv & sigs))
/* Loop until we get at least one of the signals */
while (!(result = CurrentProcess->sig_recv & sigs))
@@
-145,7
+151,8
@@
sigset_t sig_wait(sigset_t sigs)
/* Signals found: clear them and return */
CurrentProcess->sig_recv &= ~sigs;
/* Signals found: clear them and return */
CurrentProcess->sig_recv &= ~sigs;
- ENABLE_IRQRESTORE(flags);
+
+ IRQ_RESTORE(flags);
return result;
}
return result;
}
@@
-156,10
+163,10
@@
sigset_t sig_wait(sigset_t sigs)
*
* \note This call is interrupt safe.
*/
*
* \note This call is interrupt safe.
*/
-void sig_signal(Process *proc, sig
set
_t sigs)
+void sig_signal(Process *proc, sig
mask
_t sigs)
{
cpuflags_t flags;
{
cpuflags_t flags;
-
DISABLE_IRQSAV
E(flags);
+
IRQ_SAVE_DISABL
E(flags);
/* Set the signals */
proc->sig_recv |= sigs;
/* Set the signals */
proc->sig_recv |= sigs;
@@
-172,7
+179,7
@@
void sig_signal(Process *proc, sigset_t sigs)
SCHED_ENQUEUE(proc);
}
SCHED_ENQUEUE(proc);
}
-
ENABLE_IRQ
RESTORE(flags);
+
IRQ_
RESTORE(flags);
}
#endif /* CONFIG_KERN_SIGNALS */
}
#endif /* CONFIG_KERN_SIGNALS */