Index: kernel/generic/src/ipc/event.c
===================================================================
--- kernel/generic/src/ipc/event.c	(revision 0496c1788f5c44ab96b952f38fcc57fc253e00b7)
+++ kernel/generic/src/ipc/event.c	(revision 0dd8c291a013f3ce092e304e4f3bc4dfc5129cc3)
@@ -59,5 +59,5 @@
 		events[i].imethod = 0;
 		events[i].masked = false;
-		events[i].unmask_cb = NULL;
+		events[i].unmask_callback = NULL;
 	}
 }
@@ -86,14 +86,15 @@
 /** Define a callback function for the event unmask event.
  *
- * @param evno Event type.
- * @param cb   Callback function to be called when the event is unmasked.
- *
- */
-void event_set_unmask_callback(event_type_t evno, void (*cb)(void))
-{
-	ASSERT(evno < EVENT_END);
-	
-	spinlock_lock(&events[evno].lock);
-	events[evno].unmask_cb = cb;
+ * @param evno     Event type.
+ * @param callback Callback function to be called when
+ *                 the event is unmasked.
+ *
+ */
+void event_set_unmask_callback(event_type_t evno, event_callback_t callback)
+{
+	ASSERT(evno < EVENT_END);
+	
+	spinlock_lock(&events[evno].lock);
+	events[evno].unmask_callback = callback;
 	spinlock_unlock(&events[evno].lock);
 }
@@ -206,17 +207,17 @@
 static void event_unmask(event_type_t evno)
 {
-	void (*cb)(void);
 	ASSERT(evno < EVENT_END);
 	
 	spinlock_lock(&events[evno].lock);
 	events[evno].masked = false;
-	cb = events[evno].unmask_cb;
+	event_callback_t callback = events[evno].unmask_callback;
 	spinlock_unlock(&events[evno].lock);
 	
 	/*
-	 * Check if there is an unmask callback function defined for this event.
+	 * Check if there is an unmask callback
+	 * function defined for this event.
 	 */
-	if (cb)
-	    cb();
+	if (callback != NULL)
+		callback();
 }