Changeset 46577995 in mainline for uspace/drv/block/ddisk/ddisk.c

Timestamp:

2018-01-04T20:50:52Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

e211ea04

Parents:

facacc71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

After this commit, HelenOS is free of code that mixes error codes with non-error
values on the assumption that error codes are negative.

File:

• uspace/drv/block/ddisk/ddisk.c (modified) (19 diffs)

uspace/drv/block/ddisk/ddisk.c

@@ -56 +56 @@
 #define DDISK_CMD_IRQ_DEASSERT  0x4
 
-static int ddisk_dev_add(ddf_dev_t *);
-static int ddisk_dev_remove(ddf_dev_t *);
-static int ddisk_dev_gone(ddf_dev_t *);
-static int ddisk_fun_online(ddf_fun_t *);
-static int ddisk_fun_offline(ddf_fun_t *);
+static errno_t ddisk_dev_add(ddf_dev_t *);
+static errno_t ddisk_dev_remove(ddf_dev_t *);
+static errno_t ddisk_dev_gone(ddf_dev_t *);
+static errno_t ddisk_fun_online(ddf_fun_t *);
+static errno_t ddisk_fun_offline(ddf_fun_t *);
 
 static void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *);
@@ -117 +117 @@
 } ddisk_t;
 
-static int ddisk_bd_open(bd_srvs_t *, bd_srv_t *);
-static int ddisk_bd_close(bd_srv_t *);
-static int ddisk_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
-static int ddisk_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *,
+static errno_t ddisk_bd_open(bd_srvs_t *, bd_srv_t *);
+static errno_t ddisk_bd_close(bd_srv_t *);
+static errno_t ddisk_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
+static errno_t ddisk_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *,
     size_t);
-static int ddisk_bd_get_block_size(bd_srv_t *, size_t *);
-static int ddisk_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t ddisk_bd_get_block_size(bd_srv_t *, size_t *);
+static errno_t ddisk_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
 
 bd_ops_t ddisk_bd_ops = {
@@ -188 +188 @@
 }
 
-int ddisk_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
-{
-        return EOK;
-}
-
-int ddisk_bd_close(bd_srv_t *bd)
+errno_t ddisk_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+{
+        return EOK;
+}
+
+errno_t ddisk_bd_close(bd_srv_t *bd)
 {
         return EOK;
@@ -199 +199 @@
 
 static
-int ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf)
+errno_t ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf)
 {
         fibril_mutex_lock(&ddisk->lock);
@@ -236 +236 @@
 
 static
-int ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
+errno_t ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
     size_t size, bool is_read)
 {
         ddisk_t *ddisk = (ddisk_t *) bd->srvs->sarg;
         aoff64_t i;
-        int rc;
+        errno_t rc;
 
         if (size < cnt * DDISK_BLOCK_SIZE)
@@ -256 +256 @@
 }
 
-int ddisk_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
+errno_t ddisk_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
     size_t size)
 {
@@ -262 +262 @@
 }
 
-int ddisk_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+errno_t ddisk_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
     const void *buf, size_t size)
 {
@@ -268 +268 @@
 }
 
-int ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
+errno_t ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
         *rsize = DDISK_BLOCK_SIZE; 
@@ -274 +274 @@
 }
 
-int ddisk_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+errno_t ddisk_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
         ddisk_t *ddisk = (ddisk_t *) bd->srvs->sarg;
@@ -282 +282 @@
 }
 
-static int ddisk_get_res(ddf_dev_t *dev, ddisk_res_t *ddisk_res)
+static errno_t ddisk_get_res(ddf_dev_t *dev, ddisk_res_t *ddisk_res)
 {
         async_sess_t *parent_sess;
         hw_res_list_parsed_t hw_res;
-        int rc;
+        errno_t rc;
 
         parent_sess = ddf_dev_parent_sess_get(dev);
@@ -317 +317 @@
 }
 
-static int ddisk_fun_create(ddisk_t *ddisk)
-{
-        int rc;
+static errno_t ddisk_fun_create(ddisk_t *ddisk)
+{
+        errno_t rc;
         ddf_fun_t *fun = NULL;
 
@@ -350 +350 @@
 }
 
-static int ddisk_fun_remove(ddisk_t *ddisk)
-{
-        int rc;
+static errno_t ddisk_fun_remove(ddisk_t *ddisk)
+{
+        errno_t rc;
 
         if (ddisk->fun == NULL)
@@ -381 +381 @@
 }
 
-static int ddisk_fun_unbind(ddisk_t *ddisk)
-{
-        int rc;
+static errno_t ddisk_fun_unbind(ddisk_t *ddisk)
+{
+        errno_t rc;
 
         if (ddisk->fun == NULL)
@@ -410 +410 @@
  * @return     EOK on success or an error code.
  */
-static int ddisk_dev_add(ddf_dev_t *dev)
+static errno_t ddisk_dev_add(ddf_dev_t *dev)
 {
         ddisk_t *ddisk;
         ddisk_res_t res;
-        int rc;
+        errno_t rc;
 
         /*
@@ -530 +530 @@
 
 
-static int ddisk_dev_remove_common(ddisk_t *ddisk, bool surprise)
-{
-        int rc;
+static errno_t ddisk_dev_remove_common(ddisk_t *ddisk, bool surprise)
+{
+        errno_t rc;
 
         if (!surprise)
@@ -558 +558 @@
 }
 
-static int ddisk_dev_remove(ddf_dev_t *dev)
+static errno_t ddisk_dev_remove(ddf_dev_t *dev)
 {
         ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev);
@@ -566 +566 @@
 }
 
-static int ddisk_dev_gone(ddf_dev_t *dev)
+static errno_t ddisk_dev_gone(ddf_dev_t *dev)
 {
         ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev);
@@ -574 +574 @@
 }
 
-static int ddisk_fun_online(ddf_fun_t *fun)
+static errno_t ddisk_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "ddisk_fun_online()");
@@ -580 +580 @@
 }
 
-static int ddisk_fun_offline(ddf_fun_t *fun)
+static errno_t ddisk_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "ddisk_fun_offline()");