Changeset c9f0975 in mainline for kernel/generic/src/ipc/event.c

Timestamp:

2011-06-01T10:04:32Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

65c3794

Parents:

049a16f (diff), df29f24 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with usb/development

File:

• kernel/generic/src/ipc/event.c (modified) (3 diffs)

kernel/generic/src/ipc/event.c

@@ -59 +59 @@
                 events[i].imethod = 0;
                 events[i].masked = false;
-                events[i].unmask_cb = NULL;
+                events[i].unmask_callback = NULL;
         }
 }
@@ -86 +86 @@
 /** 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 +207 @@
 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();
 }