Index: uspace/srv/hid/input/Makefile
===================================================================
--- uspace/srv/hid/input/Makefile	(revision 9d8b12da8c497c2a0001860cd8545439328c6071)
+++ uspace/srv/hid/input/Makefile	(revision ee98e810ea2a9bf27df414e9fef9eb6ec515a7db)
@@ -40,5 +40,4 @@
 	port/adb_mouse.c \
 	port/chardev.c \
-	port/msim.c \
 	port/niagara.c \
 	proto/adb.c \
Index: uspace/srv/hid/input/input.c
===================================================================
--- uspace/srv/hid/input/input.c	(revision 9d8b12da8c497c2a0001860cd8545439328c6071)
+++ uspace/srv/hid/input/input.c	(revision ee98e810ea2a9bf27df414e9fef9eb6ec515a7db)
@@ -641,5 +641,5 @@
 #endif
 #if defined(MACHINE_msim)
-	kbd_add_dev(&msim_port, &stty_ctl);
+	kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
 #if defined(UARCH_ppc32)
Index: uspace/srv/hid/input/kbd_port.h
===================================================================
--- uspace/srv/hid/input/kbd_port.h	(revision 9d8b12da8c497c2a0001860cd8545439328c6071)
+++ uspace/srv/hid/input/kbd_port.h	(revision ee98e810ea2a9bf27df414e9fef9eb6ec515a7db)
@@ -49,5 +49,4 @@
 extern kbd_port_ops_t adb_port;
 extern kbd_port_ops_t chardev_port;
-extern kbd_port_ops_t msim_port;
 extern kbd_port_ops_t niagara_port;
 extern kbd_port_ops_t ns16550_port;
Index: uspace/srv/hid/input/port/chardev.c
===================================================================
--- uspace/srv/hid/input/port/chardev.c	(revision 9d8b12da8c497c2a0001860cd8545439328c6071)
+++ uspace/srv/hid/input/port/chardev.c	(revision ee98e810ea2a9bf27df414e9fef9eb6ec515a7db)
@@ -61,5 +61,5 @@
 	/** S3C24xx UART - Openmoko debug console */
 	"char/s3c24xx_uart",
-	/** Ski console */
+	/** Ski console, MSIM console */
 	"devices/\\hw\\console\\a"
 };
@@ -75,5 +75,5 @@
 	
 	kbd_dev = kdev;
-	
+again:
 	for (i = 0; i < num_devs; i++) {
 		rc = loc_service_get_id(in_devs[i], &service_id, 0);
@@ -83,6 +83,8 @@
 	
 	if (i >= num_devs) {
-		printf("%s: Could not find any suitable input device\n", NAME);
-		return -1;
+		/* XXX This is just a hack. */
+		printf("%s: No input device found, sleep for retry.\n", NAME);
+		async_usleep(1000 * 1000);
+		goto again;
 	}
 	
@@ -113,4 +115,5 @@
 	}
 	
+	printf("%s: Found input device '%s'\n", NAME, in_devs[i]);
 	return 0;
 }
Index: uspace/srv/hid/input/port/msim.c
===================================================================
--- uspace/srv/hid/input/port/msim.c	(revision 9d8b12da8c497c2a0001860cd8545439328c6071)
+++ 	(revision )
@@ -1,110 +1,0 @@
-/*
- * Copyright (c) 2006 Josef Cejka
- * Copyright (c) 2011 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup kbd_port
- * @ingroup  kbd
- * @{
- */
-/** @file
- * @brief Msim keyboard port driver.
- */
-
-#include <async.h>
-#include <sysinfo.h>
-#include <ddi.h>
-#include <errno.h>
-#include "../kbd_port.h"
-#include "../kbd.h"
-
-static int msim_port_init(kbd_dev_t *);
-static void msim_port_write(uint8_t data);
-
-kbd_port_ops_t msim_port = {
-	.init = msim_port_init,
-	.write = msim_port_write
-};
-
-static kbd_dev_t *kbd_dev;
-
-static irq_pio_range_t msim_ranges[] = {
-	{
-		.base = 0,
-		.size = 1
-	}
-};
-
-static irq_cmd_t msim_cmds[] = {
-	{
-		.cmd = CMD_PIO_READ_8,
-		.addr = (void *) 0,	/* will be patched in run-time */
-		.dstarg = 2
-	},
-	{
-		.cmd = CMD_ACCEPT
-	}
-};
-
-static irq_code_t msim_kbd = {
-	sizeof(msim_ranges) / sizeof(irq_pio_range_t),
-	msim_ranges,
-	sizeof(msim_cmds) / sizeof(irq_cmd_t),
-	msim_cmds
-};
-
-static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg)
-{
-	kbd_push_data(kbd_dev, IPC_GET_ARG2(*call));
-}
-
-static int msim_port_init(kbd_dev_t *kdev)
-{
-	kbd_dev = kdev;
-
-	sysarg_t paddr;
-	if (sysinfo_get_value("kbd.address.physical", &paddr) != EOK)
-		return -1;
-	
-	sysarg_t inr;
-	if (sysinfo_get_value("kbd.inr", &inr) != EOK)
-		return -1;
-	
-	msim_ranges[0].base = paddr;
-	msim_cmds[0].addr = (void *) paddr;
-	async_irq_subscribe(inr, msim_irq_handler, NULL, &msim_kbd);
-	
-	return 0;
-}
-
-static void msim_port_write(uint8_t data)
-{
-	(void) data;
-}
-
-/** @}
- */