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 fb55d2403b10dfdd70ea152d92ffdbd8e6d85123..f586addca408066d9c44ee2d0a470df02e0d4af1 100644 (file)
--- a/lunaix-os/kernel/device/devfs.c
+++ b/lunaix-os/kernel/device/devfs.c
@@ -37,7 +37,7 @@ devfs_write(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 }
 
 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);
 
@@ -51,7 +51,7 @@ devfs_read_page(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 }
 
 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);
 
@@ -73,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;
 }
@@ -96,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);