Changeset 371bd7d in mainline for kernel/generic/include/ipc

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.h (modified) (1 diff)
• event_types.h (modified) (1 diff)
• ipc.h (modified) (1 diff)
• irq.h (modified) (1 diff)
• sysipc.h (modified) (1 diff)

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>

kernel/generic/include/ipc/event_types.h

@@ -37 +37 @@
 
 typedef enum event_type {
+        /** New data available in kernel log */
         EVENT_KLOG = 0,
+        /** Returning from kernel console to userspace */
         EVENT_KCONSOLE,
+        /** A thread has faulted and will be terminated */
+        EVENT_FAULT,
         EVENT_END
 } event_type_t;

kernel/generic/include/ipc/ipc.h

@@ -227 +227 @@
 #ifdef KERNEL
 
-#define IPC_MAX_PHONES  16
+#define IPC_MAX_PHONES  32
 
 #include <synch/spinlock.h>

kernel/generic/include/ipc/irq.h

@@ -41 +41 @@
 #include <ipc/ipc.h>
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 

kernel/generic/include/ipc/sysipc.h

@@ -38 +38 @@
 #include <ipc/ipc.h>
 #include <ipc/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method,