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 350bbd65e447ab64ed5b50de1757490ef75a27a4..28f923ab411d2aad16cf7cc4eb862f4177d8f56d 100644 (file)
--- a/lunaix-os/kernel/device/devfs.c
+++ b/lunaix-os/kernel/device/devfs.c
@@ -1,5 +1,5 @@
 #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>
 


@@ -67,7 +67,7 @@ devfs_write_page(struct v_inode* inode, void* buffer, size_t fpos)
 int
 devfs_get_itype(struct device_meta* dm)
 {
 int
 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;
 
     if (valid_device_subtype_ref(dm, DEV_CAT)) {
         return VFS_IFDIR;


@@ -78,11 +78,9 @@ devfs_get_itype(struct device_meta* dm)
     
     if (dev_if == DEV_IFVOL) {
         itype |= VFS_IFVOLDEV;
     
     if (dev_if == DEV_IFVOL) {
         itype |= VFS_IFVOLDEV;

-    } else if (dev_if == DEV_IFSEQ) {
-        itype |= VFS_IFSEQDEV;
-    } else {
-        itype |= VFS_IFDEV;

     }
     }

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

     return itype;
 }
 
     return itype;
 }
 


@@ -147,8 +145,12 @@ devfs_readdir(struct v_file* file, struct dir_context* dctx)
         return ENOTDIR;
     }
 
         return ENOTDIR;
     }
 

+    if (fsapi_handle_pseudo_dirent(file, dctx)) {
+        return 1;
+    }
+

     struct device_meta* dev =
     struct device_meta* dev =

-      device_getbyoffset(rootdev, dctx->index);
+      device_getbyoffset(rootdev, file->f_pos - 2);

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


@@ -195,10 +197,11 @@ 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);
 
 }
 EXPORT_FILE_SYSTEM(devfs, devfs_init);