Changeset df29f24 in mainline for kernel/generic/include/ipc/event.h

Timestamp:

2011-06-01T09:04:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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 mainline changes

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

• kernel/generic/include/ipc/event.h (modified) (2 diffs)

kernel/generic/include/ipc/event.h

@@ -41 +41 @@
 #include <ipc/ipc.h>
 
+typedef void (*event_callback_t)(void);
+
 /** Event notification structure. */
 typedef struct {
@@ -51 +53 @@
         /** Counter. */
         size_t counter;
+        
         /** Masked flag. */
         bool masked;
         /** Unmask callback. */
-        void (*unmask_cb)(void);
+        event_callback_t unmask_callback;
 } event_t;
 
 extern void event_init(void);
 extern void event_cleanup_answerbox(answerbox_t *);
-extern void event_set_unmask_callback(event_type_t, void (*)(void));
+extern void event_set_unmask_callback(event_type_t, event_callback_t);
 
 #define event_notify_0(e, m) \