Index: arch/mips32/src/drivers/keyboard.c
===================================================================
--- arch/mips32/src/drivers/keyboard.c	(revision 26777587cc06315d26b419e506af97ae2163613a)
+++ arch/mips32/src/drivers/keyboard.c	(revision 8418c7d1885256e7d6e4cb637e377cbb2a1be321)
@@ -37,7 +37,12 @@
 #include <typedefs.h>
 
+static void keyboard_enable(void);
+static void keyboard_disable(void);
+
 static chardev_t kbrd;
-
-static void keyboard_enable(void);
+static chardev_operations_t ops = {
+	.resume = keyboard_enable,
+	.suspend = keyboard_disable
+};
 
 /** Initialize keyboard subsystem. */
@@ -45,31 +50,15 @@
 {
 	cp0_unmask_int(KEYBOARD_IRQ);
-	chardev_initialize(&kbrd, keyboard_enable);
+	chardev_initialize(&kbrd, &ops);
 	stdin = &kbrd;
 }
 
-/** Process keyboard interrupt.
- *
- * This function is called directly from the interrupt handler.
- * It feeds the keyboard buffer with characters read. When the buffer
- * is full, it simply masks the keyboard interrupt signal.
- */
+/** Process keyboard interrupt. */
 void keyboard(void)
 {
 	char ch;
 
-	spinlock_lock(&kbrd.lock);
-	kbrd.counter++;
-	if (kbrd.counter == CHARDEV_BUFLEN - 1) {
-	        /* buffer full => disable keyboard interrupt */
-		cp0_mask_int(KEYBOARD_IRQ);
-	}
-
 	ch = *((char *) KEYBOARD_ADDRESS);
-	putchar(ch);
-	kbrd.buffer[kbrd.index++] = ch;
-	kbrd.index = kbrd.index % CHARDEV_BUFLEN; /* index modulo size of buffer */
-	waitq_wakeup(&kbrd.wq, WAKEUP_FIRST);
-	spinlock_unlock(&kbrd.lock);
+	chardev_push_character(&kbrd, ch);
 }
 
@@ -79,2 +68,8 @@
 	cp0_unmask_int(KEYBOARD_IRQ);
 }
+
+/* Called from getc(). */
+void keyboard_disable(void)
+{
+	cp0_mask_int(KEYBOARD_IRQ);
+}