X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fevent.h;h=d01171d04759bba5a986f8a7677c3c88f78752cb;hb=0168eb0bee0da568cd3ea8f8dfffa9343175efd9;hp=e1196c9eca7a9227f4d00a479c54d64806dde679;hpb=f5944176b5a027ad5d7922429f0045f797b0b727;p=bertos.git

diff --git a/kern/event.h b/kern/event.h
index e1196c9e..d01171d0 100755
--- a/kern/event.h
+++ b/kern/event.h
@@ -16,21 +16,31 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*
- * $Log$
- * 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.
- *
- * Revision 1.2  2004/06/03 11:27:09  bernie
- * Add dual-license information.
- *
- * Revision 1.1  2004/05/23 17:27:00  bernie
- * Import kern/ subdirectory.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.7  2004/08/25 14:12:09  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.6  2004/08/14 19:37:57  rasky
+ *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
+ *#*
+ *#* 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.
+ *#*
+ *#* Revision 1.2  2004/06/03 11:27:09  bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1  2004/05/23 17:27:00  bernie
+ *#* Import kern/ subdirectory.
+ *#*
+ *#*/
 #ifndef KERN_EVENT_H
 #define KERN_EVENT_H
 
@@ -100,7 +110,6 @@ 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;
@@ -118,57 +127,33 @@ 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;
-	e.action = EVENT_SOFTINT;
+	e.action = EVENT_SIGNAL;
 	e.Ev.Sig.sig_proc = proc;
 	e.Ev.Sig.sig_bit = 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 */