Changeset 385a3d6 in mainline

Timestamp:

2010-01-06T20:44:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1e816c8

Parents:

6ef2c11

Message:

Fix mouse IRQ bug.

Files:

• kernel/arch/amd64/src/amd64.c (modified) (2 diffs)
• kernel/arch/ia32/src/ia32.c (modified) (2 diffs)
• uspace/srv/hw/char/i8042/i8042.c (modified) (2 diffs)

kernel/arch/amd64/src/amd64.c

@@ -212 +212 @@
                         i8042_wire(i8042_instance, kbrd);
                         trap_virtual_enable_irqs(1 << IRQ_KBD);
+                        trap_virtual_enable_irqs(1 << IRQ_MOUSE);
                 }
         }
@@ -219 +220 @@
          * self-sufficient.
          */
-        sysinfo_set_item_val("kbd", NULL, true);
-        sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
-        sysinfo_set_item_val("kbd.address.physical", NULL,
+        sysinfo_set_item_val("i8042", NULL, true);
+        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
+        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
+        sysinfo_set_item_val("i8042.address.physical", NULL,
             (uintptr_t) I8042_BASE);
-        sysinfo_set_item_val("kbd.address.kernel", NULL,
+        sysinfo_set_item_val("i8042.address.kernel", NULL,
             (uintptr_t) I8042_BASE);
 #endif

kernel/arch/ia32/src/ia32.c

@@ -170 +170 @@
                         i8042_wire(i8042_instance, kbrd);
                         trap_virtual_enable_irqs(1 << IRQ_KBD);
+                        trap_virtual_enable_irqs(1 << IRQ_MOUSE);
                 }
         }
@@ -177 +178 @@
          * self-sufficient.
          */
-        sysinfo_set_item_val("kbd", NULL, true);
-        sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
-        sysinfo_set_item_val("kbd.address.physical", NULL,
+        sysinfo_set_item_val("i8042", NULL, true);
+        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
+        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
+        sysinfo_set_item_val("i8042.address.physical", NULL,
             (uintptr_t) I8042_BASE);
-        sysinfo_set_item_val("kbd.address.kernel", NULL,
+        sysinfo_set_item_val("i8042.address.kernel", NULL,
             (uintptr_t) I8042_BASE);
 #endif

uspace/srv/hw/char/i8042/i8042.c

@@ -169 +169 @@
         void *vaddr;
 
-        i8042_physical = sysinfo_value("kbd.address.physical");
-        i8042_kernel = sysinfo_value("kbd.address.kernel");
+        i8042_physical = sysinfo_value("i8042.address.physical");
+        i8042_kernel = sysinfo_value("i8042.address.kernel");
         if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0)
                 return -1;
@@ -193 +193 @@
         i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
         i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
-        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &i8042_kbd);
-        ipc_register_irq(sysinfo_value("mouse.inr"), device_assign_devno(), 0, &i8042_kbd);
+        ipc_register_irq(sysinfo_value("i8042.inr_a"), device_assign_devno(), 0, &i8042_kbd);
+        ipc_register_irq(sysinfo_value("i8042.inr_b"), device_assign_devno(), 0, &i8042_kbd);
 
         pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);