Changeset 602ca36b in mainline

Timestamp:

2006-05-02T21:50:06Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

f33cb0b9

Parents:

fa3561f

Message:

Added way to do an action upon interrupt.
ns.c contains a commented example on how to access keyboard in msim.

Files:

• libipc/generic/ipc.c (modified) (1 diff)
• libipc/include/ipc.h (modified) (2 diffs)
• ns/ns.c (modified) (4 diffs)

libipc/generic/ipc.c

@@ -263 +263 @@
 }
 
-int ipc_register_irq(int irq)
-{
-        return __SYSCALL1(SYS_IPC_REGISTER_IRQ, irq);
+int ipc_register_irq(int irq, irq_code_t *ucode)
+{
+        return __SYSCALL2(SYS_IPC_REGISTER_IRQ, irq, (sysarg_t) ucode);
 }
 

libipc/include/ipc.h

@@ -31 +31 @@
 
 #include <kernel/ipc/ipc.h>
+#include <kernel/ipc/irq.h>
 #include <libc.h>
 #include <types.h>
@@ -64 +65 @@
 int ipc_connect_me_to(int phoneid, int arg1, int arg2);
 int ipc_hangup(int phoneid);
-int ipc_register_irq(int irq);
+int ipc_register_irq(int irq, irq_code_t *code);
 int ipc_unregister_irq(int irq);
 

ns/ns.c

@@ -5 +5 @@
 #include <ns.h>
 #include <errno.h>
+/*
+irq_cmd_t msim_cmds[1] = {
+        { CMD_MEM_READ_1, (void *)0xB0000000, 0 }
+};
 
+irq_code_t msim_kbd = {
+        1,
+        msim_cmds
+};
+*/
 static int service;
 
@@ -16 +25 @@
 
         printf("NS:Name service started.\n");
-//      ipc_register_irq(1);
+//      ipc_register_irq(2, &msim_kbd);
         while (1) {
                 callid = ipc_wait_for_call(&call, 0);
@@ -22 +31 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_INTERRUPT:
-                        printf("GOT INTERRUPT\n");
+                        printf("GOT INTERRUPT: %c\n", IPC_GET_ARG2(call));
                         break;
                 case IPC_M_PHONE_HUNGUP:
@@ -59 +68 @@
                         break;
                 }
-                if (! (callid & IPC_CALLID_NOTIFICATION))
+                if (! (callid & IPC_CALLID_NOTIFICATION)) {
+                        printf("Answerinh\n");
                         ipc_answer(callid, retval, arg1, arg2);
+                }
         }
 }