ld-tool portability fix: MacOS build experience

[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 729b5f770f7ea164d91f24d7b78e553433b1aa44..6aa5f6a8779b017de635a684a8fb6fee90c3b71d 100644 (file)
--- a/lunaix-os/kernel/fs/twifs/twifs.c
+++ b/lunaix-os/kernel/fs/twifs/twifs.c
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2022
  *
  */
  * @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 <klibc/string.h>
 #include <lunaix/clock.h>
 #include <lunaix/fs.h>


@@ -18,6 +18,8 @@
 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
 
 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
 

+#include <sys/mm/mempart.h>
+

 static struct twifs_node* fs_root;
 
 static struct cake_pile* twi_pile;
 static struct twifs_node* fs_root;
 
 static struct cake_pile* twi_pile;


@@ -87,6 +89,12 @@ __twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
     return twi_node->ops.write(inode, buffer, len, fpos);
 }
 
     return twi_node->ops.write(inode, buffer, len, fpos);
 }
 

+int
+__twifs_fwrite_pg(struct v_inode* inode, void* buffer, size_t fpos)
+{
+    return __twifs_fwrite(inode, buffer, MEM_PAGE, fpos);
+}
+

 int
 __twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 {
 int
 __twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 {


@@ -97,6 +105,12 @@ __twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
     return twi_node->ops.read(inode, buffer, len, fpos);
 }
 
     return twi_node->ops.read(inode, buffer, len, fpos);
 }
 

+int
+__twifs_fread_pg(struct v_inode* inode, void* buffer, size_t fpos)
+{
+    return __twifs_fread(inode, buffer, MEM_PAGE, fpos);
+}
+

 struct twifs_node*
 __twifs_get_node(struct twifs_node* parent, struct hstr* name)
 {
 struct twifs_node*
 __twifs_get_node(struct twifs_node* parent, struct hstr* name)
 {


@@ -118,7 +132,7 @@ __twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode)
 {
     struct twifs_node* twi_node = (struct twifs_node*)inode->data;
 
 {
     struct twifs_node* twi_node = (struct twifs_node*)inode->data;
 

-    if (!(twi_node->itype & VFS_IFDIR)) {
+    if ((twi_node->itype & F_FILE)) {

         return ENOTDIR;
     }
 
         return ENOTDIR;
     }
 


@@ -180,7 +194,7 @@ __twifs_openfile(struct v_inode* inode, struct v_file* file)
 int
 twifs_rm_node(struct twifs_node* node)
 {
 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);
         return ENOTEMPTY;
     }
     llist_delete(&node->siblings);


@@ -192,9 +206,9 @@ struct twifs_node*
 twifs_file_node_vargs(struct twifs_node* parent, const char* fmt, va_list args)
 {
     char buf[VFS_NAME_MAXLEN];
 twifs_file_node_vargs(struct twifs_node* parent, const char* fmt, va_list args)
 {
     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);

 
 

-    return __twifs_new_node(parent ? parent : fs_root, buf, len, VFS_IFSEQDEV);
+    return __twifs_new_node(parent ? parent : fs_root, buf, len, F_FILE);

 }
 
 struct twifs_node*
 }
 
 struct twifs_node*


@@ -217,7 +231,7 @@ twifs_dir_node(struct twifs_node* parent, const char* fmt, ...)
     va_start(args, fmt);
 
     char buf[VFS_NAME_MAXLEN];
     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);
 
     struct twifs_node* twi_node =
       __twifs_new_node(parent ? parent : fs_root, buf, len, VFS_IFDIR);
 


@@ -241,16 +255,12 @@ twifs_init()
 
     fs_root = twifs_dir_node(NULL, NULL, 0, 0);
 }
 
     fs_root = twifs_dir_node(NULL, NULL, 0, 0);
 }

+EXPORT_FILE_SYSTEM(twifs, twifs_init);

 
 void
 twifs_register_plugins()
 {
 
 void
 twifs_register_plugins()
 {

-    int i = 0;
-    ptr_t init_twifs_plugin_fn;
-    ldga_foreach(twiplugin_inits, ptr_t, i, init_twifs_plugin_fn)
-    {
-        ((void (*)())init_twifs_plugin_fn)();
-    }
+    ldga_invoke_fn0(twiplugin_inits);

 }
 
 int
 }
 
 int


@@ -279,9 +289,9 @@ twifs_mapping(struct twifs_node* parent, void* data, const char* fmt, ...)
 
 const struct v_file_ops twifs_file_ops = { .close = default_file_close,
                                            .read = __twifs_fread,
 
 const struct v_file_ops twifs_file_ops = { .close = default_file_close,
                                            .read = __twifs_fread,

-                                           .read_page = __twifs_fread,
+                                           .read_page = __twifs_fread_pg,

                                            .write = __twifs_fwrite,
                                            .write = __twifs_fwrite,

-                                           .write_page = __twifs_fwrite,
+                                           .write_page = __twifs_fwrite_pg,

                                            .readdir = __twifs_iterate_dir };
 
 const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,
                                            .readdir = __twifs_iterate_dir };
 
 const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,