Rename event macros to look like regular functions.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@29 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/drv/timer.c b/drv/timer.c
index a6c31d9208be1aaea6a0e9cff4540d2d0f5ad454..0bd5defef8e623c91a7a1607ae96f7c24bef180c 100755 (executable)
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -15,6 +15,9 @@
 
 /*
  * $Log$
+ * Revision 1.4  2004/06/06 18:25:44  bernie
+ * Rename event macros to look like regular functions.
+ *
  * Revision 1.3  2004/06/06 17:18:42  bernie
  * Fix \!CONFIG_KERN_SIGNALS code paths.
  *
@@ -238,7 +241,7 @@ DEFINE_TIMER_ISR
                REMOVE((Node *)timer);
 
                /* Execute the associated event */
-               DOEVENT_INTR(&timer->expire);
+               event_doIntr(&timer->expire);
        }
 }
 

diff --git a/drv/timer.h b/drv/timer.h
index 595ed3869321ae1f7c4195a33600fb4b942d4888..3484c5a6386ffcd8148edb28c80dd72c290c33b4 100755 (executable)
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -15,6 +15,9 @@
 
 /*
  * $Log$
+ * Revision 1.4  2004/06/06 18:25:44  bernie
+ * Rename event macros to look like regular functions.
+ *
  * Revision 1.3  2004/06/06 16:57:18  bernie
  * Mark some functions INLINE instead of 'extern inline'.
  *
@@ -58,14 +61,14 @@ INLINE time_t timer_gettick_irq(void);
 /*! Set the timer so that it sends a signal when it expires */
 INLINE void timer_set_event_signal(Timer* timer, struct Process* proc, sigset_t sigs)
 {
-       INITEVENT_SIG(&timer->expire, proc, sigs);
+       event_initSignal(&timer->expire, proc, sigs);
 }
 #endif
 
 /*! Set the timer so that it calls an user hook when it expires */
 INLINE void timer_set_event_softint(Timer* timer, Hook func, void* user_data)
 {
-       INITEVENT_INT(&timer->expire, func, user_data);
+       event_initSoftInt(&timer->expire, func, user_data);
 }
 
 /*! Set the timer delay (the time before the event will be triggered) */

diff --git a/kern/event.h b/kern/event.h
index a3b43cf1422ba14cebada1ea7f4819b6eacde889..cfb81ad8a4ef7067cb1fde066414d12bbb2821ff 100755 (executable)
--- a/kern/event.h
+++ b/kern/event.h
@@ -18,6 +18,9 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -28,7 +31,7 @@
 #ifndef KERN_EVENT_H
 #define KERN_EVENT_H
 
-#include "config.h"
+#include <config.h>
 
 #ifdef CONFIG_KERNEL
        #include "config_kern.h"
@@ -76,28 +79,60 @@ typedef struct Event
 } Event;
 
 
-/*! Initialize an event with a softint */
-#define INITEVENT_INT(e,f,u) \
+/*! Initialize the event \a e as a no-op */
+#define event_initNone(e) \
+       ((e)->action = EVENT_IGNORE)
+
+/*! Same as event_initNone(), but returns the initialized event */
+INLINE Event event_createNone(void)
+{
+       Event e;
+       e.action = EVENT_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))
 
+/*! 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.Ev.Int.func = func;
+       e.Ev.Int.user_data = user_data;
+       return e;
+}
+
 
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 
-/*! Initialize an event with a signal */
-#define INITEVENT_SIG(e,p,s) \
+/*! 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))
 
+/*! Same as event_initSignal(), but returns the initialized event */
+INLINE Event event_createSignal(struct Process* proc, sig_t bit)
+{
+       Event e;
+       e.action = EVENT_SOFTINT;
+       e.Ev.Sig.sig_proc = proc;
+       e.Ev.Sig.sig_bit = bit;
+       return e;
+}
+
 /*! Trigger an event */
-#define DOEVENT(e) \
+#define event_do(e) \
 do { \
        if ((e)->action == EVENT_SIGNAL) \
-               sig_signal((e)->Ev.Sig.sig_proc, (e)->Sig.sig_bit); \
+               sig_signal((e)->Ev.Sig.sig_proc, (e)->Ev.Sig.sig_bit); \
        else if ((e)->action == EVENT_SOFTINT) \
                (e)->Ev.Int.func((e)->Ev.Int.user_data); \
 } while (0)
 
 /*! Trigger an event (to be used inside interrupts) */
-#define DOEVENT_INTR(e) \
+#define event_doIntr(e) \
 do { \
        if ((e)->action == EVENT_SIGNAL) \
                _sig_signal((e)->Ev.Sig.sig_proc, (e)->Ev.Sig.sig_bit); \
@@ -108,14 +143,14 @@ do { \
 #else /* !CONFIG_KERN_SIGNALS */
 
 /*! Trigger an event */
-#define DOEVENT(e) \
+#define event_do(e) \
 do { \
        if ((e)->action == EVENT_SOFTINT) \
                (e)->Ev.Int.func((e)->Ev.Int.user_data); \
 } while (0)
 
 /*! Trigger an event (to be used inside interrupts) */
-#define DOEVENT_INTR(e) \
+#define event_doIntr(e) \
 do { \
        if ((e)->action == EVENT_SOFTINT) \
                (e)->Ev.Int.func((e)->Ev.Int.user_data); \
@@ -123,4 +158,11 @@ do { \
 
 #endif
 
+#ifdef CONFIG_KERN_OLDNAMES
+       #define INITEVENT_SIG  event_initSignal
+       #define INITEVENT_INT  event_initSoftInt
+       #define DOEVENT        event_do
+       #define DOEVENT_INTR   event_doIntr
+#endif
+
 #endif /* KERN_EVENT_H */