X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/a36758a5018f6a3792c164cd2a313d4f61b7111e..6f6da1abb22dff69dbb710bd2fd9d95f083f2b43:/lunaix-os/kernel/device/devfs.c

diff --git a/lunaix-os/kernel/device/devfs.c b/lunaix-os/kernel/device/devfs.c
index c265c4b..1a49b05 100644
--- a/lunaix-os/kernel/device/devfs.c
+++ b/lunaix-os/kernel/device/devfs.c
@@ -1,9 +1,10 @@
 #include <lunaix/device.h>
-#include <lunaix/dirent.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;
 
@@ -14,11 +15,11 @@ devfs_read(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 
     struct device* dev = (struct device*)inode->data;
 
-    if (!dev->read) {
+    if (!dev->ops.read) {
         return ENOTSUP;
     }
 
-    return dev->read(dev, buffer, fpos, len);
+    return dev->ops.read(dev, buffer, fpos, len);
 }
 
 int
@@ -28,11 +29,11 @@ devfs_write(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 
     struct device* dev = (struct device*)inode->data;
 
-    if (!dev->write) {
+    if (!dev->ops.write) {
         return ENOTSUP;
     }
 
-    return dev->write(dev, buffer, fpos, len);
+    return dev->ops.write(dev, buffer, fpos, len);
 }
 
 int
@@ -42,11 +43,11 @@ devfs_read_page(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 
     struct device* dev = (struct device*)inode->data;
 
-    if (!dev->read_page) {
+    if (!dev->ops.read_page) {
         return ENOTSUP;
     }
 
-    return dev->read_page(dev, buffer, fpos);
+    return dev->ops.read_page(dev, buffer, fpos);
 }
 
 int
@@ -56,11 +57,11 @@ devfs_write_page(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 
     struct device* dev = (struct device*)inode->data;
 
-    if (!dev->read_page) {
+    if (!dev->ops.read_page) {
         return ENOTSUP;
     }
 
-    return dev->read_page(dev, buffer, fpos);
+    return dev->ops.read_page(dev, buffer, fpos);
 }
 
 int
@@ -72,8 +73,10 @@ devfs_get_itype(struct device* dev)
         itype = VFS_IFDIR;
     } else if (dev_if == DEV_IFVOL) {
         itype |= VFS_IFVOLDEV;
-    } else {
+    } else if (dev_if == DEV_IFSEQ) {
         itype |= VFS_IFSEQDEV;
+    } else {
+        itype |= VFS_IFDEV;
     }
     return itype;
 }
@@ -95,10 +98,10 @@ devfs_mknod(struct v_dnode* dnode, struct device* 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))) {
-            devnod->id = dev->dev_id;
+            devnod->id = dev->dev_uid;
             devnod->data = dev;
             devnod->itype = devfs_get_itype(dev);
 
@@ -177,6 +180,7 @@ devfs_init()
     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,