X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fmware%2Fevent.h;h=fcdb90fbcc986db760725dc279464ed7d4d3ddea;hb=e444d916197e4345dd2bbd85800d8544c2699096;hp=ab8afe039e0f05febe706ce95bf52d0bc99e7744;hpb=6a9e5728583129dd5e89bd1ab0d6cf468bf388a8;p=bertos.git

diff --git a/bertos/mware/event.h b/bertos/mware/event.h
index ab8afe03..fcdb90fb 100644
--- a/bertos/mware/event.h
+++ b/bertos/mware/event.h
@@ -35,7 +35,6 @@
  * This module implements a common system for executing
  * a user defined action calling a hook function.
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
@@ -43,9 +42,13 @@
 #define KERN_EVENT_H
 
 #include <cfg/compiler.h>
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
+#include "cfg/cfg_timer.h"
 
-#if CONFIG_KERNEL
+#include <cpu/power.h> /* cpu_relax() */
+
+#if CONFIG_KERN
 	#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 		#include <kern/signal.h>
 	#endif
@@ -75,12 +78,19 @@ typedef struct Event
 			Hook  func;         /* Pointer to softint hook */
 			void *user_data;    /* Data to be passed back to user hook */
 		} Int;
+
+		struct
+		{
+			bool completed;             /* Generic event completion */
+		} Gen;
 	} Ev;
 } Event;
 
 void event_hook_ignore(Event *event);
 void event_hook_signal(Event *event);
 void event_hook_softint(Event *event);
+void event_hook_generic(Event *event);
+void event_hook_generic_timeout(Event *event);
 
 /** Initialize the event \a e as a no-op */
 #define event_initNone(e) \
@@ -109,10 +119,6 @@ INLINE Event event_createSoftint(Hook func, void *user_data)
 	return e;
 }
 
-// OBSOLETE names
-#define event_createSoftInt event_createSoftint
-#define event_initSoftInt event_initSoftint
-
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 
 /** Initialize the event \a e with a signal (send signal \a s to process \a p) */
@@ -131,6 +137,76 @@ INLINE Event event_createSignal(struct Process *proc, sigbit_t bit)
 
 #endif
 
+/**
+ * Prevent the compiler from optimizing access to the variable \a x, enforcing
+ * a refetch from memory. This also forbid from reordering successing instances
+ * of ACCESS_SAFE().
+ *
+ * TODO: move this to cfg/compiler.h
+ */
+#define ACCESS_SAFE(x) (*(volatile typeof(x) *)&(x))
+
+#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
+/** Initialize the generic sleepable event \a e */
+#define event_initGeneric(e) \
+	event_initSignal(e, proc_current(), SIG_SINGLE)
+#else
+#define event_initGeneric(e) \
+	((e)->action = event_hook_generic, (e)->Ev.Gen.completed = false)
+#endif
+
+/**
+ * Create a generic sleepable event.
+ *
+ * \return the properly initialized generic event structure.
+ */
+INLINE Event event_createGeneric(void)
+{
+	Event e;
+	event_initGeneric(&e);
+	return e;
+}
+
+/**
+ * Wait the completion of event \a e.
+ */
+INLINE void event_wait(Event *e)
+{
+#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
+	sig_wait(e->Ev.Sig.sig_bit);
+#else
+	while (ACCESS_SAFE(e->Ev.Gen.completed) == false)
+		cpu_relax();
+#endif
+}
+
+#if CONFIG_TIMER_EVENTS
+#include <drv/timer.h> /* timer_clock() */
+
+/* TODO: move these macros to drv/timer.h */
+#define TIMER_AFTER(x, y) ((long)(y) - (long)(x) < 0)
+#define TIMER_BEFORE(x, y) TIMER_AFTER(y, x)
+
+/**
+ * Wait the completion of event \a e or \a timeout elapses.
+ */
+INLINE bool event_waitTimeout(Event *e, ticks_t timeout)
+{
+#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
+	return (sig_waitTimeout(e->Ev.Sig.sig_bit, timeout) & SIG_TIMEOUT) ?
+				false : true;
+#else
+	ticks_t end = timer_clock() + timeout;
+
+	while ((ACCESS_SAFE(e->Ev.Gen.completed) == false) ||
+			TIMER_AFTER(timer_clock(), end))
+		cpu_relax();
+
+	return e->Ev.Gen.completed;
+#endif
+}
+#endif /* CONFIG_TIMER_EVENTS */
+
 /** Trigger an event */
 INLINE void event_do(struct Event *e)
 {