From eb36544624c18a284debdf78b43fe627f40a8371 Mon Sep 17 00:00:00 2001 From: Marcel Braun Date: Mon, 13 Apr 2026 18:49:21 +0200 Subject: Rename and refactor --- kapi/include/kapi/filesystem.hpp | 20 ++++++++ kapi/include/kapi/syscall_handler/filesystem.hpp | 19 -------- kernel/kapi/filesystem.cpp | 60 ++++++++++++++++++++++++ kernel/kapi/syscall_handler/filesystem.cpp | 59 ----------------------- 4 files changed, 80 insertions(+), 78 deletions(-) create mode 100644 kapi/include/kapi/filesystem.hpp delete mode 100644 kapi/include/kapi/syscall_handler/filesystem.hpp create mode 100644 kernel/kapi/filesystem.cpp delete mode 100644 kernel/kapi/syscall_handler/filesystem.cpp diff --git a/kapi/include/kapi/filesystem.hpp b/kapi/include/kapi/filesystem.hpp new file mode 100644 index 0000000..dba5d54 --- /dev/null +++ b/kapi/include/kapi/filesystem.hpp @@ -0,0 +1,20 @@ +#ifndef TEACHOS_KAPI_FILESYSTEM_HPP +#define TEACHOS_KAPI_FILESYSTEM_HPP + +#include +#include +#include + +namespace kapi::filesystem +{ + auto mount(std::string_view source, std::string_view target) -> int; + auto umount(std::string_view target) -> int; + + auto open(std::string_view path) -> int; + auto close(int fd) -> int; + + auto read(int fd, void * buffer, size_t size) -> ssize_t; + auto write(int fd, void const * buffer, size_t size) -> ssize_t; +} // namespace kapi::filesystem + +#endif // TEACHOS_KAPI_FILESYSTEM_HPP \ No newline at end of file diff --git a/kapi/include/kapi/syscall_handler/filesystem.hpp b/kapi/include/kapi/syscall_handler/filesystem.hpp deleted file mode 100644 index 86ae4d2..0000000 --- a/kapi/include/kapi/syscall_handler/filesystem.hpp +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef TEACHOS_KAPI_SYSCALL_HANDLER_FILESYSTEM_HPP -#define TEACHOS_KAPI_SYSCALL_HANDLER_FILESYSTEM_HPP - -#include -#include - -namespace kapi::syscall_handler::filesystem -{ - auto mount(char const * source, char const * target) -> int; - auto umount(char const * target) -> int; - - auto open(char const * path) -> int; - auto close(int fd) -> int; - - auto read(int fd, void * buffer, size_t size) -> ssize_t; - auto write(int fd, void const * buffer, size_t size) -> ssize_t; -} // namespace kapi::syscall_handler::filesystem - -#endif // TEACHOS_KAPI_SYSCALL_HANDLER_FILESYSTEM_HPP \ No newline at end of file diff --git a/kernel/kapi/filesystem.cpp b/kernel/kapi/filesystem.cpp new file mode 100644 index 0000000..a734ac0 --- /dev/null +++ b/kernel/kapi/filesystem.cpp @@ -0,0 +1,60 @@ +#include "kapi/filesystem.hpp" + +#include "kernel/filesystem/file_descriptor_table.hpp" +#include "kernel/filesystem/vfs.hpp" + +#include +#include +#include + +namespace kapi::filesystem +{ + auto mount(std::string_view source, std::string_view target) -> int + { + // TODO BA-FS26 + } + + auto umount(std::string_view target) -> int + { + if (kernel::filesystem::vfs::get().unmount(target) == kernel::filesystem::vfs::operation_result::success) + { + return 0; + } + return -1; + } + + auto open(std::string_view path) -> int + { + if (auto open_file_description = kernel::filesystem::vfs::get().open(path)) + { + return kernel::filesystem::file_descriptor_table::get().add_file(open_file_description); + } + + return -1; + } + + auto close(int fd) -> int + { + return kernel::filesystem::file_descriptor_table::get().remove_file(fd); + } + + auto read(int fd, void * buffer, size_t size) -> ssize_t + { + if (auto open_file_description = kernel::filesystem::file_descriptor_table::get().get_file(fd)) + { + return open_file_description->read(buffer, size); + } + + return -1; + } + + auto write(int fd, void const * buffer, size_t size) -> ssize_t + { + if (auto open_file_description = kernel::filesystem::file_descriptor_table::get().get_file(fd)) + { + return open_file_description->write(buffer, size); + } + + return -1; + } +} // namespace kapi::filesystem \ No newline at end of file diff --git a/kernel/kapi/syscall_handler/filesystem.cpp b/kernel/kapi/syscall_handler/filesystem.cpp deleted file mode 100644 index a6e8027..0000000 --- a/kernel/kapi/syscall_handler/filesystem.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "kapi/syscall_handler/filesystem.hpp" - -#include "kernel/filesystem/file_descriptor_table.hpp" -#include "kernel/filesystem/vfs.hpp" - -#include -#include - -namespace kapi::syscall_handler::filesystem -{ - auto mount(char const * source, char const * target) -> int - { - // TODO BA-FS26 - } - - auto umount(char const * target) -> int - { - if (kernel::filesystem::vfs::get().unmount(target) == kernel::filesystem::vfs::operation_result::success) - { - return 0; - } - return -1; - } - - auto open(char const * path) -> int - { - if (auto open_file_description = kernel::filesystem::vfs::get().open(path)) - { - return kernel::filesystem::file_descriptor_table::get().add_file(open_file_description); - } - - return -1; - } - - auto close(int fd) -> int - { - return kernel::filesystem::file_descriptor_table::get().remove_file(fd); - } - - auto read(int fd, void * buffer, size_t size) -> ssize_t - { - if (auto open_file_description = kernel::filesystem::file_descriptor_table::get().get_file(fd)) - { - return open_file_description->read(buffer, size); - } - - return -1; - } - - auto write(int fd, void const * buffer, size_t size) -> ssize_t - { - if (auto open_file_description = kernel::filesystem::file_descriptor_table::get().get_file(fd)) - { - return open_file_description->write(buffer, size); - } - - return -1; - } -} // namespace kapi::syscall_handler::filesystem \ No newline at end of file -- cgit v1.2.3