projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modularize hardware access; Port to new timer interface.
[bertos.git]
/
kern
/
signal.c
diff --git
a/kern/signal.c
b/kern/signal.c
index 9b61120a8e46aa1e243254da302641e0ccffa90b..e64272b0023225fa4157aed6bec917a29befcdf0 100755
(executable)
--- a/
kern/signal.c
+++ b/
kern/signal.c
@@
-66,6
+66,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.9 2004/12/08 08:57:35 bernie
*#* Rename sigset_t to sigmask_t.
*#*
@@
-101,9
+107,8
@@
#include "proc.h"
#include "proc_p.h"
#include "hw.h"
#include "proc.h"
#include "proc_p.h"
#include "hw.h"
-#include <debug.h>
+#include <
cfg/
debug.h>
-// FIXME
#if CONFIG_KERN_SIGNALS
/*!
#if CONFIG_KERN_SIGNALS
/*!
@@
-115,10
+120,11
@@
sigmask_t sig_check(sigmask_t sigs)
sigmask_t result;
cpuflags_t flags;
sigmask_t result;
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;
}
@@
-132,7
+138,7
@@
sigmask_t sig_wait(sigmask_t sigs)
sigmask_t result;
cpuflags_t flags;
sigmask_t result;
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))
@@
-148,7
+154,8
@@
sigmask_t sig_wait(sigmask_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;
}
@@
-162,7
+169,7
@@
sigmask_t sig_wait(sigmask_t sigs)
void sig_signal(Process *proc, sigmask_t sigs)
{
cpuflags_t flags;
void sig_signal(Process *proc, sigmask_t sigs)
{
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;
@@
-175,7
+182,7
@@
void sig_signal(Process *proc, sigmask_t sigs)
SCHED_ENQUEUE(proc);
}
SCHED_ENQUEUE(proc);
}
-
ENABLE_IRQ
RESTORE(flags);
+
IRQ_
RESTORE(flags);
}
#endif /* CONFIG_KERN_SIGNALS */
}
#endif /* CONFIG_KERN_SIGNALS */