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

Timestamp:

2011-08-21T12:04:27Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

8a6ba94

Parents:

1877128 (diff), a6480d5 (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

File:

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

kernel/generic/src/ipc/event.c

@@ -81 +81 @@
 }
 
-void event_task_init(task_t *t)
+void event_task_init(task_t *task)
 {
         for (unsigned int i = EVENT_END; i < EVENT_TASK_END; i++)
-                event_initialize(evno2event(i, t));
+                event_initialize(evno2event(i, task));
 }
 
@@ -130 +130 @@
 }
 
-void event_task_set_unmask_callback(task_t *t, event_task_type_t evno,
+void event_task_set_unmask_callback(task_t *task, event_task_type_t evno,
     event_callback_t callback)
 {
@@ -136 +136 @@
         ASSERT(evno < EVENT_TASK_END);
                 
-        _event_set_unmask_callback(evno2event(evno, t), callback);
+        _event_set_unmask_callback(evno2event(evno, task), callback);
 }
 
@@ -160 +160 @@
                                 IPC_SET_ARG4(call->data, a4);
                                 IPC_SET_ARG5(call->data, a5);
+                                
+                                call->data.task_id = TASK ? TASK->taskid : 0;
                                 
                                 irq_spinlock_lock(&event->answerbox->irq_lock, true);
@@ -211 +213 @@
 /** Send per-task kernel notification event
  *
- * @param t    Destination task.
+ * @param task Destination task.
  * @param evno Event type.
  * @param mask Mask further notifications after a successful
@@ -229 +231 @@
  *
  */
-int event_task_notify(task_t *t, event_task_type_t evno, bool mask, sysarg_t a1,
-    sysarg_t a2, sysarg_t a3, sysarg_t a4, sysarg_t a5)
+int event_task_notify(task_t *task, event_task_type_t evno, bool mask,
+    sysarg_t a1, sysarg_t a2, sysarg_t a3, sysarg_t a4, sysarg_t a5)
 {
         ASSERT(evno >= (int) EVENT_END);
         ASSERT(evno < EVENT_TASK_END);
         
-        return event_enqueue(evno2event(evno, t), mask, a1, a2, a3, a4, a5);
+        return event_enqueue(evno2event(evno, task), mask, a1, a2, a3, a4, a5);
 }