Changes in uspace/drv/bus/isa/isa.c [8e3498b:39330200] in mainline

File:

• uspace/drv/bus/isa/isa.c (modified) (13 diffs)

uspace/drv/bus/isa/isa.c

@@ -130 +130 @@
 }
 
-static int isa_fun_enable_interrupt(ddf_fun_t *fnode, int irq)
+static errno_t isa_fun_enable_interrupt(ddf_fun_t *fnode, int irq)
 {
         isa_fun_t *fun = isa_fun(fnode);
@@ -140 +140 @@
 }
 
-static int isa_fun_disable_interrupt(ddf_fun_t *fnode, int irq)
+static errno_t isa_fun_disable_interrupt(ddf_fun_t *fnode, int irq)
 {
         isa_fun_t *fun = isa_fun(fnode);
@@ -150 +150 @@
 }
 
-static int isa_fun_clear_interrupt(ddf_fun_t *fnode, int irq)
+static errno_t isa_fun_clear_interrupt(ddf_fun_t *fnode, int irq)
 {
         isa_fun_t *fun = isa_fun(fnode);
@@ -160 +160 @@
 }
 
-static int isa_fun_setup_dma(ddf_fun_t *fnode,
+static errno_t isa_fun_setup_dma(ddf_fun_t *fnode,
     unsigned int channel, uint32_t pa, uint32_t size, uint8_t mode)
 {
@@ -182 +182 @@
 }
 
-static int isa_fun_remain_dma(ddf_fun_t *fnode,
+static errno_t isa_fun_remain_dma(ddf_fun_t *fnode,
     unsigned channel, size_t *size)
 {
@@ -232 +232 @@
 };
 
-static int isa_dev_add(ddf_dev_t *dev);
-static int isa_dev_remove(ddf_dev_t *dev);
-static int isa_fun_online(ddf_fun_t *fun);
-static int isa_fun_offline(ddf_fun_t *fun);
+static errno_t isa_dev_add(ddf_dev_t *dev);
+static errno_t isa_dev_remove(ddf_dev_t *dev);
+static errno_t isa_fun_online(ddf_fun_t *fun);
+static errno_t isa_fun_offline(ddf_fun_t *fun);
 
 /** The isa device driver's standard operations */
@@ -277 +277 @@
         int fd;
         size_t len;
-        int rc;
+        errno_t rc;
         size_t nread;
-        struct stat st;
-
-        fd = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ);
-        if (fd < 0) {
+        vfs_stat_t st;
+
+        rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Unable to open %s", conf_path);
                 goto cleanup;
@@ -578 +578 @@
             "function %s", id, score, ddf_fun_get_name(fun->fnode));
 
-        int rc = ddf_fun_add_match_id(fun->fnode, id, score);
+        errno_t rc = ddf_fun_add_match_id(fun->fnode, id, score);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed adding match ID: %s",
@@ -698 +698 @@
 }
 
-static int isa_dev_add(ddf_dev_t *dev)
+static errno_t isa_dev_add(ddf_dev_t *dev)
 {
         async_sess_t *sess;
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
@@ -767 +767 @@
 }
 
-static int isa_dev_remove(ddf_dev_t *dev)
+static errno_t isa_dev_remove(ddf_dev_t *dev)
 {
         isa_bus_t *isa = isa_bus(dev);
@@ -777 +777 @@
                     isa_fun_t, bus_link);
 
-                int rc = ddf_fun_offline(fun->fnode);
+                errno_t rc = ddf_fun_offline(fun->fnode);
                 if (rc != EOK) {
                         fibril_mutex_unlock(&isa->mutex);
@@ -807 +807 @@
 }
 
-static int isa_fun_online(ddf_fun_t *fun)
+static errno_t isa_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "isa_fun_online()");
@@ -813 +813 @@
 }
 
-static int isa_fun_offline(ddf_fun_t *fun)
+static errno_t isa_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "isa_fun_offline()");