Merge branch 'fmorgner/develop/p1204-for-kernel' into 'develop'

chore: restructure kernel according to p1204

See merge request teachos/kernel!53

1 files changed, 70 insertions, 70 deletions

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index b12f9f27..d50944e4 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -25,65 +25,65 @@ target_sources("kernel_lib" PRIVATE
     "kstd/print.cpp"
 
     # ACPI Subsystem
-    "src/acpi/manager.cpp"
+    "kernel/acpi/manager.cpp"
 
     # Memory Subsystem
-    "src/memory/bitmap_allocator.cpp"
-    "src/memory/block_list_allocator.cpp"
-    "src/memory/mmio_allocator.cpp"
-    "src/memory.cpp"
+    "kernel/memory/bitmap_allocator.cpp"
+    "kernel/memory/block_list_allocator.cpp"
+    "kernel/memory/mmio_allocator.cpp"
+    "kernel/memory.cpp"
 
     # Device Subsystem
-    "src/devices/block_device.cpp"
-    "src/devices/block_device_utils.cpp"
-    "src/devices/root_bus.cpp"
+    "kernel/devices/block_device.cpp"
+    "kernel/devices/block_device_utils.cpp"
+    "kernel/devices/root_bus.cpp"
 
     # Storage Device Subsystem
-    "src/devices/storage/controller.cpp"
-    "src/devices/storage/management.cpp"
-    "src/devices/storage/ram_disk/controller.cpp"
-    "src/devices/storage/ram_disk/device.cpp"
+    "kernel/devices/storage/controller.cpp"
+    "kernel/devices/storage/management.cpp"
+    "kernel/devices/storage/ram_disk/controller.cpp"
+    "kernel/devices/storage/ram_disk/device.cpp"
 
     # Filesystem Subsystem
-    "src/filesystem/dentry.cpp"
-    "src/filesystem/device_inode.cpp"
-    "src/filesystem/filesystem.cpp"
-    "src/filesystem/inode.cpp"
-    "src/filesystem/mount_table.cpp"
-    "src/filesystem/mount.cpp"
-    "src/filesystem/open_file_descriptor.cpp"
-    "src/filesystem/open_file_table.cpp"
-    "src/filesystem/type_registry.cpp"
-    "src/filesystem/vfs.cpp"
+    "kernel/filesystem/dentry.cpp"
+    "kernel/filesystem/device_inode.cpp"
+    "kernel/filesystem/filesystem.cpp"
+    "kernel/filesystem/inode.cpp"
+    "kernel/filesystem/mount_table.cpp"
+    "kernel/filesystem/mount.cpp"
+    "kernel/filesystem/open_file_descriptor.cpp"
+    "kernel/filesystem/open_file_table.cpp"
+    "kernel/filesystem/type_registry.cpp"
+    "kernel/filesystem/vfs.cpp"
 
     # DevFS Filesystem
-    "src/filesystem/devfs/filesystem.cpp"
-    "src/filesystem/devfs/inode.cpp"
+    "kernel/filesystem/devfs/filesystem.cpp"
+    "kernel/filesystem/devfs/inode.cpp"
 
     # ext2 Filesystem
-    "src/filesystem/ext2/filesystem.cpp"
-    "src/filesystem/ext2/inode.cpp"
+    "kernel/filesystem/ext2/filesystem.cpp"
+    "kernel/filesystem/ext2/inode.cpp"
 
     # Rootfs Filesystem
-    "src/filesystem/rootfs/filesystem.cpp"
-    "src/filesystem/rootfs/inode.cpp"
+    "kernel/filesystem/rootfs/filesystem.cpp"
+    "kernel/filesystem/rootfs/inode.cpp"
 )
 
 file(GLOB_RECURSE KERNEL_HEADERS
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     CONFIGURE_DEPENDS
-    "include/**.hpp"
+    "kernel/**.hpp"
 )
 
 target_sources("kernel_lib" PUBLIC
     FILE_SET HEADERS
-    BASE_DIRS "include"
+    BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}"
     FILES
     ${KERNEL_HEADERS}
 )
 
 target_include_directories("kernel_lib" PUBLIC
-    "include"
+    "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
 target_link_libraries("kernel_lib" PUBLIC
@@ -105,8 +105,8 @@ if(NOT BUILD_TESTING)
     add_executable(kernel::exe ALIAS "kernel")
 
     target_sources("kernel" PRIVATE
-        "src/main.cpp"
-        "src/memory/operators.cpp"
+        "kernel/main.cpp"
+        "kernel/memory/operators.cpp"
     )
 
     target_link_libraries("kernel" PRIVATE
@@ -148,32 +148,32 @@ if(BUILD_TESTING)
 
     target_sources("kernel_tests" PRIVATE
         # Platform-defined KAPI
-        "src/test_support/kapi/cpu.cpp"
-        "src/test_support/kapi/cio.cpp"
-        "src/test_support/kapi/interrupts.cpp"
-        "src/test_support/kapi/memory.cpp"
+        "kernel/test_support/kapi/cpu.cpp"
+        "kernel/test_support/kapi/cio.cpp"
+        "kernel/test_support/kapi/interrupts.cpp"
+        "kernel/test_support/kapi/memory.cpp"
 
         # Device Subsystem Support
-        "src/test_support/devices/block_device.cpp"
-        "src/test_support/devices/character_device.cpp"
+        "kernel/test_support/devices/block_device.cpp"
+        "kernel/test_support/devices/character_device.cpp"
 
         # Filesystem Subsystem Support
-        "src/test_support/filesystem/inode.cpp"
-        "src/test_support/filesystem/filesystem.cpp"
-        "src/test_support/filesystem/ext2.cpp"
-        "src/test_support/filesystem/storage_boot_module_fixture.cpp"
-        "src/test_support/filesystem/storage_boot_module_vfs_fixture.cpp"
+        "kernel/test_support/filesystem/inode.cpp"
+        "kernel/test_support/filesystem/filesystem.cpp"
+        "kernel/test_support/filesystem/ext2.cpp"
+        "kernel/test_support/filesystem/storage_boot_module_fixture.cpp"
+        "kernel/test_support/filesystem/storage_boot_module_vfs_fixture.cpp"
 
         # I/O Support
-        "src/test_support/log_buffer.cpp"
-        "src/test_support/output_device.cpp"
+        "kernel/test_support/log_buffer.cpp"
+        "kernel/test_support/output_device.cpp"
 
         # Memory Support
-        "src/test_support/page_mapper.cpp"
-        "src/test_support/simulated_memory.cpp"
+        "kernel/test_support/page_mapper.cpp"
+        "kernel/test_support/simulated_memory.cpp"
 
         # Support System Listener
-        "src/test_support/state_reset_listener.cpp"
+        "kernel/test_support/state_reset_listener.cpp"
 
         # KAPI Shim Tests
         "kapi/cpu.tests.cpp"
@@ -184,30 +184,30 @@ if(BUILD_TESTING)
         "kstd/print.tests.cpp"
 
         # Memory Subsystem Tests
-        "src/memory/bitmap_allocator.tests.cpp"
-        "src/memory/block_list_allocator.tests.cpp"
+        "kernel/memory/bitmap_allocator.tests.cpp"
+        "kernel/memory/block_list_allocator.tests.cpp"
 
         # Filesystem Subsystem Tests
-        "src/filesystem/devfs/filesystem.tests.cpp"
-        "src/filesystem/devfs/inode.tests.cpp"
-        "src/filesystem/ext2/filesystem.tests.cpp"
-        "src/filesystem/ext2/inode.tests.cpp"
-        "src/filesystem/path.tests.cpp"
-        "src/filesystem/rootfs/filesystem.tests.cpp"
-        "src/filesystem/rootfs/inode.tests.cpp"
-        "src/filesystem/dentry.tests.cpp"
-        "src/filesystem/device_inode.tests.cpp"
-        "src/filesystem/mount_table.tests.cpp"
-        "src/filesystem/mount.tests.cpp"
-        "src/filesystem/open_file_descriptor.tests.cpp"
-        "src/filesystem/open_file_table.tests.cpp"
-        "src/filesystem/type_registry.tests.cpp"
-        "src/filesystem/vfs.tests.cpp"
+        "kernel/filesystem/devfs/filesystem.tests.cpp"
+        "kernel/filesystem/devfs/inode.tests.cpp"
+        "kernel/filesystem/ext2/filesystem.tests.cpp"
+        "kernel/filesystem/ext2/inode.tests.cpp"
+        "kernel/filesystem/path.tests.cpp"
+        "kernel/filesystem/rootfs/filesystem.tests.cpp"
+        "kernel/filesystem/rootfs/inode.tests.cpp"
+        "kernel/filesystem/dentry.tests.cpp"
+        "kernel/filesystem/device_inode.tests.cpp"
+        "kernel/filesystem/mount_table.tests.cpp"
+        "kernel/filesystem/mount.tests.cpp"
+        "kernel/filesystem/open_file_descriptor.tests.cpp"
+        "kernel/filesystem/open_file_table.tests.cpp"
+        "kernel/filesystem/type_registry.tests.cpp"
+        "kernel/filesystem/vfs.tests.cpp"
         
         # Storage Subsystem Tests
-        "src/devices/block_device_utils.tests.cpp"
-        "src/devices/block_device.tests.cpp"
-        "src/devices/storage/ram_disk/device.tests.cpp"
+        "kernel/devices/block_device_utils.tests.cpp"
+        "kernel/devices/block_device.tests.cpp"
+        "kernel/devices/storage/ram_disk/device.tests.cpp"
     )
 
     target_link_libraries("kernel_tests" PRIVATE
@@ -216,7 +216,7 @@ if(BUILD_TESTING)
     )
 
     target_compile_definitions("kernel_tests" PRIVATE
-        KERNEL_TEST_ASSETS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/src/test_support/filesystem/test_assets"
+        KERNEL_TEST_ASSETS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/kernel/test_support/filesystem/test_assets"
     )
     
     set_target_properties("kernel_tests" PROPERTIES