Index: uspace/srv/bd/sata_bd/sata_bd.c
===================================================================
--- uspace/srv/bd/sata_bd/sata_bd.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
+++ uspace/srv/bd/sata_bd/sata_bd.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -60,10 +60,10 @@
 static int disk_count;
 
-static int sata_bd_open(bd_srvs_t *, bd_srv_t *);
-static int sata_bd_close(bd_srv_t *);
-static int sata_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
-static int sata_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
-static int sata_bd_get_block_size(bd_srv_t *, size_t *);
-static int sata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t sata_bd_open(bd_srvs_t *, bd_srv_t *);
+static errno_t sata_bd_close(bd_srv_t *);
+static errno_t sata_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
+static errno_t sata_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
+static errno_t sata_bd_get_block_size(bd_srv_t *, size_t *);
+static errno_t sata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
 
 static bd_ops_t sata_bd_ops = {
@@ -88,10 +88,10 @@
  *
  */
-static int scan_device_tree(devman_handle_t funh)
+static errno_t scan_device_tree(devman_handle_t funh)
 {
 	devman_handle_t devh;
 	devman_handle_t *cfuns;
 	size_t count, i;
-	int rc;
+	errno_t rc;
 		
 	/* If device is SATA, add device to the disk array. */
@@ -148,8 +148,8 @@
  *
  */
-static int get_sata_disks(void)
+static errno_t get_sata_disks(void)
 {
 	devman_handle_t root_fun;
-	int rc;
+	errno_t rc;
 	
 	disk_count = 0;
@@ -190,5 +190,5 @@
 
 /** Open device. */
-static int sata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static errno_t sata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
 	return EOK;
@@ -196,5 +196,5 @@
 
 /** Close device. */
-static int sata_bd_close(bd_srv_t *bd)
+static errno_t sata_bd_close(bd_srv_t *bd)
 {
 	return EOK;
@@ -202,5 +202,5 @@
 
 /** Read blocks from partition. */
-static int sata_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
+static errno_t sata_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
     size_t size)
 {
@@ -214,5 +214,5 @@
 
 /** Write blocks to partition. */
-static int sata_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+static errno_t sata_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
     const void *buf, size_t size)
 {
@@ -226,5 +226,5 @@
 
 /** Get device block size. */
-static int sata_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
+static errno_t sata_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
 	sata_bd_dev_t *sbd = bd_srv_sata(bd);
@@ -235,5 +235,5 @@
 
 /** Get number of blocks on device. */
-static int sata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+static errno_t sata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
 	sata_bd_dev_t *sbd = bd_srv_sata(bd);
@@ -246,5 +246,5 @@
 int main(int argc, char **argv)
 {
-	int rc;
+	errno_t rc;
 	category_id_t disk_cat;