Changeset 12573db in mainline for kernel/generic/include/ipc

Timestamp:

2011-01-31T20:32:33Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37cf3792

Parents:

4fe94c66 (diff), 197ef43 (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/include/ipc

Files:

• event_types.h (modified) (1 diff)
• ipc.h (modified) (2 diffs)
• sysipc.h (modified) (1 diff)

kernel/generic/include/ipc/event_types.h

@@ -41 +41 @@
         /** Returning from kernel console to userspace */
         EVENT_KCONSOLE,
-        /** A thread has faulted and will be terminated */
+        /** A task/thread has faulted and will be terminated */
         EVENT_FAULT,
         EVENT_END

kernel/generic/include/ipc/ipc.h

@@ -338 +338 @@
          * The caller box is different from sender->answerbox
          * for synchronous calls.
-         *
          */
         answerbox_t *callerbox;
@@ -355 +354 @@
          * cases, we must keep it aside so that the answer is processed
          * correctly.
-         *
          */
         phone_t *caller_phone;

kernel/generic/include/ipc/sysipc.h

@@ -56 +56 @@
     unsigned int);
 extern sysarg_t sys_ipc_hangup(sysarg_t);
-extern sysarg_t sys_ipc_register_irq(inr_t, devno_t, sysarg_t, irq_code_t *);
-extern sysarg_t sys_ipc_unregister_irq(inr_t, devno_t);
+extern sysarg_t sys_register_irq(inr_t, devno_t, sysarg_t, irq_code_t *);
+extern sysarg_t sys_unregister_irq(inr_t, devno_t);
 
 #ifdef __32_BITS__