Changeset 16f9782 in mainline for kernel/generic

Timestamp:

2011-08-19T16:46:22Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ab34cc9

Parents:

633bcc6 (diff), 45059d6b (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.

Location:

kernel/generic

Files:

• include/ipc/event.h (modified) (3 diffs)
• src/console/console.c (modified) (1 diff)
• src/ipc/event.c (modified) (5 diffs)

kernel/generic/include/ipc/event.h

@@ -41 +41 @@
 #include <ipc/ipc.h>
 
-typedef struct task task_t;
+struct task;
 
 typedef void (*event_callback_t)(void *);
@@ -63 +63 @@
 
 extern void event_init(void);
-extern void event_task_init(task_t *);
+extern void event_task_init(struct task *);
 extern void event_cleanup_answerbox(answerbox_t *);
 extern void event_set_unmask_callback(event_type_t, event_callback_t);
-extern void event_task_set_unmask_callback(task_t *, event_task_type_t,
+extern void event_task_set_unmask_callback(struct task *, event_task_type_t,
     event_callback_t);
 
@@ -97 +97 @@
 extern int event_notify(event_type_t, bool, sysarg_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t);
-extern int event_task_notify(task_t *, event_task_type_t, bool, sysarg_t, sysarg_t,
+extern int event_task_notify(struct task *, event_task_type_t, bool, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t);
 

kernel/generic/src/console/console.c

@@ -248 +248 @@
 }
 
-void klog_update(void *e)
+void klog_update(void *event)
 {
         if (!atomic_get(&klog_inited))

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);
 }
 
@@ -213 +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
@@ -231 +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);
 }