X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fevent.h;h=743d25839e3eceabb29edbf878b2454e74bdc2f8;hb=f3acac1f7e1e5d3826de4638fed4023183140e7a;hp=d01171d04759bba5a986f8a7677c3c88f78752cb;hpb=277b540c0764dd376dcf583acdc97a2b2fd3d8e6;p=bertos.git

diff --git a/kern/event.h b/kern/event.h
index d01171d0..743d2583 100755
--- a/kern/event.h
+++ b/kern/event.h
@@ -1,9 +1,9 @@
 /*!
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999,2001,2003 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 1999, 2001, 2003 Bernardo Innocenti <bernie@develer.com>
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief Events handling
@@ -18,6 +18,18 @@
 
 /*#*
  *#* $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
  *#*
@@ -44,10 +56,10 @@
 #ifndef KERN_EVENT_H
 #define KERN_EVENT_H
 
-#include <config.h>
+#include <cfg/config.h>
 
-#ifdef CONFIG_KERNEL
-	#include "config_kern.h"
+#if CONFIG_KERNEL
+	#include <cfg/config_kern.h>
 	#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 		#include "signal.h"
 	#endif
@@ -57,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
@@ -91,29 +92,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;
@@ -124,13 +128,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;
@@ -141,19 +145,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 */