Changes in uspace/drv/block/ddisk/ddisk.c [b7fd2a0:01c3bb4] in mainline

File:

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

uspace/drv/block/ddisk/ddisk.c

@@ -56 +56 @@
 #define DDISK_CMD_IRQ_DEASSERT  0x4
 
-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 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 void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *);
@@ -117 +117 @@
 } ddisk_t;
 
-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 *,
+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 *,
     size_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 *);
+static int ddisk_bd_get_block_size(bd_srv_t *, size_t *);
+static int ddisk_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
 
 bd_ops_t ddisk_bd_ops = {
@@ -188 +188 @@
 }
 
-errno_t ddisk_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
-{
-        return EOK;
-}
-
-errno_t ddisk_bd_close(bd_srv_t *bd)
+int ddisk_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+{
+        return EOK;
+}
+
+int ddisk_bd_close(bd_srv_t *bd)
 {
         return EOK;
@@ -199 +199 @@
 
 static
-errno_t ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf)
+int ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf)
 {
         fibril_mutex_lock(&ddisk->lock);
@@ -236 +236 @@
 
 static
-errno_t ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
+int 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;
-        errno_t rc;
+        int rc;
 
         if (size < cnt * DDISK_BLOCK_SIZE)
@@ -256 +256 @@
 }
 
-errno_t ddisk_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
+int ddisk_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
     size_t size)
 {
@@ -262 +262 @@
 }
 
-errno_t ddisk_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+int ddisk_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
     const void *buf, size_t size)
 {
@@ -268 +268 @@
 }
 
-errno_t ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
+int ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
         *rsize = DDISK_BLOCK_SIZE; 
@@ -274 +274 @@
 }
 
-errno_t ddisk_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+int ddisk_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
         ddisk_t *ddisk = (ddisk_t *) bd->srvs->sarg;
@@ -282 +282 @@
 }
 
-static errno_t ddisk_get_res(ddf_dev_t *dev, ddisk_res_t *ddisk_res)
+static int ddisk_get_res(ddf_dev_t *dev, ddisk_res_t *ddisk_res)
 {
         async_sess_t *parent_sess;
         hw_res_list_parsed_t hw_res;
-        errno_t rc;
+        int rc;
 
         parent_sess = ddf_dev_parent_sess_get(dev);
@@ -317 +317 @@
 }
 
-static errno_t ddisk_fun_create(ddisk_t *ddisk)
-{
-        errno_t rc;
+static int ddisk_fun_create(ddisk_t *ddisk)
+{
+        int rc;
         ddf_fun_t *fun = NULL;
 
@@ -350 +350 @@
 }
 
-static errno_t ddisk_fun_remove(ddisk_t *ddisk)
-{
-        errno_t rc;
+static int ddisk_fun_remove(ddisk_t *ddisk)
+{
+        int rc;
 
         if (ddisk->fun == NULL)
@@ -381 +381 @@
 }
 
-static errno_t ddisk_fun_unbind(ddisk_t *ddisk)
-{
-        errno_t rc;
+static int ddisk_fun_unbind(ddisk_t *ddisk)
+{
+        int rc;
 
         if (ddisk->fun == NULL)
@@ -408 +408 @@
  *
  * @param  dev New device
- * @return     EOK on success or an error code.
+ * @return     EOK on success or negative error code.
  */
-static errno_t ddisk_dev_add(ddf_dev_t *dev)
+static int ddisk_dev_add(ddf_dev_t *dev)
 {
         ddisk_t *ddisk;
         ddisk_res_t res;
-        errno_t rc;
+        int rc;
 
         /*
@@ -503 +503 @@
         ddisk_irq_commands[0].addr = (void *) &res_phys->status;
         ddisk_irq_commands[3].addr = (void *) &res_phys->command;
-        rc = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
-            ddisk_irq_handler, &ddisk_irq_code, &ddisk->irq_cap);
-        if (rc != EOK) {
+        ddisk->irq_cap = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
+            ddisk_irq_handler, &ddisk_irq_code);
+        if (ddisk->irq_cap < 0) {
+                rc = ddisk->irq_cap;
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 goto error;
@@ -530 +531 @@
 
 
-static errno_t ddisk_dev_remove_common(ddisk_t *ddisk, bool surprise)
-{
-        errno_t rc;
+static int ddisk_dev_remove_common(ddisk_t *ddisk, bool surprise)
+{
+        int rc;
 
         if (!surprise)
@@ -558 +559 @@
 }
 
-static errno_t ddisk_dev_remove(ddf_dev_t *dev)
+static int ddisk_dev_remove(ddf_dev_t *dev)
 {
         ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev);
@@ -566 +567 @@
 }
 
-static errno_t ddisk_dev_gone(ddf_dev_t *dev)
+static int ddisk_dev_gone(ddf_dev_t *dev)
 {
         ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev);
@@ -574 +575 @@
 }
 
-static errno_t ddisk_fun_online(ddf_fun_t *fun)
+static int ddisk_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "ddisk_fun_online()");
@@ -580 +581 @@
 }
 
-static errno_t ddisk_fun_offline(ddf_fun_t *fun)
+static int ddisk_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "ddisk_fun_offline()");