diff --git a/docs/kernel/filesystem/vfs/overview.md b/docs/kernel/filesystem/vfs/overview.md index 4f5d2584..2767740c 100644 --- a/docs/kernel/filesystem/vfs/overview.md +++ b/docs/kernel/filesystem/vfs/overview.md @@ -33,7 +33,7 @@   如果需要注册或取消注册某个具体文件系统到VFS之中,则需要以下两个接口: ```c -#include +#include uint64_t vfs_register_filesystem(struct vfs_filesystem_type_t *fs); uint64_t vfs_unregister_filesystem(struct vfs_filesystem_type_t *fs); @@ -45,7 +45,7 @@ uint64_t vfs_unregister_filesystem(struct vfs_filesystem_type_t *fs);   这个数据结构描述了具体文件系统的一些信息。当我们挂载具体文件系统的时候,将会调用它的read_superblock方法,以确定要被挂载的文件系统的具体信息。 -  该数据结构的定义在`kernel/filesystem/VFS/VFS.h`中,结构如下: +  该数据结构的定义在`kernel/filesystem/vfs/VFS.h`中,结构如下: ```c struct vfs_filesystem_type_t @@ -84,7 +84,7 @@ struct vfs_filesystem_type_t   该数据结构为超级块结构体。 -  该数据结构定义在`kernel/filesystem/VFS/VFS.h`中,结构如下: +  该数据结构定义在`kernel/filesystem/vfs/VFS.h`中,结构如下: ```c struct vfs_superblock_t @@ -111,7 +111,7 @@ struct vfs_superblock_t   该数据结构为超级块的操作接口。VFS通过这些接口来操作具体的文件系统的超级块。 -  该数据结构定义在`kernel/filesystem/VFS/VFS.h`中,结构如下: +  该数据结构定义在`kernel/filesystem/vfs/VFS.h`中,结构如下: ```c struct vfs_super_block_operations_t @@ -144,7 +144,7 @@ struct vfs_super_block_operations_t   该数据结构为inode对象的数据结构,与文件系统中的具体的文件结点对象具有一对一映射的关系。 -  该数据结构定义在`kernel/filesystem/VFS/VFS.h`中,结构如下: +  该数据结构定义在`kernel/filesystem/vfs/VFS.h`中,结构如下: ```c struct vfs_index_node_t @@ -199,7 +199,7 @@ struct vfs_index_node_t   该接口为inode的操作方法接口,由具体文件系统实现。并与具体文件系统之中的inode相互绑定。 -  该接口定义于`kernel/filesystem/VFS/VFS.h`中,结构如下: +  该接口定义于`kernel/filesystem/vfs/VFS.h`中,结构如下: ```c struct vfs_inode_operations_t diff --git a/kernel/src/driver/keyboard/ps2_keyboard.c b/kernel/src/driver/keyboard/ps2_keyboard.c index 04e9c1f9..32bcca61 100644 --- a/kernel/src/driver/keyboard/ps2_keyboard.c +++ b/kernel/src/driver/keyboard/ps2_keyboard.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kernel/src/driver/tty/tty.c b/kernel/src/driver/tty/tty.c index dfee71b2..300a8f5e 100644 --- a/kernel/src/driver/tty/tty.c +++ b/kernel/src/driver/tty/tty.c @@ -1,5 +1,5 @@ #include -#include +#include #include "tty.h" static struct devfs_private_inode_info_t * tty_inode_private_data_ptr; // 由devfs创建的inode私有信息指针 diff --git a/kernel/src/filesystem/Makefile b/kernel/src/filesystem/Makefile index 67f16d43..d87a55c6 100644 --- a/kernel/src/filesystem/Makefile +++ b/kernel/src/filesystem/Makefile @@ -3,7 +3,7 @@ CFLAGS += -I . kernel_fs_objs:= $(shell find ./*.c) -kernel_fs_subdirs:= devfs VFS fat32 rootfs procfs +kernel_fs_subdirs:= devfs vfs fat32 rootfs procfs ECHO: @echo "$@" diff --git a/kernel/src/filesystem/devfs/chardev.c b/kernel/src/filesystem/devfs/chardev.c index 5dcd97d6..691060c3 100644 --- a/kernel/src/filesystem/devfs/chardev.c +++ b/kernel/src/filesystem/devfs/chardev.c @@ -1,6 +1,6 @@ #include "chardev.h" #include "internal.h" -#include +#include #include #include diff --git a/kernel/src/filesystem/devfs/devfs-types.h b/kernel/src/filesystem/devfs/devfs-types.h index 8d87f54e..7d9cac7d 100644 --- a/kernel/src/filesystem/devfs/devfs-types.h +++ b/kernel/src/filesystem/devfs/devfs-types.h @@ -1,5 +1,5 @@ #pragma once -#include +#include /** * @brief devfs_private_file_info_t的type字段值 diff --git a/kernel/src/filesystem/devfs/devfs.c b/kernel/src/filesystem/devfs/devfs.c index f99561ee..c56401b6 100644 --- a/kernel/src/filesystem/devfs/devfs.c +++ b/kernel/src/filesystem/devfs/devfs.c @@ -1,6 +1,6 @@ #include "devfs.h" #include "internal.h" -#include +#include #include #include #include diff --git a/kernel/src/filesystem/devfs/mod.rs b/kernel/src/filesystem/devfs/mod.rs new file mode 100644 index 00000000..e69de29b diff --git a/kernel/src/filesystem/fat32/fat32.h b/kernel/src/filesystem/fat32/fat32.h index 47e55842..a67ee779 100644 --- a/kernel/src/filesystem/fat32/fat32.h +++ b/kernel/src/filesystem/fat32/fat32.h @@ -12,7 +12,7 @@ #pragma once #include -#include +#include #define FAT32_MAX_PARTITION_NUM 128 // 系统支持的最大的fat32分区数量 diff --git a/kernel/src/filesystem/fat32/fat_ent.h b/kernel/src/filesystem/fat32/fat_ent.h index 3144267d..0867565b 100644 --- a/kernel/src/filesystem/fat32/fat_ent.h +++ b/kernel/src/filesystem/fat32/fat_ent.h @@ -1,7 +1,7 @@ #pragma once #include "fat32.h" -#include +#include #include /** diff --git a/kernel/src/filesystem/fat32/mod.rs b/kernel/src/filesystem/fat32/mod.rs new file mode 100644 index 00000000..e69de29b diff --git a/kernel/src/filesystem/mod.rs b/kernel/src/filesystem/mod.rs new file mode 100644 index 00000000..3ac26c88 --- /dev/null +++ b/kernel/src/filesystem/mod.rs @@ -0,0 +1,5 @@ +pub mod devfs; +pub mod fat32; +pub mod procfs; +pub mod rootfs; +pub mod vfs; diff --git a/kernel/src/filesystem/procfs/mod.rs b/kernel/src/filesystem/procfs/mod.rs new file mode 100644 index 00000000..e69de29b diff --git a/kernel/src/filesystem/procfs/procfs.h b/kernel/src/filesystem/procfs/procfs.h index 51324002..4bd403ad 100644 --- a/kernel/src/filesystem/procfs/procfs.h +++ b/kernel/src/filesystem/procfs/procfs.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include /** diff --git a/kernel/src/filesystem/rootfs/mod.rs b/kernel/src/filesystem/rootfs/mod.rs new file mode 100644 index 00000000..e69de29b diff --git a/kernel/src/filesystem/rootfs/rootfs.c b/kernel/src/filesystem/rootfs/rootfs.c index bd49baaf..5eb9c911 100644 --- a/kernel/src/filesystem/rootfs/rootfs.c +++ b/kernel/src/filesystem/rootfs/rootfs.c @@ -1,7 +1,7 @@ #include "rootfs.h" -#include +#include #include -#include +#include static struct vfs_superblock_t rootfs_sb = {0}; extern struct vfs_superblock_t *vfs_root_sb; diff --git a/kernel/src/filesystem/VFS/Makefile b/kernel/src/filesystem/vfs/Makefile similarity index 100% rename from kernel/src/filesystem/VFS/Makefile rename to kernel/src/filesystem/vfs/Makefile diff --git a/kernel/src/filesystem/VFS/VFS.c b/kernel/src/filesystem/vfs/VFS.c similarity index 100% rename from kernel/src/filesystem/VFS/VFS.c rename to kernel/src/filesystem/vfs/VFS.c diff --git a/kernel/src/filesystem/VFS/VFS.h b/kernel/src/filesystem/vfs/VFS.h similarity index 100% rename from kernel/src/filesystem/VFS/VFS.h rename to kernel/src/filesystem/vfs/VFS.h diff --git a/kernel/src/filesystem/VFS/dcache.c b/kernel/src/filesystem/vfs/dcache.c similarity index 100% rename from kernel/src/filesystem/VFS/dcache.c rename to kernel/src/filesystem/vfs/dcache.c diff --git a/kernel/src/filesystem/VFS/internal.h b/kernel/src/filesystem/vfs/internal.h similarity index 100% rename from kernel/src/filesystem/VFS/internal.h rename to kernel/src/filesystem/vfs/internal.h diff --git a/kernel/src/filesystem/vfs/mod.rs b/kernel/src/filesystem/vfs/mod.rs new file mode 100644 index 00000000..e69de29b diff --git a/kernel/src/filesystem/VFS/mount.c b/kernel/src/filesystem/vfs/mount.c similarity index 100% rename from kernel/src/filesystem/VFS/mount.c rename to kernel/src/filesystem/vfs/mount.c diff --git a/kernel/src/filesystem/VFS/mount.h b/kernel/src/filesystem/vfs/mount.h similarity index 100% rename from kernel/src/filesystem/VFS/mount.h rename to kernel/src/filesystem/vfs/mount.h diff --git a/kernel/src/ipc/pipe.c b/kernel/src/ipc/pipe.c index 905731f0..8a8a207a 100644 --- a/kernel/src/ipc/pipe.c +++ b/kernel/src/ipc/pipe.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index ec486c3d..606f6b02 100644 --- a/kernel/src/lib.rs +++ b/kernel/src/lib.rs @@ -16,13 +16,13 @@ use core::panic::PanicInfo; #[macro_use] mod arch; +mod driver; +mod filesystem; #[macro_use] mod include; mod ipc; - #[macro_use] mod libs; -mod driver; mod mm; mod process; mod sched; diff --git a/kernel/src/main.c b/kernel/src/main.c index 58ccf7ad..41693f36 100644 --- a/kernel/src/main.c +++ b/kernel/src/main.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/src/process/process.h b/kernel/src/process/process.h index 7317beee..bb942c66 100644 --- a/kernel/src/process/process.h +++ b/kernel/src/process/process.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/kernel/src/syscall/syscall.c b/kernel/src/syscall/syscall.c index 53807602..85de7f2c 100644 --- a/kernel/src/syscall/syscall.c +++ b/kernel/src/syscall/syscall.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include