feat: kprintf now goes into dedicated pseudo-dev rather than flooding the framebuffer

[lunaix-os.git] / lunaix-os / kernel / fs / twifs / twifs.c

diff --git a/lunaix-os/kernel/fs/twifs/twifs.c b/lunaix-os/kernel/fs/twifs/twifs.c
index 9a5dd8e9fd4f3370efed1a684b3153e1aa355ae6..704a103f270b750f130430b4035d27960b8ff3d1 100644 (file)
--- a/lunaix-os/kernel/fs/twifs/twifs.c
+++ b/lunaix-os/kernel/fs/twifs/twifs.c
@@ -8,11 +8,12 @@
  * @copyright Copyright (c) 2022
  *
  */
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>
 #include <klibc/string.h>
 #include <lunaix/clock.h>
 #include <lunaix/fs.h>
 #include <lunaix/fs/twifs.h>
+#include <lunaix/fs/twimap.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
@@ -21,7 +22,7 @@ static struct twifs_node* fs_root;
 
 static struct cake_pile* twi_pile;
 
-static volatile uint32_t inode_id = 0;
+static volatile u32_t inode_id = 0;
 
 extern const struct v_file_ops twifs_file_ops;
 extern const struct v_inode_ops twifs_inode_ops;
@@ -30,7 +31,7 @@ struct twifs_node*
 __twifs_new_node(struct twifs_node* parent,
                  const char* name,
                  int name_len,
-                 uint32_t itype)
+                 u32_t itype)
 {
     struct twifs_node* node = cake_grab(twi_pile);
     memset(node, 0, sizeof(*node));
@@ -53,14 +54,13 @@ __twifs_new_node(struct twifs_node* parent,
 void
 __twifs_init_inode(struct v_superblock* vsb, struct v_inode* inode)
 {
-    inode->ops = &twifs_inode_ops;
-    inode->default_fops = &twifs_file_ops;
+    inode->ops = (struct v_inode_ops*)&twifs_inode_ops;
+    inode->default_fops = (struct v_file_ops*)&twifs_file_ops;
 }
 
 int
 __twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point)
 {
-    vsb->dev = 1;
     vsb->ops.init_inode = __twifs_init_inode;
 
     struct v_inode* inode = vfs_i_alloc(vsb);
@@ -118,7 +118,7 @@ __twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode)
 {
     struct twifs_node* twi_node = (struct twifs_node*)inode->data;
 
-    if (!(twi_node->itype & VFS_IFDIR)) {
+    if ((twi_node->itype & F_FILE)) {
         return ENOTDIR;
     }
 
@@ -159,7 +159,7 @@ __twifs_iterate_dir(struct v_file* file, struct dir_context* dctx)
         if (counter++ >= dctx->index) {
             dctx->index = counter;
             dctx->read_complete_callback(
-              dctx, pos->name.value, pos->name.len, pos->itype);
+              dctx, pos->name.value, pos->name.len, vfs_get_dtype(pos->itype));
             return 1;
         }
     }
@@ -180,7 +180,7 @@ __twifs_openfile(struct v_inode* inode, struct v_file* file)
 int
 twifs_rm_node(struct twifs_node* node)
 {
-    if ((node->itype & VFS_IFDIR) && !llist_empty(&node->children)) {
+    if (!(node->itype & F_FILE) && !llist_empty(&node->children)) {
         return ENOTEMPTY;
     }
     llist_delete(&node->siblings);
@@ -188,16 +188,22 @@ twifs_rm_node(struct twifs_node* node)
     return 0;
 }
 
+struct twifs_node*
+twifs_file_node_vargs(struct twifs_node* parent, const char* fmt, va_list args)
+{
+    char buf[VFS_NAME_MAXLEN];
+    size_t len = ksnprintfv(buf, fmt, VFS_NAME_MAXLEN, args);
+
+    return __twifs_new_node(parent ? parent : fs_root, buf, len, VFS_IFSEQDEV);
+}
+
 struct twifs_node*
 twifs_file_node(struct twifs_node* parent, const char* fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
 
-    char buf[VFS_NAME_MAXLEN];
-    size_t len = __ksprintf_internal(buf, fmt, VFS_NAME_MAXLEN, args);
-    struct twifs_node* twi_node =
-      __twifs_new_node(parent ? parent : fs_root, buf, len, VFS_IFSEQDEV);
+    struct twifs_node* twi_node = twifs_file_node_vargs(parent, fmt, args);
 
     va_end(args);
 
@@ -211,7 +217,7 @@ twifs_dir_node(struct twifs_node* parent, const char* fmt, ...)
     va_start(args, fmt);
 
     char buf[VFS_NAME_MAXLEN];
-    size_t len = __ksprintf_internal(buf, fmt, VFS_NAME_MAXLEN, args);
+    size_t len = ksnprintfv(buf, fmt, VFS_NAME_MAXLEN, args);
     struct twifs_node* twi_node =
       __twifs_new_node(parent ? parent : fs_root, buf, len, VFS_IFDIR);
 
@@ -235,10 +241,43 @@ twifs_init()
 
     fs_root = twifs_dir_node(NULL, NULL, 0, 0);
 }
+EXPORT_FILE_SYSTEM(twifs, twifs_init);
+
+void
+twifs_register_plugins()
+{
+    ldga_invoke_fn0(twiplugin_inits);
+}
+
+int
+__twifs_twimap_file_read(struct v_inode* inode,
+                         void* buf,
+                         size_t len,
+                         size_t fpos)
+{
+    struct twimap* map = twinode_getdata(inode, struct twimap*);
+    return twimap_read(map, buf, len, fpos);
+}
+
+struct twimap*
+twifs_mapping(struct twifs_node* parent, void* data, const char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+
+    struct twimap* map = twimap_create(data);
+    struct twifs_node* node = twifs_file_node_vargs(parent, fmt, args);
+    node->ops.read = __twifs_twimap_file_read;
+    node->data = map;
+
+    return map;
+}
 
 const struct v_file_ops twifs_file_ops = { .close = default_file_close,
                                            .read = __twifs_fread,
+                                           .read_page = __twifs_fread,
                                            .write = __twifs_fwrite,
+                                           .write_page = __twifs_fwrite,
                                            .readdir = __twifs_iterate_dir };
 
 const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,