ld-tool portability fix: MacOS build experience

[lunaix-os.git] / lunaix-os / kernel / device / devfs.c

diff --git a/lunaix-os/kernel/device/devfs.c b/lunaix-os/kernel/device/devfs.c
index 012f9190f7b1b54433eba624adf4fca4987dd07a..350bbd65e447ab64ed5b50de1757490ef75a27a4 100644 (file)
--- a/lunaix-os/kernel/device/devfs.c
+++ b/lunaix-os/kernel/device/devfs.c
@@ -1,9 +1,10 @@
 #include <lunaix/device.h>
 #include <lunaix/device.h>

-#include <lunaix/dirent.h>

 #include <lunaix/fs.h>
 #include <lunaix/fs/devfs.h>
 #include <lunaix/spike.h>
 
 #include <lunaix/fs.h>
 #include <lunaix/fs/devfs.h>
 #include <lunaix/spike.h>
 

+#include <usr/lunaix/dirent_defs.h>
+

 extern struct v_inode_ops devfs_inode_ops;
 extern struct v_file_ops devfs_file_ops;
 
 extern struct v_inode_ops devfs_inode_ops;
 extern struct v_file_ops devfs_file_ops;
 


@@ -12,13 +13,13 @@ devfs_read(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 {
     assert(inode->data);
 
 {
     assert(inode->data);
 

-    struct device* dev = (struct device*)inode->data;
+    struct device* dev = resolve_device(inode->data);

 
 

-    if (!dev->read) {
+    if (!dev || !dev->ops.read) {

         return ENOTSUP;
     }
 
         return ENOTSUP;
     }
 

-    return dev->read(dev, buffer, fpos, len);
+    return dev->ops.read(dev, buffer, fpos, len);

 }
 
 int
 }
 
 int


@@ -26,51 +27,83 @@ devfs_write(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 {
     assert(inode->data);
 
 {
     assert(inode->data);
 

-    struct device* dev = (struct device*)inode->data;
+    struct device* dev = resolve_device(inode->data);
+
+    if (!dev || !dev->ops.write) {
+        return ENOTSUP;
+    }
+
+    return dev->ops.write(dev, buffer, fpos, len);
+}
+
+int
+devfs_read_page(struct v_inode* inode, void* buffer, size_t fpos)
+{
+    assert(inode->data);
+
+    struct device* dev = resolve_device(inode->data);

 
 

-    if (!dev->write) {
+    if (!dev || !dev->ops.read_page) {

         return ENOTSUP;
     }
 
         return ENOTSUP;
     }
 

-    return dev->write(dev, buffer, fpos, len);
+    return dev->ops.read_page(dev, buffer, fpos);

 }
 
 int
 }
 
 int

-devfs_get_itype(struct device* dev)
+devfs_write_page(struct v_inode* inode, void* buffer, size_t fpos)
+{
+    assert(inode->data);
+
+    struct device* dev = resolve_device(inode->data);
+
+    if (!dev || !dev->ops.read_page) {
+        return ENOTSUP;
+    }
+
+    return dev->ops.read_page(dev, buffer, fpos);
+}
+
+int
+devfs_get_itype(struct device_meta* dm)

 {
     int itype = VFS_IFFILE;
 {
     int itype = VFS_IFFILE;

+
+    if (valid_device_subtype_ref(dm, DEV_CAT)) {
+        return VFS_IFDIR;
+    }
+
+    struct device* dev = resolve_device(dm);

     int dev_if = dev->dev_type & DEV_MSKIF;
     int dev_if = dev->dev_type & DEV_MSKIF;

-    if (dev_if == DEV_IFCAT) {
-        itype = VFS_IFDIR;
-    } else if (dev_if == DEV_IFVOL) {
+    
+    if (dev_if == DEV_IFVOL) {

         itype |= VFS_IFVOLDEV;
         itype |= VFS_IFVOLDEV;

-    } else {
+    } else if (dev_if == DEV_IFSEQ) {

         itype |= VFS_IFSEQDEV;
         itype |= VFS_IFSEQDEV;

+    } else {
+        itype |= VFS_IFDEV;

     }
     return itype;
 }
 
 int
     }
     return itype;
 }
 
 int

-devfs_get_dtype(struct device* dev)
+devfs_get_dtype(struct device_meta* dev)

 {
 {

-    switch (dev->dev_type & DEV_MSKIF) {
-        case DEV_IFCAT:
-            return DT_DIR;
-
-        default:
-            return DT_FILE;
+    if (valid_device_subtype_ref(dev, DEV_CAT)) {
+        return DT_DIR;

     }
     }

+    return DT_FILE;

 }
 
 int
 }
 
 int

-devfs_mknod(struct v_dnode* dnode, struct device* dev)
+devfs_mknod(struct v_dnode* dnode, struct device_meta* dev)

 {
     assert(dev);
 
 {
     assert(dev);
 

-    struct v_inode* devnod = vfs_i_find(dnode->super_block, dev->dev_id);
+    struct v_inode* devnod = vfs_i_find(dnode->super_block, dev->dev_uid);

     if (!devnod) {
         if ((devnod = vfs_i_alloc(dnode->super_block))) {
     if (!devnod) {
         if ((devnod = vfs_i_alloc(dnode->super_block))) {

-            devnod->id = dev->dev_id;
+            devnod->id = dev->dev_uid;

             devnod->data = dev;
             devnod->itype = devfs_get_itype(dev);
 
             devnod->data = dev;
             devnod->itype = devfs_get_itype(dev);
 


@@ -87,22 +120,40 @@ devfs_mknod(struct v_dnode* dnode, struct device* dev)
 int
 devfs_dirlookup(struct v_inode* this, struct v_dnode* dnode)
 {
 int
 devfs_dirlookup(struct v_inode* this, struct v_dnode* dnode)
 {

-    struct device* dev =
-      device_getbyhname((struct device*)this->data, &dnode->name);
+    void* data = this->data;
+    struct device_meta* rootdev = resolve_device_meta(data);
+
+    if (data && !rootdev) {
+        return ENOTDIR;
+    }
+
+    struct device_meta* dev =
+      device_getbyhname(rootdev, &dnode->name);
+    

     if (!dev) {
         return ENOENT;
     }
     if (!dev) {
         return ENOENT;
     }

+

     return devfs_mknod(dnode, dev);
 }
 
 int
 devfs_readdir(struct v_file* file, struct dir_context* dctx)
 {
     return devfs_mknod(dnode, dev);
 }
 
 int
 devfs_readdir(struct v_file* file, struct dir_context* dctx)
 {

-    struct device* dev =
-      device_getbyoffset((struct device*)(file->inode->data), dctx->index);
+    void* data = file->inode->data;
+    struct device_meta* rootdev = resolve_device_meta(data);
+
+    if (data && !rootdev) {
+        return ENOTDIR;
+    }
+
+    struct device_meta* dev =
+      device_getbyoffset(rootdev, dctx->index);
+    

     if (!dev) {
         return 0;
     }
     if (!dev) {
         return 0;
     }

+

     dctx->read_complete_callback(
       dctx, dev->name.value, dev->name.len, devfs_get_dtype(dev));
     return 1;
     dctx->read_complete_callback(
       dctx, dev->name.value, dev->name.len, devfs_get_dtype(dev));
     return 1;


@@ -149,6 +200,7 @@ devfs_init()
     fs->mount = devfs_mount;
     fs->unmount = devfs_unmount;
 }
     fs->mount = devfs_mount;
     fs->unmount = devfs_unmount;
 }

+EXPORT_FILE_SYSTEM(devfs, devfs_init);

 
 struct v_inode_ops devfs_inode_ops = { .dir_lookup = devfs_dirlookup,
                                        .open = default_inode_open,
 
 struct v_inode_ops devfs_inode_ops = { .dir_lookup = devfs_dirlookup,
                                        .open = default_inode_open,


@@ -157,6 +209,8 @@ struct v_inode_ops devfs_inode_ops = { .dir_lookup = devfs_dirlookup,
 
 struct v_file_ops devfs_file_ops = { .close = default_file_close,
                                      .read = devfs_read,
 
 struct v_file_ops devfs_file_ops = { .close = default_file_close,
                                      .read = devfs_read,

+                                     .read_page = devfs_read_page,

                                      .write = devfs_write,
                                      .write = devfs_write,

+                                     .write_page = devfs_write_page,

                                      .seek = default_file_seek,
                                      .readdir = devfs_readdir };
\ No newline at end of file
                                      .seek = default_file_seek,
                                      .readdir = devfs_readdir };
\ No newline at end of file