[MINIOS]Events handling cleaned up. The interface extended to provide

void* pointer to handlers.
Signed-off-by: Steven Smith <sos22@cam.ac.uk>
Signed-off-by: Grzegorz Milos <gm281@cam.ac.uk>

2 files changed, 20 insertions, 17 deletions

diff --git a/extras/mini-os/include/events.h b/extras/mini-os/include/events.h
index c4e7c67fd8..c1b58c4db0 100644
--- a/extras/mini-os/include/events.h
+++ b/extras/mini-os/include/events.h
@@ -22,28 +22,18 @@
 #include<traps.h>
 #include <xen/event_channel.h>
 
-#define NR_EVS 1024
-
-/* ev handler status */
-#define EVS_INPROGRESS	1	/* Event handler active - do not enter! */
-#define EVS_DISABLED	2	/* Event disabled - do not enter! */
-#define EVS_PENDING	    4	/* Event pending - replay on enable */
-#define EVS_REPLAY	    8	/* Event has been replayed but not acked yet */
-
-/* this represents a event handler. Chaining or sharing is not allowed */
-typedef struct _ev_action_t {
-	void (*handler)(int, struct pt_regs *);
-    unsigned int status;		/* IRQ status */
-    u32 count;
-} ev_action_t;
-
 /* prototypes */
 int do_event(u32 port, struct pt_regs *regs);
-int bind_virq( u32 virq, void (*handler)(int, struct pt_regs *) );
-int bind_evtchn( u32 virq, void (*handler)(int, struct pt_regs *) );
+int bind_virq( u32 virq, void (*handler)(int, struct pt_regs *, void *data),
+			   void *data);
+int bind_evtchn( u32 virq, void (*handler)(int, struct pt_regs *, void *data),
+				 void *data );
 void unbind_evtchn( u32 port );
 void init_events(void);
 void unbind_virq( u32 port );
+int evtchn_alloc_unbound(void (*handler)(int, struct pt_regs *regs,
+										 void *data),
+						 void *data);
 
 static inline int notify_remote_via_evtchn(int port)
 {
diff --git a/extras/mini-os/include/lib.h b/extras/mini-os/include/lib.h
index 473a059705..809c429789 100644
--- a/extras/mini-os/include/lib.h
+++ b/extras/mini-os/include/lib.h
@@ -89,6 +89,7 @@ size_t strlen(const char *s);
 char  *strchr(const char *s, int c);
 char  *strstr(const char *s1, const char *s2);
 char * strcat(char * dest, const char * src);
+char  *strdup(const char *s);
 
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -98,6 +99,18 @@ struct kvec {
     size_t iov_len;
 };
 
+#define ASSERT(x)                                              \
+do {                                                           \
+	if (!(x)) {                                                \
+		printk("ASSERTION FAILED: %s at %s:%d.\n",             \
+			   # x ,                                           \
+			   __FILE__,                                       \
+			   __LINE__);                                      \
+        BUG();                                                 \
+	}                                                          \
+} while(0)
 
+/* Consistency check as much as possible. */
+void sanity_check(void);
 
 #endif /* _LIB_H_ */