Switch to new kernel config files.

[bertos.git] / bertos / mware / event.h

diff --git a/bertos/mware/event.h b/bertos/mware/event.h
index 4270e94698100af607168b8e6a1a0590155bc0c7..74a467937ae802b1cffdadf5eac0ce67ad2c93de 100644 (file)
--- a/bertos/mware/event.h
+++ b/bertos/mware/event.h
@@ -27,8 +27,7 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2001, 2003 Bernardo Innocenti <bernie@develer.com>
- *
+ * Copyright 1999, 2001, 2003 Bernie Innocenti <bernie@codewiz.org>
  * -->
  *
  * \brief Events handling
@@ -37,18 +36,17 @@
  * a user defined action calling a hook function.
  *
  * \version $Id$
- *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #ifndef KERN_EVENT_H
 #define KERN_EVENT_H
 
 #include <cfg/compiler.h>
-#include <appconfig.h>
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
 
-#if CONFIG_KERNEL
-       #include <config_kern.h>
+#if CONFIG_KERN
        #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
                #include <kern/signal.h>
        #endif
@@ -99,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;
@@ -112,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) */