Merge branch 'ext2' into 'develop-BA-FS26'HEADdevelop-BA-FS26

ext2 and tests

See merge request teachos/kernel!22

1 files changed, 18 insertions, 10 deletions

diff --git a/kernel/src/devices/storage/management.cpp b/kernel/src/devices/storage/management.cpp
index d440bf0..c9fa0a8 100644
--- a/kernel/src/devices/storage/management.cpp
+++ b/kernel/src/devices/storage/management.cpp
@@ -1,9 +1,9 @@
 #include "kernel/devices/storage/management.hpp"
 
 #include "kapi/boot_modules.hpp"
+#include "kapi/devices/device.hpp"
 #include "kapi/system.hpp"
 
-#include "kapi/devices/device.hpp"
 #include "kernel/devices/storage/controller.hpp"
 #include "kernel/devices/storage/ram_disk/controller.hpp"
 
@@ -14,17 +14,17 @@
 #include <cstddef>
 #include <optional>
 
-namespace kernel::devices::storage
+namespace
 {
-  namespace
-  {
-    constexpr size_t static MINORS_PER_DEVICE = 16;
-    constexpr size_t static START_MAJOR = 1;
-    constinit size_t static next_free_major = START_MAJOR;
+  constexpr size_t static MINORS_PER_DEVICE = 16;
+  constexpr size_t static START_MAJOR = 1;
+  constinit size_t static next_free_major = START_MAJOR;
 
-    constinit auto static active_storage_management = std::optional<management>{};
-  }  // namespace
+  constinit auto static active_storage_management = std::optional<kernel::devices::storage::management>{};
+}  // namespace
 
+namespace kernel::devices::storage
+{
   auto management::init() -> void
   {
     if (active_storage_management)
@@ -81,5 +81,13 @@ namespace kernel::devices::storage
   {
     return device_by_major_minor(START_MAJOR, 0);
   }
+}  // namespace kernel::devices::storage
 
-}  // namespace kernel::devices::storage
\ No newline at end of file
+namespace kernel::tests::devices::storage::management
+{
+  auto deinit() -> void
+  {
+    active_storage_management.reset();
+    next_free_major = START_MAJOR;
+  }
+}  // namespace kernel::tests::devices::storage::management