X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fevent.h;h=743d25839e3eceabb29edbf878b2454e74bdc2f8;hb=22853ba2260f6dd8dc0e5ccafb95e75fc36cfa29;hp=a3b43cf1422ba14cebada1ea7f4819b6eacde889;hpb=96f0ef786b54356c56cc3d4e4f0838df2505cfcc;p=bertos.git diff --git a/kern/event.h b/kern/event.h index a3b43cf1..743d2583 100755 --- a/kern/event.h +++ b/kern/event.h @@ -1,9 +1,9 @@ /*! * \file * * * \brief Events handling @@ -16,22 +16,50 @@ * \author Bernardo Innocenti */ -/* - * $Log$ - * Revision 1.2 2004/06/03 11:27:09 bernie - * Add dual-license information. - * - * Revision 1.1 2004/05/23 17:27:00 bernie - * Import kern/ subdirectory. - * - */ +/*#* + *#* $Log$ + *#* Revision 1.11 2005/04/11 19:10:28 bernie + *#* Include top-level headers from cfg/ subdir. + *#* + *#* Revision 1.10 2005/01/24 04:22:02 bernie + *#* Update copyright information. + *#* + *#* Revision 1.9 2005/01/24 04:19:55 bernie + *#* Remove obsolete names. + *#* + *#* Revision 1.8 2005/01/24 04:19:05 bernie + *#* Function pointer based event dispatching. + *#* + *#* Revision 1.7 2004/08/25 14:12:09 rasky + *#* Aggiornato il comment block dei log RCS + *#* + *#* Revision 1.6 2004/08/14 19:37:57 rasky + *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc. + *#* + *#* Revision 1.5 2004/07/30 14:30:27 rasky + *#* Resa la sig_signal interrupt safe (con il nuovo scheduler IRQ-safe) + *#* Rimossa event_doIntr (ora inutile) e semplificata la logica delle macro con funzioni inline + *#* + *#* Revision 1.4 2004/06/07 15:58:00 aleph + *#* Add function prototypes + *#* + *#* Revision 1.3 2004/06/06 18:25:44 bernie + *#* Rename event macros to look like regular functions. + *#* + *#* Revision 1.2 2004/06/03 11:27:09 bernie + *#* Add dual-license information. + *#* + *#* Revision 1.1 2004/05/23 17:27:00 bernie + *#* Import kern/ subdirectory. + *#* + *#*/ #ifndef KERN_EVENT_H #define KERN_EVENT_H -#include "config.h" +#include -#ifdef CONFIG_KERNEL - #include "config_kern.h" +#if CONFIG_KERNEL + #include #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS #include "signal.h" #endif @@ -41,23 +69,12 @@ /* Forward decl */ struct Process; - -/*! Event types */ -enum EventAction -{ - EVENT_IGNORE, /*!< No-op event */ -#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS - EVENT_SIGNAL, /*!< Send a signal to a process */ -#endif - EVENT_SOFTINT /*!< Trigger a software interrupt (i.e.: call user hook) */ -}; - //! User defined callback type typedef void (*Hook)(void *); typedef struct Event { - enum EventAction action; + void (*action)(struct Event *); union { #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS @@ -75,52 +92,60 @@ typedef struct Event } Ev; } Event; +void event_hook_ignore(Event *event); +void event_hook_signal(Event *event); +void event_hook_softint(Event *event); -/*! Initialize an event with a softint */ -#define INITEVENT_INT(e,f,u) \ - ((e)->action = EVENT_SOFTINT,(e)->Ev.Int.func = (f), (e)->Ev.Int.user_data = (u)) +/*! Initialize the event \a e as a no-op */ +#define event_initNone(e) \ + ((e)->action = event_hook_ignore) +/*! Same as event_initNone(), but returns the initialized event */ +INLINE Event event_createNone(void); +INLINE Event event_createNone(void) +{ + Event e; + e.action = event_hook_ignore; + return e; +} -#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS +/*! Initialize the event \a e with a software interrupt (call function \a f, with parameter \a u) */ +#define event_initSoftInt(e,f,u) \ + ((e)->action = event_hook_softint,(e)->Ev.Int.func = (f), (e)->Ev.Int.user_data = (u)) -/*! Initialize an event with a signal */ -#define INITEVENT_SIG(e,p,s) \ - ((e)->action = EVENT_SIGNAL,(e)->Ev.Sig.sig_proc = (p), (e)->Ev.Sig.sig_bit = (s)) +/*! Same as event_initSoftInt(), but returns the initialized event */ +INLINE Event event_createSoftInt(Hook func, void* user_data) +{ + Event e; + e.action = event_hook_softint; + e.Ev.Int.func = func; + e.Ev.Int.user_data = user_data; + return e; +} -/*! Trigger an event */ -#define DOEVENT(e) \ -do { \ - if ((e)->action == EVENT_SIGNAL) \ - sig_signal((e)->Ev.Sig.sig_proc, (e)->Sig.sig_bit); \ - else if ((e)->action == EVENT_SOFTINT) \ - (e)->Ev.Int.func((e)->Ev.Int.user_data); \ -} while (0) - -/*! Trigger an event (to be used inside interrupts) */ -#define DOEVENT_INTR(e) \ -do { \ - if ((e)->action == EVENT_SIGNAL) \ - _sig_signal((e)->Ev.Sig.sig_proc, (e)->Ev.Sig.sig_bit); \ - else if ((e)->action == EVENT_SOFTINT) \ - (e)->Ev.Int.func((e)->Ev.Int.user_data); \ -} while (0) - -#else /* !CONFIG_KERN_SIGNALS */ -/*! Trigger an event */ -#define DOEVENT(e) \ -do { \ - if ((e)->action == EVENT_SOFTINT) \ - (e)->Ev.Int.func((e)->Ev.Int.user_data); \ -} while (0) - -/*! Trigger an event (to be used inside interrupts) */ -#define DOEVENT_INTR(e) \ -do { \ - if ((e)->action == EVENT_SOFTINT) \ - (e)->Ev.Int.func((e)->Ev.Int.user_data); \ -} while (0) +#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS + +/*! Initialize the event \a e with a signal (send signal \a s to process \a p) */ +#define event_initSignal(e,p,s) \ + ((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) +{ + Event e; + e.action = event_hook_signal; + e.Ev.Sig.sig_proc = proc; + e.Ev.Sig.sig_bit = bit; + return e; +} #endif +/*! Trigger an event */ +INLINE void event_do(struct Event* e) +{ + e->action(e); +} + #endif /* KERN_EVENT_H */