Changeset 2b017ba in mainline for uspace

Timestamp:

2006-10-16T20:51:55Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5f9b4d9a

Parents:

e3890b3f

Message:

Replace the old IRQ dispatcher and IPC notifier with new implementation.
Note that all architectures except for sparc64 are now broken
and don't even compile.

Location:

uspace

Files:

• kbd/arch/sparc64/src/kbd.c (modified) (1 diff)
• klog/klog.c (modified) (2 diffs)
• libc/generic/async.c (modified) (2 diffs)
• libc/generic/ipc.c (modified) (1 diff)
• libc/include/ipc/ipc.h (modified) (1 diff)

uspace/kbd/arch/sparc64/src/kbd.c

@@ -59 +59 @@
 {
         z8530_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual") + 6;
-        ipc_register_irq(sysinfo_value("kbd.irq"), &z8530_kbd);
+        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &z8530_kbd);
         return 0;
 }

uspace/klog/klog.c

@@ -41 +41 @@
 #include <as.h>
 #include <kernel/ipc/irq.h>
+#include <sysinfo.h>
 
 /* Pointer to klog area */
@@ -73 +74 @@
         klog = mapping;
 
-        if (ipc_register_irq(IPC_IRQ_KLOG, NULL)) {
+        int inr = sysinfo_value("klog.inr");
+        int devno = sysinfo_value("klog.devno");
+        if (ipc_register_irq(inr, devno, 0, NULL)) {
                 printf("Error registering for klog service.\n");
                 return 0;

uspace/libc/generic/async.c

@@ -637 +637 @@
 
         if (in_interrupt_handler) {
-                printf("Cannot send asynchronou request in interrupt handler.\n");
+                printf("Cannot send asynchronous request in interrupt handler.\n");
                 _exit(1);
         }
@@ -663 +663 @@
 
         if (in_interrupt_handler) {
-                printf("Cannot send asynchronou request in interrupt handler.\n");
+                printf("Cannot send asynchronous request in interrupt handler.\n");
                 _exit(1);
         }

uspace/libc/generic/ipc.c

@@ -450 +450 @@
 }
 
-int ipc_register_irq(int irq, irq_code_t *ucode)
-{
-        return __SYSCALL2(SYS_IPC_REGISTER_IRQ, irq, (sysarg_t) ucode);
-}
-
-int ipc_unregister_irq(int irq)
-{
-        return __SYSCALL1(SYS_IPC_UNREGISTER_IRQ, irq);
+/** Register IRQ notification.
+ *
+ * @param inr IRQ number.
+ * @param devno Device number of the device generating inr.
+ * @param method Use this method for notifying me.
+ * @param ucode Top-half pseudocode handler.
+ *
+ * @return Value returned by the kernel.
+ */
+int ipc_register_irq(int inr, int devno, int method, irq_code_t *ucode)
+{
+        return __SYSCALL4(SYS_IPC_REGISTER_IRQ, inr, devno, method, (sysarg_t) ucode);
+}
+
+/** Unregister IRQ notification.
+ *
+ * @param inr IRQ number.
+ * @param devno Device number of the device generating inr.
+ *
+ * @return Value returned by the kernel.
+ */
+int ipc_unregister_irq(int inr, int devno)
+{
+        return __SYSCALL2(SYS_IPC_UNREGISTER_IRQ, inr, devno);
 }
 

uspace/libc/include/ipc/ipc.h

@@ -84 +84 @@
 extern int ipc_connect_me_to(int phoneid, int arg1, int arg2);
 extern int ipc_hangup(int phoneid);
-extern int ipc_register_irq(int irq, irq_code_t *code);
-extern int ipc_unregister_irq(int irq);
+extern int ipc_register_irq(int inr, int devno, int method, irq_code_t *code);
+extern int ipc_unregister_irq(int inr, int devno);
 extern int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method, ipcarg_t arg1);