Changes in uspace/srv/bd/rd/rd.c [1558d85:b7fd2a0] in mainline

File:

• uspace/srv/bd/rd/rd.c (modified) (10 diffs)

uspace/srv/bd/rd/rd.c

@@ -48 +48 @@
 #include <stdbool.h>
 #include <errno.h>
+#include <str_error.h>
 #include <async.h>
 #include <fibril_synch.h>
@@ -66 +67 @@
 static const size_t block_size = 512;
 
-static int rd_open(bd_srvs_t *, bd_srv_t *);
-static int rd_close(bd_srv_t *);
-static int rd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
-static int rd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
-static int rd_get_block_size(bd_srv_t *, size_t *);
-static int rd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t rd_open(bd_srvs_t *, bd_srv_t *);
+static errno_t rd_close(bd_srv_t *);
+static errno_t rd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
+static errno_t rd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
+static errno_t rd_get_block_size(bd_srv_t *, size_t *);
+static errno_t rd_get_num_blocks(bd_srv_t *, aoff64_t *);
 
 /** This rwlock protects the ramdisk's data.
@@ -99 +100 @@
 
 /** Open device. */
-static int rd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static errno_t rd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
         return EOK;
@@ -105 +106 @@
 
 /** Close device. */
-static int rd_close(bd_srv_t *bd)
+static errno_t rd_close(bd_srv_t *bd)
 {
         return EOK;
@@ -111 +112 @@
 
 /** Read blocks from the device. */
-static int rd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
+static errno_t rd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
     size_t size)
 {
@@ -127 +128 @@
 
 /** Write blocks to the device. */
-static int rd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+static errno_t rd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
     const void *buf, size_t size)
 {
@@ -146 +147 @@
 {
         sysarg_t size;
-        int ret = sysinfo_get_value("rd.size", &size);
+        errno_t ret = sysinfo_get_value("rd.size", &size);
         if ((ret != EOK) || (size == 0)) {
                 printf("%s: No RAM disk found\n", NAME);
@@ -179 +180 @@
         ret = loc_server_register(NAME);
         if (ret != EOK) {
-                printf("%s: Unable to register driver (%d)\n", NAME, ret);
+                printf("%s: Unable to register driver: %s\n", NAME, str_error(ret));
                 return false;
         }
@@ -196 +197 @@
 
 /** Get device block size. */
-static int rd_get_block_size(bd_srv_t *bd, size_t *rsize)
+static errno_t rd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
         *rsize = block_size;
@@ -203 +204 @@
 
 /** Get number of blocks on device. */
-static int rd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+static errno_t rd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
         *rnb = rd_size / block_size;