Index: kernel/genarch/src/kbd/i8042.c
===================================================================
--- kernel/genarch/src/kbd/i8042.c	(revision c852b948487828f2999f9394d236b1369615a759)
+++ kernel/genarch/src/kbd/i8042.c	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -42,5 +42,4 @@
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_pc.h>
-#include <arch/drivers/i8042.h>
 #include <cpu.h>
 #include <arch/asm.h>
@@ -51,4 +50,7 @@
 #include <sysinfo/sysinfo.h>
 #include <ipc/irq.h>
+
+#define i8042_DATA	0x60
+#define i8042_STATUS	0x64
 
 /* Keyboard commands. */
@@ -137,6 +139,7 @@
 		uint8_t status;
 		
-		while (((status = i8042_status_read()) & i8042_BUFFER_FULL_MASK)) {
-			data = i8042_data_read();
+		while (((status = pio_read_8(i8042_STATUS)) &
+		    i8042_BUFFER_FULL_MASK)) {
+			data = pio_read_8(i8042_DATA);
 			
 			if ((status & i8042_MOUSE_DATA))
@@ -152,5 +155,7 @@
 
 /** Initialize i8042. */
-void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr)
+void
+i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno,
+    inr_t mouse_inr)
 {
 	chardev_initialize("i8042_kbd", &kbrd, &ops);
@@ -179,6 +184,7 @@
 	 */
 	int i;
-	for (i = 0; (i8042_status_read() & i8042_BUFFER_FULL_MASK) && i < 100; i++) {
-		i8042_data_read();
+	for (i = 0; (pio_read_8(i8042_STATUS) & i8042_BUFFER_FULL_MASK) &&
+	    i < 100; i++) {
+		(void) pio_read_8(i8042_DATA);
 	}
 	
@@ -213,7 +219,8 @@
 		uint8_t x;
 		
-		while (!(i8042_status_read() & i8042_BUFFER_FULL_MASK));
+		while (!(pio_read_8(i8042_STATUS) & i8042_BUFFER_FULL_MASK))
+			;
 		
-		x = i8042_data_read();
+		x = pio_read_8(i8042_STATUS);
 		if (x & KEY_RELEASE)
 			key_released(x ^ KEY_RELEASE);