X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fmware%2Fevent.h;h=74a467937ae802b1cffdadf5eac0ce67ad2c93de;hb=3475446433a31b89ab480cd19bbdbe8473c3d7fe;hp=f233c294b4b4ae8148df2f5cc9d596f2c0a8c404;hpb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;p=bertos.git

diff --git a/bertos/mware/event.h b/bertos/mware/event.h
index f233c294..74a46793 100644
--- a/bertos/mware/event.h
+++ b/bertos/mware/event.h
@@ -28,7 +28,6 @@
  *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999, 2001, 2003 Bernie Innocenti <bernie@codewiz.org>
- *
  * -->
  *
  * \brief Events handling
@@ -37,7 +36,6 @@
  * a user defined action calling a hook function.
  *
  * \version $Id$
- *
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
@@ -45,9 +43,10 @@
 #define KERN_EVENT_H
 
 #include <cfg/compiler.h>
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
 
-#if CONFIG_KERNEL
+#if CONFIG_KERN
 	#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 		#include <kern/signal.h>
 	#endif
@@ -98,11 +97,11 @@ INLINE Event event_createNone(void)
 }
 
 /** Initialize the event \a e with a software interrupt (call function \a f, with parameter \a u) */
-#define event_initSoftInt(e,f,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;
@@ -111,7 +110,6 @@ INLINE Event event_createSoftInt(Hook func, void *user_data)
 	return e;
 }
 
-
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 
 /** Initialize the event \a e with a signal (send signal \a s to process \a p) */