Changes in uspace/drv/bus/isa/isa.c [7e9e652:ce04ea44] in mainline

File:

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

uspace/drv/bus/isa/isa.c

@@ -51 +51 @@
 #include <malloc.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <ipc/irc.h>
 #include <ipc/services.h>
-#include <sys/stat.h>
+#include <vfs/vfs.h>
 #include <irc.h>
 #include <ns.h>
@@ -254 +253 @@
         size_t len;
         ssize_t r;
-
-        fd = open(conf_path, O_RDONLY);
+        struct stat st;
+
+        fd = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ);
         if (fd < 0) {
                 ddf_msg(LVL_ERROR, "Unable to open %s", conf_path);
@@ -263 +263 @@
         opened = true;
 
-        len = lseek(fd, 0, SEEK_END);
-        lseek(fd, 0, SEEK_SET);
+        if (vfs_stat(fd, &st) != EOK) {
+                ddf_msg(LVL_ERROR, "Unable to vfs_stat %d", fd);
+                goto cleanup;
+        }
+
+        len = st.size;
         if (len == 0) {
                 ddf_msg(LVL_ERROR, "Configuration file '%s' is empty.",
@@ -277 +281 @@
         }
 
-        r = read(fd, buf, len);
+        r = vfs_read(fd, (aoff64_t []) {0}, buf, len);
         if (r < 0) {
                 ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
@@ -294 +298 @@
 
         if (opened)
-                close(fd);
+                vfs_put(fd);
 
         return buf;