X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fevent.h;h=11ba5c40c5a3257fe3839ff24a24e099638b3add;hb=4bf15025c3fe95a226686b793e39a44f5f08d7da;hp=a0e8c75a049bb0a1d51ea62366c26e06149902d0;hpb=0d9c3da0e6cfef703a519f475c437af7a9cdd673;p=bertos.git

diff --git a/mware/event.h b/mware/event.h
index a0e8c75a..11ba5c40 100755
--- a/mware/event.h
+++ b/mware/event.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -18,6 +18,24 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.7  2006/03/20 17:52:22  bernie
+ *#* Add missing forward declaration.
+ *#*
+ *#* 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.
  *#*
@@ -62,17 +80,21 @@
 #ifndef KERN_EVENT_H
 #define KERN_EVENT_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
+
+	/* Forward decl */
+	struct Process;
 #endif
 
 
-//! User defined callback type
+/// User defined callback type
 typedef void (*Hook)(void *);
 
 typedef struct Event
@@ -84,7 +106,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
@@ -99,11 +121,11 @@ 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 */
+/** 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 */
+/** Same as event_initNone(), but returns the initialized event */
 INLINE Event event_createNone(void);
 INLINE Event event_createNone(void)
 {
@@ -112,12 +134,12 @@ INLINE Event event_createNone(void)
 	return e;
 }
 
-/*! Initialize the event \a e with a software interrupt (call function \a f, with parameter \a u) */
+/** 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))
 
-/*! Same as event_initSoftInt(), but returns the initialized event */
-INLINE Event event_createSoftInt(Hook func, void* user_data)
+/** 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;
@@ -129,12 +151,12 @@ INLINE Event event_createSoftInt(Hook func, void* user_data)
 
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 
-/*! Initialize the event \a e with a signal (send signal \a s to process \a p) */
+/** 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)
+/** Same as event_initSignal(), but returns the initialized event */
+INLINE Event event_createSignal(struct Process *proc, sigbit_t bit)
 {
 	Event e;
 	e.action = event_hook_signal;
@@ -145,8 +167,8 @@ INLINE Event event_createSignal(struct Process* proc, sig_t bit)
 
 #endif
 
-/*! Trigger an event */
-INLINE void event_do(struct Event* e)
+/** Trigger an event */
+INLINE void event_do(struct Event *e)
 {
 	e->action(e);
 }