Merge branch 'master' of github.com:Minep/lunaix-os

[lunaix-os.git] / lunaix-os / includes / lunaix / fs / twifs.h

diff --git a/lunaix-os/includes/lunaix/fs/twifs.h b/lunaix-os/includes/lunaix/fs/twifs.h
index b83b1a4e84a53128fb230f9373c95f8632b100ba..50579aeed5d6eb580a3af755cfd98116eb785e62 100644 (file)
--- a/lunaix-os/includes/lunaix/fs/twifs.h
+++ b/lunaix-os/includes/lunaix/fs/twifs.h
@@ -1,29 +1,69 @@
 #ifndef __LUNAIX_TWIFS_H
 #define __LUNAIX_TWIFS_H
 
 #ifndef __LUNAIX_TWIFS_H
 #define __LUNAIX_TWIFS_H
 

+#include <lunaix/ds/ldga.h>

 #include <lunaix/fs.h>
 #include <lunaix/fs.h>

+#include <lunaix/fs/twimap.h>
+#include <lunaix/spike.h>

 
 struct twifs_node
 {
 
 struct twifs_node
 {

-    struct v_inode* inode;

     struct hstr name;
     struct hstr name;

+    inode_t ino_id;

     void* data;
     void* data;

-    uint32_t itype;
+    u32_t itype;
+    char name_val[VFS_NAME_MAXLEN];

     struct llist_header children;
     struct llist_header siblings;
     struct llist_header children;
     struct llist_header siblings;

-    struct v_file_ops fops;
+    struct
+    {
+        int (*write)(struct v_inode* inode,
+                     void* buffer,
+                     size_t len,
+                     size_t fpos);
+        int (*read)(struct v_inode* inode,
+                    void* buffer,
+                    size_t len,
+                    size_t fpos);
+    } ops;

 };
 
 };
 

+#define twinode_getdata(inode, type)                                           \
+    ({                                                                         \
+        struct twifs_node* twinode = (struct twifs_node*)(inode)->data;        \
+        assert(twinode);                                                       \
+        (type) twinode->data;                                                  \
+    })
+
+#define EXPORT_TWIFS_PLUGIN(label, plg_init)                                   \
+    export_ldga_el(twiplugin_inits, label, ptr_t, plg_init)
+
+void
+twifs_register_plugins();
+

 void
 twifs_init();
 
 struct twifs_node*
 void
 twifs_init();
 
 struct twifs_node*

-twifs_file_node(struct twifs_node* parent, const char* name, int name_len);
+twifs_file_node_vargs(struct twifs_node* parent, const char* fmt, va_list args);

 
 struct twifs_node*
 
 struct twifs_node*

-twifs_dir_node(struct twifs_node* parent, const char* name, int name_len);
+twifs_file_node(struct twifs_node* parent, const char* fmt, ...);

 
 struct twifs_node*
 
 struct twifs_node*

-twifs_toplevel_node(const char* name, int name_len);
+twifs_dir_node(struct twifs_node* parent, const char* fmt, ...);
+
+int
+twifs_rm_node(struct twifs_node* node);
+
+struct twimap*
+twifs_mapping(struct twifs_node* parent, void* data, const char* fmt, ...);
+
+#define twimap_entry_simple(parent, name, data, read_cb)                       \
+    ({                                                                         \
+        struct twimap* map = twifs_mapping((parent), (data), (name));          \
+        map->read = (read_cb);                                                 \
+        map;                                                                   \
+    })

 
 #endif /* __LUNAIX_TWIFS_H */
 
 #endif /* __LUNAIX_TWIFS_H */