X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/5ea8e2ba737f903db81d49b56778e883634512a5..f044ca812256b421e793c4335ce1ffed74710a70:/lunaix-os/kernel/device/devfs.c

diff --git a/lunaix-os/kernel/device/devfs.c b/lunaix-os/kernel/device/devfs.c
index 0448924..fb55d24 100644
--- a/lunaix-os/kernel/device/devfs.c
+++ b/lunaix-os/kernel/device/devfs.c
@@ -3,6 +3,8 @@
 #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;
 
@@ -13,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
@@ -27,11 +29,39 @@ 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
+devfs_read_page(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
+{
+    assert(inode->data);
+
+    struct device* dev = (struct device*)inode->data;
+
+    if (!dev->ops.read_page) {
+        return ENOTSUP;
+    }
+
+    return dev->ops.read_page(dev, buffer, fpos);
+}
+
+int
+devfs_write_page(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
+{
+    assert(inode->data);
+
+    struct device* dev = (struct device*)inode->data;
+
+    if (!dev->ops.read_page) {
+        return ENOTSUP;
+    }
+
+    return dev->ops.read_page(dev, buffer, fpos);
 }
 
 int
@@ -49,6 +79,18 @@ devfs_get_itype(struct device* dev)
     return itype;
 }
 
+int
+devfs_get_dtype(struct device* dev)
+{
+    switch (dev->dev_type & DEV_MSKIF) {
+        case DEV_IFCAT:
+            return DT_DIR;
+
+        default:
+            return DT_FILE;
+    }
+}
+
 int
 devfs_mknod(struct v_dnode* dnode, struct device* dev)
 {
@@ -74,7 +116,8 @@ devfs_mknod(struct v_dnode* dnode, struct device* dev)
 int
 devfs_dirlookup(struct v_inode* this, struct v_dnode* dnode)
 {
-    struct device* dev = device_getbyhname(this->data, &dnode->name);
+    struct device* dev =
+      device_getbyhname((struct device*)this->data, &dnode->name);
     if (!dev) {
         return ENOENT;
     }
@@ -84,12 +127,13 @@ devfs_dirlookup(struct v_inode* this, struct v_dnode* dnode)
 int
 devfs_readdir(struct v_file* file, struct dir_context* dctx)
 {
-    struct device* dev = device_getbyoffset(file->inode->data, dctx->index);
+    struct device* dev =
+      device_getbyoffset((struct device*)(file->inode->data), dctx->index);
     if (!dev) {
         return 0;
     }
     dctx->read_complete_callback(
-      dctx, dev->name.value, dev->name.len, devfs_get_itype(dev));
+      dctx, dev->name.value, dev->name.len, devfs_get_dtype(dev));
     return 1;
 }
 
@@ -134,6 +178,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,
@@ -142,6 +187,8 @@ struct v_inode_ops devfs_inode_ops = { .dir_lookup = devfs_dirlookup,
 
 struct v_file_ops devfs_file_ops = { .close = default_file_close,
                                      .read = devfs_read,
+                                     .read_page = devfs_read_page,
                                      .write = devfs_write,
+                                     .write_page = devfs_write_page,
                                      .seek = default_file_seek,
                                      .readdir = devfs_readdir };
\ No newline at end of file