Merge branch 'main1'

include/fs/vfs.h

@@ -1,7 +1,6 @@
 #pragma once
 #include <data-structure.h>
 #include <libc-base.h>
-
 // * 所有时间请使用 GMT 时间 *
 
 // 读写时请 padding 到 PAGE_SIZE 的整数倍
@@ -90,11 +89,14 @@ int vfs_regist(cstr name, vfs_callback_t callback);
 
 void tmpfs_regist();
 void fatfs_regist();
+void iso9660_regist();
 
 vfs_node_t vfs_open(cstr str);
 int        vfs_mkdir(cstr name);
 
-int vfs_read(vfs_node_t file, void *addr, size_t offset, size_t size);
-int vfs_mkfile(cstr name);
-int vfs_write(vfs_node_t file, void *addr, size_t offset, size_t size);
-int vfs_unmount(cstr path);
+int  vfs_read(vfs_node_t file, void *addr, size_t offset, size_t size);
+int  vfs_mkfile(cstr name);
+int  vfs_write(vfs_node_t file, void *addr, size_t offset, size_t size);
+int  vfs_unmount(cstr path);
+int  vfs_close(vfs_node_t node);
+void vfs_update(vfs_node_t node);

src/fs/fat.c

@@ -127,6 +127,8 @@ int fatfs_mount(cstr src, vfs_node_t node) {
   sprintf(path, "%d:", drive);
   FRESULT r = f_mount(&volume[drive], path, 1);
   if (r != FR_OK) {
+    vfs_close(drive_number_mapping[drive]);
+    drive_number_mapping[drive] = null;
     free(path);
     return -1;
   }
@@ -151,8 +153,9 @@ int fatfs_mount(cstr src, vfs_node_t node) {
 }
 
 void fatfs_unmount(void *root) {
-  file_t f      = root;
-  int    number = f->path[0] - '0';
+  file_t f                     = root;
+  int    number                = f->path[0] - '0';
+  drive_number_mapping[number] = null;
   f_closedir(f->handle);
   f_unmount(f->path);
   free(f->path);