Changeset 95b3550 in mainline

Timestamp:

2006-10-18T16:59:28Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a000fd71

Parents:

494a54a

Message:

ia32: fix compilation, keyboard not checked yet

Files:

• kernel/arch/ia32/include/interrupt.h (modified) (1 diff)
• kernel/arch/ia32/src/interrupt.c (modified) (1 diff)
• uspace/kbd/arch/ia32/include/kbd.h (modified) (1 diff)
• uspace/kbd/arch/ia32/src/kbd.c (modified) (5 diffs)

kernel/arch/ia32/include/interrupt.h

@@ -40 +40 @@
 
 #define IVT_ITEMS               IDT_ITEMS
+#define IVT_FIRST               0
 
 #define EXC_COUNT       32

kernel/arch/ia32/src/interrupt.c

@@ -190 +190 @@
 }
 
-static void ipc_int(int n, istate_t *istate)
-{
-        ipc_irq_send_notif(n-IVT_IRQBASE);
-        trap_virtual_eoi();
-}
-
 /** @}
  */

uspace/kbd/arch/ia32/include/kbd.h

@@ -43 +43 @@
 #include <libarch/ddi.h>
 
-#define KBD_IRQ      1
-#define MOUSE_IRQ    12
-
 #define i8042_DATA      0x60
 #define i8042_STATUS    0X64

uspace/kbd/arch/ia32/src/kbd.c

@@ -43 +43 @@
 #include <keys.h>
 #include <genarch/kbd.h>
+#include <sysinfo.h>
 
 /* Interesting bits for status register */
@@ -70 +71 @@
 
 irq_cmd_t i8042_cmds[2] = {
-        { CMD_PORT_READ_1, (void *)0x64, 0, 1 },
-        { CMD_PORT_READ_1, (void *)0x60, 0, 2 }
+        { CMD_PORT_READ_1, (void *) 0x64, 0, 1 },
+        { CMD_PORT_READ_1, (void *) 0x60, 0, 2 }
 };
 
@@ -92 +93 @@
         int mouseenabled = 0;
 
-        iospace_enable(task_get_id(),(void *)i8042_DATA, 5);
+        iospace_enable(task_get_id(), (void *) i8042_DATA, 5);
         /* Disable kbd, enable mouse */
         i8042_command_write(i8042_CMD_KBD);
@@ -125 +126 @@
                 /* enable mouse */
                 mouseenabled = 1;
-
-                ipc_register_irq(MOUSE_IRQ, &i8042_kbd);
+                
+                ipc_register_irq(sysinfo_value("mouse.inr"), sysinfo_value("mouse.devno"), 0, &i8042_kbd);
         }
         /* Enable kbd */
-        ipc_register_irq(KBD_IRQ, &i8042_kbd);
-        /* Register for irq restart */
-        ipc_register_irq(IPC_IRQ_KBDRESTART, NULL);
+        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &i8042_kbd);
 
         int newcontrol = i8042_KBD_IE | i8042_KBD_TRANSLATE;
@@ -150 +149 @@
         int status = IPC_GET_ARG1(*call);
 
-        if (IPC_GET_METHOD(*call) == IPC_IRQ_KBDRESTART) {
-                kbd_arch_init();
-                return 1;
-        }
-
         if ((status & i8042_MOUSE_DATA))
                 return 0;