Changeset 5eb5dcf in mainline for kernel/arch/ia32

Timestamp:

2010-01-06T20:56:04Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fccc236

Parents:

002252a (diff), eca2435 (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/arch/ia32/src

Files:

• ia32.c (modified) (2 diffs)
• interrupt.c (modified) (2 diffs)

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

kernel/arch/ia32/src/interrupt.c

@@ -98 +98 @@
 }
 
+static void de_fault(int n, istate_t *istate)
+{
+        fault_if_from_uspace(istate, "Divide error.");
+
+        decode_istate(istate);
+        panic("Divide error.");
+}
+
 /** General Protection Fault. */
 static void gp_fault(int n __attribute__((unused)), istate_t *istate)
@@ -215 +223 @@
         }
         
+        exc_register(0, "de_fault", (iroutine) de_fault);
         exc_register(7, "nm_fault", (iroutine) nm_fault);
         exc_register(12, "ss_fault", (iroutine) ss_fault);