Index: uspace/srv/hid/output/ctl/serial.c
===================================================================
--- uspace/srv/hid/output/ctl/serial.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/ctl/serial.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -60,5 +60,5 @@
 }
 
-static int serial_yield(outdev_t *dev)
+static errno_t serial_yield(outdev_t *dev)
 {
 	vt100_state_t *state = (vt100_state_t *) dev->data;
@@ -67,5 +67,5 @@
 }
 
-static int serial_claim(outdev_t *dev)
+static errno_t serial_claim(outdev_t *dev)
 {
 	vt100_state_t *state = (vt100_state_t *) dev->data;
@@ -122,5 +122,5 @@
 };
 
-int serial_init(vt100_putchar_t putchar_fn,
+errno_t serial_init(vt100_putchar_t putchar_fn,
     vt100_control_puts_t control_puts_fn, vt100_flush_t flush_fn)
 {
Index: uspace/srv/hid/output/ctl/serial.h
===================================================================
--- uspace/srv/hid/output/ctl/serial.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/ctl/serial.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -36,5 +36,5 @@
 #include "../proto/vt100.h"
 
-extern int serial_init(vt100_putchar_t, vt100_control_puts_t, vt100_flush_t);
+extern errno_t serial_init(vt100_putchar_t, vt100_control_puts_t, vt100_flush_t);
 
 #endif
Index: uspace/srv/hid/output/output.c
===================================================================
--- uspace/srv/hid/output/output.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/output.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -80,10 +80,10 @@
 static void srv_yield(ipc_callid_t iid, ipc_call_t *icall)
 {
-	int ret = EOK;
+	errno_t ret = EOK;
 	
 	list_foreach(outdevs, link, outdev_t, dev) {
 		assert(dev->ops.yield);
 		
-		int rc = dev->ops.yield(dev);
+		errno_t rc = dev->ops.yield(dev);
 		if (rc != EOK)
 			ret = rc;
@@ -95,10 +95,10 @@
 static void srv_claim(ipc_callid_t iid, ipc_call_t *icall)
 {
-	int ret = EOK;
+	errno_t ret = EOK;
 	
 	list_foreach(outdevs, link, outdev_t, dev) {
 		assert(dev->ops.claim);
 		
-		int rc = dev->ops.claim(dev);
+		errno_t rc = dev->ops.claim(dev);
 		if (rc != EOK)
 			ret = rc;
@@ -170,5 +170,5 @@
 	}
 	
-	int rc = async_share_out_finalize(callid, &frontbuf->data);
+	errno_t rc = async_share_out_finalize(callid, &frontbuf->data);
 	if ((rc != EOK) || (frontbuf->data == AS_MAP_FAILED)) {
 		free(frontbuf);
@@ -467,5 +467,5 @@
 	/* Register server */
 	async_set_fallback_port_handler(client_connection, NULL);
-	int rc = loc_server_register(NAME);
+	errno_t rc = loc_server_register(NAME);
 	if (rc != EOK) {
 		printf("%s: Unable to register driver\n", NAME);
Index: uspace/srv/hid/output/output.h
===================================================================
--- uspace/srv/hid/output/output.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/output.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -42,6 +42,6 @@
 
 typedef struct {
-	int (* yield)(struct outdev *dev);
-	int (* claim)(struct outdev *dev);
+	errno_t (* yield)(struct outdev *dev);
+	errno_t (* claim)(struct outdev *dev);
 	
 	void (* get_dimensions)(struct outdev *dev, sysarg_t *cols,
Index: uspace/srv/hid/output/port/chardev.c
===================================================================
--- uspace/srv/hid/output/port/chardev.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/port/chardev.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -99,5 +99,5 @@
 	service_id_t *svc;
 	size_t svcs;
-	int rc;
+	errno_t rc;
 
 	rc = loc_category_get_svcs(serial_cat_id, &svc, &svcs);
@@ -157,5 +157,5 @@
 static void check_for_dev(void)
 {
-	int rc;
+	errno_t rc;
 	bool found;
 	service_id_t sid;
@@ -205,5 +205,5 @@
 }
 
-int chardev_init(void)
+errno_t chardev_init(void)
 {
 	if (!config_key_exists("console")) {
@@ -224,5 +224,5 @@
 	}
 
-	int rc = loc_category_get_id("serial", &serial_cat_id, IPC_FLAG_BLOCKING);
+	errno_t rc = loc_category_get_id("serial", &serial_cat_id, IPC_FLAG_BLOCKING);
 	if (rc != EOK) {
 		printf("%s: Failed to get \"serial\" category ID.\n", NAME);
Index: uspace/srv/hid/output/port/chardev.h
===================================================================
--- uspace/srv/hid/output/port/chardev.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/port/chardev.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -33,5 +33,5 @@
 #define OUTPUT_PORT_CHARDEV_H_
 
-extern int chardev_init(void);
+extern errno_t chardev_init(void);
 
 #endif
Index: uspace/srv/hid/output/port/ega.c
===================================================================
--- uspace/srv/hid/output/port/ega.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/port/ega.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -117,10 +117,10 @@
 }
 
-static int ega_yield(outdev_t *dev)
+static errno_t ega_yield(outdev_t *dev)
 {
 	return EOK;
 }
 
-static int ega_claim(outdev_t *dev)
+static errno_t ega_claim(outdev_t *dev)
 {
 	return EOK;
@@ -183,8 +183,8 @@
 };
 
-int ega_init(void)
+errno_t ega_init(void)
 {
 	sysarg_t present;
-	int rc = sysinfo_get_value("fb", &present);
+	errno_t rc = sysinfo_get_value("fb", &present);
 	if (rc != EOK)
 		present = false;
Index: uspace/srv/hid/output/port/ega.h
===================================================================
--- uspace/srv/hid/output/port/ega.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/port/ega.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -33,5 +33,5 @@
 #define OUTPUT_PORT_EGA_H_
 
-extern int ega_init(void);
+extern errno_t ega_init(void);
 
 #endif
Index: uspace/srv/hid/output/port/kfb.c
===================================================================
--- uspace/srv/hid/output/port/kfb.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/port/kfb.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -419,5 +419,5 @@
 }
 
-static int kfb_yield(fbdev_t *dev)
+static errno_t kfb_yield(fbdev_t *dev)
 {
 	if (kfb.backbuf == NULL) {
@@ -435,5 +435,5 @@
 }
 
-static int kfb_claim(fbdev_t *dev)
+static errno_t kfb_claim(fbdev_t *dev)
 {
 	if (kfb.backbuf == NULL)
@@ -460,5 +460,5 @@
 }
 
-static int kfb_get_resolution(fbdev_t *dev, sysarg_t *width, sysarg_t *height)
+static errno_t kfb_get_resolution(fbdev_t *dev, sysarg_t *width, sysarg_t *height)
 {
 	*width = kfb.width;
@@ -474,5 +474,5 @@
 }
 
-static int kfb_vp_create(fbdev_t *dev, fbvp_t *vp)
+static errno_t kfb_vp_create(fbdev_t *dev, fbvp_t *vp)
 {
 	kfb_vp_t *kfb_vp = malloc(sizeof(kfb_vp_t));
@@ -620,8 +620,8 @@
 }
 
-int kfb_init(void)
+errno_t kfb_init(void)
 {
 	sysarg_t present;
-	int rc = sysinfo_get_value("fb", &present);
+	errno_t rc = sysinfo_get_value("fb", &present);
 	if (rc != EOK)
 		present = false;
Index: uspace/srv/hid/output/port/kfb.h
===================================================================
--- uspace/srv/hid/output/port/kfb.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/port/kfb.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -37,5 +37,5 @@
 #define FB_PORT_KFB_H_
 
-extern int kfb_init(void);
+extern errno_t kfb_init(void);
 
 #endif
Index: uspace/srv/hid/output/proto/vt100.c
===================================================================
--- uspace/srv/hid/output/proto/vt100.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/proto/vt100.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -181,10 +181,10 @@
 }
 
-int vt100_yield(vt100_state_t *state)
+errno_t vt100_yield(vt100_state_t *state)
 {
 	return EOK;
 }
 
-int vt100_claim(vt100_state_t *state)
+errno_t vt100_claim(vt100_state_t *state)
 {
 	return EOK;
Index: uspace/srv/hid/output/proto/vt100.h
===================================================================
--- uspace/srv/hid/output/proto/vt100.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/srv/hid/output/proto/vt100.h	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -56,6 +56,6 @@
 extern void vt100_state_destroy(vt100_state_t *);
 
-extern int vt100_yield(vt100_state_t *);
-extern int vt100_claim(vt100_state_t *);
+extern errno_t vt100_yield(vt100_state_t *);
+extern errno_t vt100_claim(vt100_state_t *);
 extern void vt100_get_dimensions(vt100_state_t *, sysarg_t *, sysarg_t *);