refactor: make pci device driver loading passive, pci bus scanner will not load them...

[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..f586addca408066d9c44ee2d0a470df02e0d4af1 100644 (file)
--- a/lunaix-os/kernel/device/devfs.c
+++ b/lunaix-os/kernel/device/devfs.c
@@ -3,7 +3,7 @@
 #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;


@@ -15,11 +15,11 @@ devfs_read(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 
     struct device* dev = (struct device*)inode->data;
 
 
     struct device* dev = (struct device*)inode->data;
 

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

         return ENOTSUP;
     }
 
         return ENOTSUP;
     }
 

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

 }
 
 int
 }
 
 int


@@ -29,39 +29,39 @@ devfs_write(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 
     struct device* dev = (struct device*)inode->data;
 
 
     struct device* dev = (struct device*)inode->data;
 

-    if (!dev->write) {
+    if (!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);
 
     struct device* dev = (struct device*)inode->data;
 
 {
     assert(inode->data);
 
     struct device* dev = (struct device*)inode->data;
 

-    if (!dev->read_page) {
+    if (!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);
 
     struct device* dev = (struct device*)inode->data;
 
 {
     assert(inode->data);
 
     struct device* dev = (struct device*)inode->data;
 

-    if (!dev->read_page) {
+    if (!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


@@ -73,8 +73,10 @@ devfs_get_itype(struct device* dev)
         itype = VFS_IFDIR;
     } else if (dev_if == DEV_IFVOL) {
         itype |= VFS_IFVOLDEV;
         itype = VFS_IFDIR;
     } else if (dev_if == DEV_IFVOL) {
         itype |= VFS_IFVOLDEV;

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

         itype |= VFS_IFSEQDEV;
         itype |= VFS_IFSEQDEV;

+    } else {
+        itype |= VFS_IFDEV;

     }
     return itype;
 }
     }
     return itype;
 }


@@ -96,10 +98,10 @@ devfs_mknod(struct v_dnode* dnode, struct device* 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);
 


@@ -178,6 +180,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,