aboutsummaryrefslogtreecommitdiff
path: root/kernel/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/src/main.cpp')
-rw-r--r--kernel/src/main.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index 011821a..cf3afdf 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -8,13 +8,13 @@
#include "filesystem/file_descriptor_table.hpp"
#include "filesystem/open_file_description.hpp"
#include "filesystem/vfs.hpp"
-
#include "kernel/memory.hpp"
+#include <kstd/memory>
#include <kstd/os/error.hpp>
#include <kstd/print>
+#include <kstd/vector>
-#include <array>
#include <cstddef>
#include <cstdint>
@@ -25,8 +25,8 @@ auto run_test_code() -> void
auto storage_mgmt = devices::storage::storage_management::get();
auto device = storage_mgmt.device_by_major_minor(1, 0);
- filesystem::device_file dev_file(device);
- filesystem::open_file_description ofd(&dev_file);
+ auto dev_file = kstd::make_shared<filesystem::device_file>(device);
+ filesystem::open_file_description ofd(dev_file);
auto fd_index = fd_table.add_file(ofd);
// use: read two bytes and write two again
@@ -36,7 +36,7 @@ auto run_test_code() -> void
kstd::os::panic("test code failed");
}
- std::array<std::byte, 2> buffer{};
+ kstd::vector<std::byte> buffer{2};
auto number_of_read_bytes = fd->read(buffer.data(), buffer.size());
for (size_t i = 0; i < number_of_read_bytes; ++i)
@@ -51,7 +51,7 @@ auto run_test_code() -> void
kstd::println("---");
// write half of the file new
- std::array<std::byte, 2> write_buffer{std::byte{0xBB}, std::byte{0xAA}};
+ kstd::vector<std::byte> write_buffer{std::byte{0xBB}, std::byte{0xAA}};
auto written_bytes = fd->write(write_buffer.data(), write_buffer.size());
kstd::println("written bytes: {}", written_bytes);
@@ -59,7 +59,7 @@ auto run_test_code() -> void
fd_table.remove_file(fd_index);
// use: read four bytes again -> two old bytes two new bytes
- filesystem::open_file_description ofd1(&dev_file);
+ filesystem::open_file_description ofd1(dev_file);
fd_index = fd_table.add_file(ofd1);
auto fd1 = fd_table.get_file(fd_index);
@@ -68,7 +68,7 @@ auto run_test_code() -> void
kstd::os::panic("test code failed");
}
- std::array<std::byte, 4> buffer1{};
+ kstd::vector<std::byte> buffer1{4};
number_of_read_bytes = fd1->read(buffer1.data(), buffer1.size());
for (size_t i = 0; i < number_of_read_bytes; ++i)
@@ -89,7 +89,8 @@ auto main() -> int
kstd::println("[OS] IO subsystem initialized.");
kapi::memory::init();
- kernel::memory::init_heap(kapi::memory::heap_base); kstd::println("[OS] Memory subsystem initialized.");
+ kernel::memory::init_heap(kapi::memory::heap_base);
+ kstd::println("[OS] Memory subsystem initialized.");
kapi::system::memory_initialized();
kapi::boot_modules::init();