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

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

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

kernel/generic/include/ipc/event.h

@@ -37 +37 @@
 
 #include <ipc/event_types.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <ipc/ipc.h>
@@ -47 +47 @@
         /** Answerbox for notifications. */
         answerbox_t *answerbox;
-        /** Method to be used for the notification. */
-        unative_t method;
+        /** Interface and method to be used for the notification. */
+        sysarg_t imethod;
         /** Counter. */
         size_t counter;
@@ -54 +54 @@
 
 extern void event_init(void);
-extern unative_t sys_event_subscribe(unative_t, unative_t);
+extern sysarg_t sys_event_subscribe(sysarg_t, sysarg_t);
 extern bool event_is_subscribed(event_type_t);
 extern void event_cleanup_answerbox(answerbox_t *);
@@ -71 +71 @@
         event_notify((e), (a1), (a2), (a3), (a4), (a5))
 
-extern void event_notify(event_type_t, unative_t, unative_t, unative_t,
-    unative_t, unative_t);
+extern void event_notify(event_type_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t);
 
 #endif