Hunk sfuggito al commit precedente (aggiornamento kernel)

[bertos.git] / kern / event.h

diff --git a/kern/event.h b/kern/event.h
index cfb81ad8a4ef7067cb1fde066414d12bbb2821ff..e5826194f9c11c8c1be0f039efeb8bc4e6daf450 100755 (executable)
--- a/kern/event.h
+++ b/kern/event.h
@@ -18,6 +18,13 @@
 
 /*
  * $Log$
+ * Revision 1.5  2004/07/30 14:30:27  rasky
+ * Resa la sig_signal interrupt safe (con il nuovo scheduler IRQ-safe)
+ * Rimossa event_doIntr (ora inutile) e semplificata la logica delle macro con funzioni inline
+ *
+ * Revision 1.4  2004/06/07 15:58:00  aleph
+ * Add function prototypes
+ *
  * Revision 1.3  2004/06/06 18:25:44  bernie
  * Rename event macros to look like regular functions.
  *
@@ -84,6 +91,7 @@ typedef struct Event
        ((e)->action = EVENT_IGNORE)
 
 /*! Same as event_initNone(), but returns the initialized event */
+INLINE Event event_createNone(void);
 INLINE Event event_createNone(void)
 {
        Event e;
@@ -96,6 +104,7 @@ INLINE Event event_createNone(void)
        ((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);
 INLINE Event event_createSoftInt(Hook func, void* user_data)
 {
        Event e;
@@ -113,6 +122,7 @@ INLINE Event event_createSoftInt(Hook func, void* user_data)
        ((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);
 INLINE Event event_createSignal(struct Process* proc, sig_t bit)
 {
        Event e;
@@ -122,47 +132,24 @@ INLINE Event event_createSignal(struct Process* proc, sig_t bit)
        return e;
 }
 
-/*! Trigger an event */
-#define event_do(e) \
-do { \
-       if ((e)->action == EVENT_SIGNAL) \
-               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 event_doIntr(e) \
-do { \
-       if ((e)->action == EVENT_SIGNAL) \
-               _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)
-
-#else /* !CONFIG_KERN_SIGNALS */
+#endif
 
 /*! Trigger an event */
-#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 event_doIntr(e) \
-do { \
-       if ((e)->action == EVENT_SOFTINT) \
-               (e)->Ev.Int.func((e)->Ev.Int.user_data); \
-} while (0)
-
+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
+}
 
 #ifdef CONFIG_KERN_OLDNAMES
        #define INITEVENT_SIG  event_initSignal
        #define INITEVENT_INT  event_initSoftInt
        #define DOEVENT        event_do
-       #define DOEVENT_INTR   event_doIntr
+       #define DOEVENT_INTR   event_do
 #endif
 
 #endif /* KERN_EVENT_H */