X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fevent.h;h=8d3a90a48878aaf52647526985236b1bf96da217;hb=9932997f2f162ec4e4f72b7cc0bf6051b7c146b2;hp=3a8d81507d136b2abbb9612a06e761f32c3d1b4f;hpb=ea4ef51b306fde6480c03f72e81c4b31d51660f6;p=bertos.git

diff --git a/kern/event.h b/kern/event.h
index 3a8d8150..8d3a90a4 100755
--- a/kern/event.h
+++ b/kern/event.h
@@ -16,34 +16,43 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*
- * $Log$
- * 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.
- *
- */
+/*#*
+ *#* $Log$
+ *#* 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>
 
-#ifdef CONFIG_KERNEL
+#if CONFIG_KERNEL
 	#include "config_kern.h"
 	#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 		#include "signal.h"
@@ -54,23 +63,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
@@ -88,29 +86,32 @@ typedef struct Event
 	} Ev;
 } Event;
 
+void event_hook_ignore(Event *event);
+void event_hook_signal(Event *event);
+void event_hook_softint(Event *event);
 
 /*! Initialize the event \a e as a no-op */
 #define event_initNone(e) \
-	((e)->action = EVENT_IGNORE)
+	((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_IGNORE;
+	e.action = event_hook_ignore;
 	return e;
 }
 
 /*! 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_SOFTINT,(e)->Ev.Int.func = (f), (e)->Ev.Int.user_data = (u))
+	((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)
 {
 	Event e;
-	e.action = EVENT_SOFTINT;
+	e.action = event_hook_softint;
 	e.Ev.Int.func = func;
 	e.Ev.Int.user_data = user_data;
 	return e;
@@ -121,13 +122,13 @@ INLINE Event event_createSoftInt(Hook func, void* user_data)
 
 /*! 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_SIGNAL,(e)->Ev.Sig.sig_proc = (p), (e)->Ev.Sig.sig_bit = (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_SIGNAL;
+	e.action = event_hook_signal;
 	e.Ev.Sig.sig_proc = proc;
 	e.Ev.Sig.sig_bit = bit;
 	return e;
@@ -138,19 +139,7 @@ INLINE Event event_createSignal(struct Process* proc, sig_t bit)
 /*! Trigger an event */
 INLINE void event_do(struct Event* e)
 {
-	if ((e)->action == EVENT_SOFTINT)
-		(e)->Ev.Int.func((e)->Ev.Int.user_data);
-#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
-	else if ((e)->action == EVENT_SIGNAL)
-		sig_signal((e)->Ev.Sig.sig_proc, (e)->Ev.Sig.sig_bit);
-#endif
+	e->action(e);
 }
 
-#ifdef CONFIG_KERN_OLDNAMES
-	#define INITEVENT_SIG  event_initSignal
-	#define INITEVENT_INT  event_initSoftInt
-	#define DOEVENT        event_do
-	#define DOEVENT_INTR   event_do
-#endif
-
 #endif /* KERN_EVENT_H */