regression: test serial port r/w.

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

-#include <lunaix/dirent.h>

 #include <lunaix/fs.h>
 #include <lunaix/fs/devfs.h>
 #include <lunaix/spike.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;
 
 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;
 
 
     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


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


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


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


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