projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix standalone build.
[bertos.git]
/
mware
/
event.h
diff --git
a/mware/event.h
b/mware/event.h
index a0e8c75a049bb0a1d51ea62366c26e06149902d0..fe452c5863b5053e5b62d37505b083c8e32c2455 100755
(executable)
--- a/
mware/event.h
+++ b/
mware/event.h
@@
-18,6
+18,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.4 2006/02/10 12:24:42 bernie
+ *#* Fix standalone build.
+ *#*
+ *#* Revision 1.3 2006/01/16 03:27:49 bernie
+ *#* Rename sig_t to sigbit_t to avoid clash with POSIX.
+ *#*
*#* Revision 1.2 2005/11/27 03:02:55 bernie
*#* Convert to appconfig.h.
*#*
*#* Revision 1.2 2005/11/27 03:02:55 bernie
*#* Convert to appconfig.h.
*#*
@@
-62,6
+68,7
@@
#ifndef KERN_EVENT_H
#define KERN_EVENT_H
#ifndef KERN_EVENT_H
#define KERN_EVENT_H
+#include <cfg/compiler.h>
#include <appconfig.h>
#if CONFIG_KERNEL
#include <appconfig.h>
#if CONFIG_KERNEL
@@
-84,7
+91,7
@@
typedef struct Event
struct
{
struct Process *sig_proc; /* Process to be signalled */
struct
{
struct Process *sig_proc; /* Process to be signalled */
- sig
_t
sig_bit; /* Signal to send */
+ sig
bit_t
sig_bit; /* Signal to send */
} Sig;
#endif
struct
} Sig;
#endif
struct
@@
-117,7
+124,7
@@
INLINE Event event_createNone(void)
((e)->action = event_hook_softint,(e)->Ev.Int.func = (f), (e)->Ev.Int.user_data = (u))
/*! Same as event_initSoftInt(), but returns the initialized event */
((e)->action = event_hook_softint,(e)->Ev.Int.func = (f), (e)->Ev.Int.user_data = (u))
/*! Same as event_initSoftInt(), but returns the initialized event */
-INLINE Event event_createSoftInt(Hook func, void
*
user_data)
+INLINE Event event_createSoftInt(Hook func, void
*
user_data)
{
Event e;
e.action = event_hook_softint;
{
Event e;
e.action = event_hook_softint;
@@
-134,7
+141,7
@@
INLINE Event event_createSoftInt(Hook func, void* user_data)
((e)->action = event_hook_signal,(e)->Ev.Sig.sig_proc = (p), (e)->Ev.Sig.sig_bit = (s))
/*! Same as event_initSignal(), but returns the initialized event */
((e)->action = event_hook_signal,(e)->Ev.Sig.sig_proc = (p), (e)->Ev.Sig.sig_bit = (s))
/*! Same as event_initSignal(), but returns the initialized event */
-INLINE Event event_createSignal(struct Process
* proc, sig
_t bit)
+INLINE Event event_createSignal(struct Process
*proc, sigbit
_t bit)
{
Event e;
e.action = event_hook_signal;
{
Event e;
e.action = event_hook_signal;
@@
-146,7
+153,7
@@
INLINE Event event_createSignal(struct Process* proc, sig_t bit)
#endif
/*! Trigger an event */
#endif
/*! Trigger an event */
-INLINE void event_do(struct Event
*
e)
+INLINE void event_do(struct Event
*
e)
{
e->action(e);
}
{
e->action(e);
}