feat: support user-spcae pci rescan

[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 fcadafdef4b47d270739f2113f9d0195ef58df72..c243fcc073ed6607bd0488c0451551ade9430832 100644 (file)
--- a/lunaix-os/kernel/fs/twifs/twifs.c
+++ b/lunaix-os/kernel/fs/twifs/twifs.c
@@ -22,7 +22,7 @@ static struct twifs_node* fs_root;
 
 static struct cake_pile* twi_pile;
 
 
 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;
 
 extern const struct v_file_ops twifs_file_ops;
 extern const struct v_inode_ops twifs_inode_ops;


@@ -31,7 +31,7 @@ struct twifs_node*
 __twifs_new_node(struct twifs_node* parent,
                  const char* name,
                  int name_len,
 __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));
 {
     struct twifs_node* node = cake_grab(twi_pile);
     memset(node, 0, sizeof(*node));


@@ -54,8 +54,8 @@ __twifs_new_node(struct twifs_node* parent,
 void
 __twifs_init_inode(struct v_superblock* vsb, struct v_inode* inode)
 {
 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
 }
 
 int


@@ -118,7 +118,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 +180,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);


@@ -241,6 +241,13 @@ 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()
+{
+    ldga_invoke_fn0(twiplugin_inits);
+}

 
 int
 __twifs_twimap_file_read(struct v_inode* inode,
 
 int
 __twifs_twimap_file_read(struct v_inode* inode,