X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fevent.h;h=fe452c5863b5053e5b62d37505b083c8e32c2455;hb=3209699c4b8c578b0173bdd1b6b57aee36113836;hp=a289db805203beb350e2c55defdfb2660a1504d6;hpb=2c0a02c963204a96304619bc5146d89c435faa2a;p=bertos.git diff --git a/mware/event.h b/mware/event.h index a289db80..fe452c58 100755 --- a/mware/event.h +++ b/mware/event.h @@ -18,6 +18,15 @@ /*#* *#* $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.1 2005/11/27 01:39:48 bernie *#* Move event.[ch] from kern/ to mware/. *#* @@ -59,7 +68,8 @@ #ifndef KERN_EVENT_H #define KERN_EVENT_H -#include +#include +#include #if CONFIG_KERNEL #include @@ -81,7 +91,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 +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 */ -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 +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 */ -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 +153,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); }