Second Extended Filesystem (ext2) and other improvements (#33)

[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 867f93d1ca76891deb65d24f33b1c65fe6fea7d4..28f923ab411d2aad16cf7cc4eb862f4177d8f56d 100644 (file)
--- a/lunaix-os/kernel/device/devfs.c
+++ b/lunaix-os/kernel/device/devfs.c
@@ -1,9 +1,9 @@
 #include <lunaix/device.h>
 #include <lunaix/device.h>

-#include <lunaix/fs.h>
+#include <lunaix/fs/api.h>

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

-#include <sys/dirent_defs.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;


@@ -13,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


@@ -27,79 +27,81 @@ 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->write) {
+    if (!dev || !dev->ops.write) {

         return ENOTSUP;
     }
 
         return ENOTSUP;
     }
 

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

 }
 
 int
 }
 
 int

-devfs_read_page(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
+devfs_read_page(struct v_inode* inode, void* buffer, 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_page) {
+    if (!dev || !dev->ops.read_page) {

         return ENOTSUP;
     }
 
         return ENOTSUP;
     }
 

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

 }
 
 int
 }
 
 int

-devfs_write_page(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
+devfs_write_page(struct v_inode* inode, void* buffer, 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_page) {
+    if (!dev || !dev->ops.read_page) {

         return ENOTSUP;
     }
 
         return ENOTSUP;
     }
 

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

 }
 
 int
 }
 
 int

-devfs_get_itype(struct device* dev)
+devfs_get_itype(struct device_meta* dm)

 {
 {

-    int itype = VFS_IFFILE;
+    int itype = VFS_IFDEV;
+
+    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 {
-        itype |= VFS_IFSEQDEV;

     }
     }

+
+    // otherwise, the mapping is considered to be generic seq dev.

     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);
 


@@ -116,22 +118,44 @@ 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;
+    }
+
+    if (fsapi_handle_pseudo_dirent(file, dctx)) {
+        return 1;
+    }
+
+    struct device_meta* dev =
+      device_getbyoffset(rootdev, file->f_pos - 2);
+    

     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;


@@ -173,11 +197,13 @@ devfs_unmount(struct v_superblock* vsb)
 void
 devfs_init()
 {
 void
 devfs_init()
 {

-    struct filesystem* fs = fsm_new_fs("devfs", 5);
-    fsm_register(fs);
-    fs->mount = devfs_mount;
-    fs->unmount = devfs_unmount;
+    struct filesystem* fs;
+    fs = fsapi_fs_declare("devfs", FSTYPE_PSEUDO);
+    
+    fsapi_fs_set_mntops(fs, devfs_mount, devfs_unmount);
+    fsapi_fs_finalise(fs);

 }
 }

+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,