Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision b8f1a349f67ca808434a9c0b6754d78161794063)
+++ uspace/srv/hid/console/console.c	(revision c80be58a26efdf2f8b80757c67a3bf08f80ab522)
@@ -129,5 +129,5 @@
 static void cons_set_rgb_color(con_srv_t *, pixel_t, pixel_t);
 static void cons_set_cursor_visibility(con_srv_t *, bool);
-static int cons_get_event(con_srv_t *, kbd_event_t *);
+static int cons_get_event(con_srv_t *, cons_event_t *);
 
 static con_ops_t con_ops = {
@@ -490,5 +490,5 @@
 }
 
-static int cons_get_event(con_srv_t *srv, kbd_event_t *event)
+static int cons_get_event(con_srv_t *srv, cons_event_t *event)
 {
 	console_t *cons = srv_to_console(srv);
@@ -496,5 +496,6 @@
 	kbd_event_t *kevent = list_get_instance(link, kbd_event_t, link);
 	
-	*event = *kevent;
+	event->type = CEV_KEY;
+	event->ev.key = *kevent;
 	free(kevent);
 	return EOK;
Index: uspace/srv/hid/remcons/remcons.c
===================================================================
--- uspace/srv/hid/remcons/remcons.c	(revision b8f1a349f67ca808434a9c0b6754d78161794063)
+++ uspace/srv/hid/remcons/remcons.c	(revision c80be58a26efdf2f8b80757c67a3bf08f80ab522)
@@ -80,5 +80,5 @@
 static int remcons_get_size(con_srv_t *, sysarg_t *, sysarg_t *);
 static int remcons_get_color_cap(con_srv_t *, console_caps_t *);
-static int remcons_get_event(con_srv_t *, kbd_event_t *);
+static int remcons_get_event(con_srv_t *, cons_event_t *);
 
 static con_ops_t con_ops = {
@@ -185,10 +185,11 @@
 }
 
-static int remcons_get_event(con_srv_t *srv, kbd_event_t *event)
-{
-	telnet_user_t *user = srv_to_user(srv);
+static int remcons_get_event(con_srv_t *srv, cons_event_t *event)
+{
+	telnet_user_t *user = srv_to_user(srv);
+	kbd_event_t kevent;
 	int rc;
 
-	rc = telnet_user_get_next_keyboard_event(user, event);
+	rc = telnet_user_get_next_keyboard_event(user, &kevent);
 	if (rc != EOK) {
 		/* XXX What? */
@@ -196,4 +197,7 @@
 		return EOK;
 	}
+
+	event->type = CEV_KEY;
+	event->ev.key = kevent;
 
 	return EOK;