Update for new emulator.

[bertos.git] / mware / event.h

diff --git a/mware/event.h b/mware/event.h
index a289db805203beb350e2c55defdfb2660a1504d6..259813807fa864cd2629368dc3159bc15074b967 100755 (executable)
--- a/mware/event.h
+++ b/mware/event.h
@@ -18,6 +18,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.6  2006/02/24 01:17:44  bernie
+ *#* Update for new emulator.
+ *#*
+ *#* Revision 1.5  2006/02/24 00:26:21  bernie
+ *#* Fix header name.
+ *#*
+ *#* 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.1  2005/11/27 01:39:48  bernie
  *#* Move event.[ch] from kern/ to mware/.
  *#*
@@ -59,12 +74,13 @@
 #ifndef KERN_EVENT_H
 #define KERN_EVENT_H
 
-#include <cfg/config.h>
+#include <cfg/compiler.h>
+#include <appconfig.h>
 
 #if CONFIG_KERNEL
-       #include <cfg/config_kern.h>
+       #include <config_kern.h>
        #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
-               #include "signal.h"
+               #include <kern/signal.h>
        #endif
 #endif
 
@@ -81,7 +97,7 @@ typedef struct Event
                struct
                {
                        struct Process *sig_proc;  /* Process to be signalled */
-                       sig_t           sig_bit;   /* Signal to send */
+                       sigbit_t        sig_bit;   /* Signal to send */
                } Sig;
 #endif
                struct
@@ -114,7 +130,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 */
-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;
@@ -131,7 +147,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 */
-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;
@@ -143,7 +159,7 @@ INLINE Event event_createSignal(struct Process* proc, sig_t bit)
 #endif
 
 /*! Trigger an event */
-INLINE void event_do(struct Event* e)
+INLINE void event_do(struct Event *e)
 {
        e->action(e);
 }