Index: uspace/drv/char/i8042/i8042.c
===================================================================
--- uspace/drv/char/i8042/i8042.c	(revision ec3b125f5f825fd29b3f3e48e4724236e878e659)
+++ uspace/drv/char/i8042/i8042.c	(revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289)
@@ -142,5 +142,4 @@
 		return;
 	i8042_t *controller = dev->driver_data;
-//	fibril_mutex_lock(&controller->guard);
 
 	const uint8_t status = IPC_GET_ARG1(*call);
@@ -149,21 +148,4 @@
 	    &controller->aux_buffer : &controller->kbd_buffer;
 	buffer_write(buffer, data);
-#if 0
-	char ** buffer =
-	    aux ? &controller->aux_buffer : &controller->kbd_buffer;
-	char * buffer_end =
-	    aux ? controller->aux_buffer_end : controller->kbd_buffer_end;
-
-	if (*buffer != NULL && *buffer < buffer_end) {
-		*(*buffer) = data;
-		if (++(*buffer) == buffer_end)
-			fibril_condvar_broadcast(&controller->data_avail);
-	} else {
-		ddf_msg(LVL_WARN, "Unhandled %s data: %hhx , status: %hhx.",
-		    aux ? "AUX" : "KBD", data, status);
-	}
-
-	fibril_mutex_unlock(&controller->guard);
-#endif
 }
 /*----------------------------------------------------------------------------*/
@@ -183,5 +165,5 @@
 	if (!dev->kbd_fun)
 		return ENOMEM;
-	int ret = ddf_fun_add_match_id(dev->kbd_fun, "xtkbd", 90);
+	int ret = ddf_fun_add_match_id(dev->kbd_fun, "char/xtkbd", 90);
 	if (ret != EOK) {
 		ddf_fun_destroy(dev->kbd_fun);
@@ -195,5 +177,5 @@
 	}
 
-	ret = ddf_fun_add_match_id(dev->mouse_fun, "ps2mouse", 90);
+	ret = ddf_fun_add_match_id(dev->mouse_fun, "char/ps2mouse", 90);
 	if (ret != EOK) {
 		ddf_fun_destroy(dev->kbd_fun);
Index: uspace/drv/char/i8042/i8042.h
===================================================================
--- uspace/drv/char/i8042/i8042.h	(revision ec3b125f5f825fd29b3f3e48e4724236e878e659)
+++ uspace/drv/char/i8042/i8042.h	(revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289)
@@ -46,5 +46,5 @@
 #include "buffer.h"
 
-#define BUFFER_SIZE 12
+#define BUFFER_SIZE 64
 
 /** i8042 HW I/O interface */
Index: uspace/drv/char/ps2mouse/ps2mouse.ma
===================================================================
--- uspace/drv/char/ps2mouse/ps2mouse.ma	(revision ec3b125f5f825fd29b3f3e48e4724236e878e659)
+++ uspace/drv/char/ps2mouse/ps2mouse.ma	(revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289)
@@ -1,1 +1,1 @@
-100 ps2mouse
+100 char/ps2mouse
Index: uspace/drv/char/xtkbd/xtkbd.ma
===================================================================
--- uspace/drv/char/xtkbd/xtkbd.ma	(revision ec3b125f5f825fd29b3f3e48e4724236e878e659)
+++ uspace/drv/char/xtkbd/xtkbd.ma	(revision cf5c05c0d7db41eddaceef9f32c5f35a3fd89289)
@@ -1,1 +1,1 @@
-100 xtkbd
+100 char/xtkbd