Changeset 00aece0 in mainline for kernel/generic/include/ipc

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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:

• ipc.h (modified) (1 diff)
• irq.h (modified) (1 diff)
• sysipc.h (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -36 +36 @@
 #define KERN_IPC_H_
 
-#include <abi/ipc/ipc.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
 #include <synch/waitq.h>
+#include <abi/ipc/ipc.h>
+#include <abi/proc/task.h>
 #include <typedefs.h>
 
-#define IPC_MAX_PHONES  32
+#define IPC_MAX_PHONES  64
 
 struct answerbox;

kernel/generic/include/ipc/irq.h

@@ -36 +36 @@
 #define KERN_IPC_IRQ_H_
 
-/** Maximum length of IPC IRQ program */
+/** Maximum number of IPC IRQ programmed I/O ranges. */
+#define IRQ_MAX_RANGE_COUNT     8
+
+/** Maximum length of IPC IRQ program. */
 #define IRQ_MAX_PROG_SIZE  20
 

kernel/generic/include/ipc/sysipc.h

@@ -56 +56 @@
     unsigned int);
 extern sysarg_t sys_ipc_hangup(sysarg_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);
+extern sysarg_t sys_irq_register(inr_t, devno_t, sysarg_t, irq_code_t *);
+extern sysarg_t sys_irq_unregister(inr_t, devno_t);
 
 #ifdef __32_BITS__