Index: kernel/genarch/include/kbd/i8042.h
===================================================================
--- kernel/genarch/include/kbd/i8042.h	(revision 0f74869b097948cf47305f47d532161682eac285)
+++ kernel/genarch/include/kbd/i8042.h	(revision c1f7f6eaa570166428a8687a4e9c7cd839cd666d)
@@ -36,4 +36,5 @@
 #define KERN_I8042_H_
 
+#include <ddi/irq.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -47,8 +48,10 @@
 
 typedef struct i8042_instance {
+	devno_t devno;
+	irq_t irq;
 	i8042_t *i8042;
 } i8042_instance_t;
 
-extern void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr);
+extern bool i8042_init(i8042_t *, devno_t, inr_t);
 
 #endif
Index: kernel/genarch/src/kbd/i8042.c
===================================================================
--- kernel/genarch/src/kbd/i8042.c	(revision 0f74869b097948cf47305f47d532161682eac285)
+++ kernel/genarch/src/kbd/i8042.c	(revision c1f7f6eaa570166428a8687a4e9c7cd839cd666d)
@@ -90,8 +90,4 @@
 };
 
-/** Structure for i8042's IRQ. */
-static irq_t i8042_kbd_irq;
-static irq_t i8042_mouse_irq;
-
 static irq_ownership_t i8042_claim(irq_t *irq)
 {
@@ -126,31 +122,28 @@
 
 /** Initialize i8042. */
-void
-i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno,
-    inr_t mouse_inr)
+bool
+i8042_init(i8042_t *dev, devno_t devno, inr_t inr)
 {
-	i8042_t *dev = lgcy_i8042_instance.i8042;
+	i8042_instance_t *instance;
 
 	chardev_initialize("i8042_kbd", &kbrd, &ops);
 	stdin = &kbrd;
 	
-	irq_initialize(&i8042_kbd_irq);
-	i8042_kbd_irq.devno = kbd_devno;
-	i8042_kbd_irq.inr = kbd_inr;
-	i8042_kbd_irq.claim = i8042_claim;
-	i8042_kbd_irq.handler = i8042_irq_handler;
-	i8042_kbd_irq.instance = &lgcy_i8042_instance;
-	irq_register(&i8042_kbd_irq);
+	instance = malloc(sizeof(i8042_instance_t), FRAME_ATOMIC);
+	if (!instance)
+		return false;
 	
-	irq_initialize(&i8042_mouse_irq);
-	i8042_mouse_irq.devno = mouse_devno;
-	i8042_mouse_irq.inr = mouse_inr;
-	i8042_mouse_irq.claim = i8042_claim;
-	i8042_mouse_irq.handler = i8042_irq_handler;
-	i8042_mouse_irq.instance = &lgcy_i8042_instance;
-	irq_register(&i8042_mouse_irq);
+	instance->devno = devno;
+	instance->i8042 = dev;
 	
-	trap_virtual_enable_irqs(1 << kbd_inr);
-	trap_virtual_enable_irqs(1 << mouse_inr);
+	irq_initialize(&instance->irq);
+	instance->irq.devno = devno;
+	instance->irq.inr = inr;
+	instance->irq.claim = i8042_claim;
+	instance->irq.handler = i8042_irq_handler;
+	instance->irq.instance = instance;
+	irq_register(&instance->irq);
+	
+	trap_virtual_enable_irqs(1 << inr);
 	
 	/*
@@ -165,12 +158,11 @@
 	 */
 	sysinfo_set_item_val("kbd", NULL, true);
-	sysinfo_set_item_val("kbd.devno", NULL, kbd_devno);
-	sysinfo_set_item_val("kbd.inr", NULL, kbd_inr);
+	sysinfo_set_item_val("kbd.devno", NULL, devno);
+	sysinfo_set_item_val("kbd.inr", NULL, inr);
 #ifdef KBD_LEGACY
 	sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
 #endif
-	sysinfo_set_item_val("mouse", NULL, true);
-	sysinfo_set_item_val("mouse.devno", NULL, mouse_devno);
-	sysinfo_set_item_val("mouse.inr", NULL, mouse_inr);
+
+	return true;
 }