From c9a1266d219a83882735a3a8304f3824e0219cdb Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Mon, 15 Jan 2024 15:44:20 -0500 Subject: redo application paging and system calls, rename mercury to hilbert --- include/mercury/kernel/storage/bd/memory.hpp | 22 ------------------- include/mercury/kernel/storage/fs/tarfs.hpp | 32 ---------------------------- 2 files changed, 54 deletions(-) delete mode 100644 include/mercury/kernel/storage/bd/memory.hpp delete mode 100644 include/mercury/kernel/storage/fs/tarfs.hpp (limited to 'include/mercury/kernel/storage') diff --git a/include/mercury/kernel/storage/bd/memory.hpp b/include/mercury/kernel/storage/bd/memory.hpp deleted file mode 100644 index e12d565..0000000 --- a/include/mercury/kernel/storage/bd/memory.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef MERCURY_KERNEL_STORAGE_BD_MEMORY_HPP -#define MERCURY_KERNEL_STORAGE_BD_MEMORY_HPP - -#include - -namespace mercury::kernel::storage::bd { - - class memory : public block_device { - - private: - uint8_t *buffer; - - public: - memory(void *buffer, uint64_t buffer_len); - - bd_result read_blocks_no_cache(uint64_t start, uint64_t count, void *into) override; - - }; - -} - -#endif diff --git a/include/mercury/kernel/storage/fs/tarfs.hpp b/include/mercury/kernel/storage/fs/tarfs.hpp deleted file mode 100644 index 9e16207..0000000 --- a/include/mercury/kernel/storage/fs/tarfs.hpp +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef MERCURY_KERNEL_STORAGE_FS_TARFS_HPP -#define MERCURY_KERNEL_STORAGE_FS_TARFS_HPP - -#include - -namespace mercury::kernel::storage::fs { - - class tarfs_instance : public file_system_instance { - - private: - block_device *bd; - - fs_result next_node(node_id_t node, std::optional &out); - fs_result read_full_name(node_id_t node, utility::string &out); - //len <= 12. - fs_result read_num(uint64_t offset, unsigned len, uint64_t &out); - fs_result first_child_starting_at(node_id_t parent, node_id_t start, std::optional &out); - fs_result get_dir_entry(node_id_t node, dir_entry &entry); - - public: - tarfs_instance(block_device *bd); - - fs_result get_root_node(node_id_t &out); - fs_result get_first_child(node_id_t node, std::optional &out, directory_iter_t &iter_out); - fs_result get_next_child(node_id_t node, std::optional &out, directory_iter_t &iter); - fs_result read_bytes_from_file(node_id_t node, uint64_t start, uint64_t count, void *into); - - }; - -} - -#endif -- cgit v1.2.3