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

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e

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/src/ipc/event.c (modified) (8 diffs)

kernel/generic/src/ipc/event.c

@@ -38 +38 @@
 #include <ipc/event_types.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <console/console.h>
@@ -57 +57 @@
                 events[i].answerbox = NULL;
                 events[i].counter = 0;
-                events[i].method = 0;
+                events[i].imethod = 0;
         }
 }
 
-static int event_subscribe(event_type_t evno, unative_t method,
+static int event_subscribe(event_type_t evno, sysarg_t imethod,
     answerbox_t *answerbox)
 {
@@ -73 +73 @@
         if (events[evno].answerbox == NULL) {
                 events[evno].answerbox = answerbox;
-                events[evno].method = method;
+                events[evno].imethod = imethod;
                 events[evno].counter = 0;
                 res = EOK;
@@ -84 +84 @@
 }
 
-unative_t sys_event_subscribe(unative_t evno, unative_t method)
+sysarg_t sys_event_subscribe(sysarg_t evno, sysarg_t imethod)
 {
-        return (unative_t) event_subscribe((event_type_t) evno, (unative_t)
-            method, &TASK->answerbox);
+        return (sysarg_t) event_subscribe((event_type_t) evno, (sysarg_t)
+            imethod, &TASK->answerbox);
 }
 
@@ -113 +113 @@
                         events[i].answerbox = NULL;
                         events[i].counter = 0;
-                        events[i].method = 0;
+                        events[i].imethod = 0;
                 }
                 spinlock_unlock(&events[i].lock);
@@ -119 +119 @@
 }
 
-void event_notify(event_type_t evno, unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5)
+void event_notify(event_type_t evno, sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5)
 {
         ASSERT(evno < EVENT_END);
@@ -130 +130 @@
                         call->flags |= IPC_CALL_NOTIF;
                         call->priv = ++events[evno].counter;
-                        IPC_SET_METHOD(call->data, events[evno].method);
+                        IPC_SET_IMETHOD(call->data, events[evno].imethod);
                         IPC_SET_ARG1(call->data, a1);
                         IPC_SET_ARG2(call->data, a2);
@@ -137 +137 @@
                         IPC_SET_ARG5(call->data, a5);
                         
-                        ipl_t ipl = interrupts_disable();
-                        spinlock_lock(&events[evno].answerbox->irq_lock);
+                        irq_spinlock_lock(&events[evno].answerbox->irq_lock, true);
                         list_append(&call->link, &events[evno].answerbox->irq_notifs);
-                        spinlock_unlock(&events[evno].answerbox->irq_lock);
-                        interrupts_restore(ipl);
+                        irq_spinlock_unlock(&events[evno].answerbox->irq_lock, true);
                         
                         waitq_wakeup(&events[evno].answerbox->wq, WAKEUP_FIRST);