From 6ddd4587cf9e83578ac4d3f7cc492c7146e32b83 Mon Sep 17 00:00:00 2001 From: antifallobst Date: Sun, 28 May 2023 21:06:06 +0200 Subject: [PATCH] refactor (drivers): applied driver directory change to include statements --- inc/drivers/builtin/acpi/fadt.h | 2 +- inc/drivers/builtin/acpi/mcfg.h | 2 +- inc/drivers/builtin/ahci.h | 4 ++-- inc/drivers/builtin/drive_manager.h | 2 +- inc/drivers/builtin/elf/elf.h | 6 +++--- inc/drivers/builtin/fs/ramfs.h | 2 +- inc/drivers/builtin/graphics/renderer.h | 6 +++--- inc/drivers/builtin/tty.h | 2 +- inc/mm/stack.h | 2 +- inc/modules/module.h | 2 +- inc/proc/file_descriptor.h | 2 +- inc/proc/process.h | 2 +- ramdisk/noxos.json | 2 +- src/boot/config.c | 4 ++-- src/boot/kmain.c | 16 ++++++++-------- src/drivers/builtin/acpi/acpi.c | 8 ++++---- src/drivers/builtin/acpi/rsdp.c | 2 +- src/drivers/builtin/ahci.c | 6 +++--- src/drivers/builtin/drive_manager.c | 4 ++-- src/drivers/builtin/elf/elf.c | 6 +++--- src/drivers/builtin/elf/header.c | 2 +- src/drivers/builtin/elf/mapping.c | 2 +- src/drivers/builtin/elf/section.c | 2 +- src/drivers/builtin/elf/segment.c | 2 +- src/drivers/builtin/elf/symbol.c | 2 +- src/drivers/builtin/fs/gpt.c | 2 +- src/drivers/builtin/fs/mbr.c | 2 +- src/drivers/builtin/fs/ramfs.c | 2 +- src/drivers/builtin/fs/vfs.c | 6 +++--- src/drivers/builtin/graphics/color.c | 2 +- src/drivers/builtin/graphics/font.c | 2 +- src/drivers/builtin/graphics/renderer.c | 2 +- src/drivers/builtin/json.c | 2 +- src/drivers/builtin/pci.c | 8 ++++---- src/drivers/builtin/ps2/controller.c | 6 +++--- src/drivers/builtin/ps2/keyboard.c | 8 ++++---- src/drivers/builtin/time/pit.c | 2 +- src/drivers/builtin/tty.c | 2 +- src/modules/loader.c | 2 +- src/platform/interrupts.c | 2 +- src/platform/syscall.c | 2 +- src/proc/scheduler.c | 2 +- src/utils/logger.c | 2 +- 43 files changed, 74 insertions(+), 74 deletions(-) diff --git a/inc/drivers/builtin/acpi/fadt.h b/inc/drivers/builtin/acpi/fadt.h index e3e74fb..434bbc9 100644 --- a/inc/drivers/builtin/acpi/fadt.h +++ b/inc/drivers/builtin/acpi/fadt.h @@ -3,7 +3,7 @@ #ifndef NOX_FADT_H #define NOX_FADT_H -#include "drivers/acpi/acpi.h" +#include "drivers/builtin/acpi/acpi.h" typedef struct { acpi_sdt_header_T header; diff --git a/inc/drivers/builtin/acpi/mcfg.h b/inc/drivers/builtin/acpi/mcfg.h index 1345145..65fba4b 100644 --- a/inc/drivers/builtin/acpi/mcfg.h +++ b/inc/drivers/builtin/acpi/mcfg.h @@ -3,7 +3,7 @@ #ifndef NOXOS_MCFG_H #define NOXOS_MCFG_H -#include "drivers/acpi/acpi.h" +#include "drivers/builtin/acpi/acpi.h" typedef struct { acpi_sdt_header_T header; diff --git a/inc/drivers/builtin/ahci.h b/inc/drivers/builtin/ahci.h index 965963c..5f43002 100644 --- a/inc/drivers/builtin/ahci.h +++ b/inc/drivers/builtin/ahci.h @@ -4,8 +4,8 @@ #define NOXOS_AHCI_H #include "utils/stdtypes.h" -#include "drivers/pci.h" -#include "drivers/drive_manager.h" +#include "drivers/builtin/pci.h" +#include "drivers/builtin/drive_manager.h" #define SATA_SIG_ATA 0x00000101 #define SATA_SIG_ATAPI 0xEB140101 diff --git a/inc/drivers/builtin/drive_manager.h b/inc/drivers/builtin/drive_manager.h index 04ccc5f..45e97c9 100644 --- a/inc/drivers/builtin/drive_manager.h +++ b/inc/drivers/builtin/drive_manager.h @@ -3,7 +3,7 @@ #ifndef NOXOS_DRIVE_MANAGER_H #define NOXOS_DRIVE_MANAGER_H -#include "drivers/fs/vfs.h" +#include "drivers/builtin/fs/vfs.h" #include "utils/stdtypes.h" #include "utils/bitmap.h" diff --git a/inc/drivers/builtin/elf/elf.h b/inc/drivers/builtin/elf/elf.h index f3b585d..f571c26 100644 --- a/inc/drivers/builtin/elf/elf.h +++ b/inc/drivers/builtin/elf/elf.h @@ -3,9 +3,9 @@ #ifndef NOX_ELF_H #define NOX_ELF_H -#include "drivers/elf/header.h" -#include "drivers/elf/section.h" -#include "drivers/elf/mapping.h" +#include "drivers/builtin/elf/header.h" +#include "drivers/builtin/elf/section.h" +#include "drivers/builtin/elf/mapping.h" #include "utils/symbol.h" typedef struct { diff --git a/inc/drivers/builtin/fs/ramfs.h b/inc/drivers/builtin/fs/ramfs.h index ece93b5..99dc68f 100644 --- a/inc/drivers/builtin/fs/ramfs.h +++ b/inc/drivers/builtin/fs/ramfs.h @@ -3,7 +3,7 @@ #ifndef NOX_RAMFS_H #define NOX_RAMFS_H -#include "drivers/fs/vfs.h" +#include "drivers/builtin/fs/vfs.h" void ramfs_file_delete (vfs_node_T* node); uint64_t ramfs_file_write (vfs_node_T* node, uint64_t size, uint8_t* buffer_in); diff --git a/inc/drivers/builtin/graphics/renderer.h b/inc/drivers/builtin/graphics/renderer.h index 44d9be1..d278cfa 100644 --- a/inc/drivers/builtin/graphics/renderer.h +++ b/inc/drivers/builtin/graphics/renderer.h @@ -6,9 +6,9 @@ #include "utils/stdtypes.h" #include "utils/string.h" #include "utils/math.h" -#include "drivers/graphics/color.h" -#include "drivers/graphics/font.h" -#include "drivers/graphics/framebuffer.h" +#include "drivers/builtin/graphics/color.h" +#include "drivers/builtin/graphics/font.h" +#include "drivers/builtin/graphics/framebuffer.h" #include "boot/boot_info.h" typedef enum { diff --git a/inc/drivers/builtin/tty.h b/inc/drivers/builtin/tty.h index 0c23435..874b8c7 100644 --- a/inc/drivers/builtin/tty.h +++ b/inc/drivers/builtin/tty.h @@ -3,7 +3,7 @@ #ifndef NOXOS_TTY_H #define NOXOS_TTY_H -#include "drivers/graphics/renderer.h" +#include "drivers/builtin/graphics/renderer.h" #include "utils/stream.h" #include "proc/pipe.h" diff --git a/inc/mm/stack.h b/inc/mm/stack.h index 422a467..0542460 100644 --- a/inc/mm/stack.h +++ b/inc/mm/stack.h @@ -6,7 +6,7 @@ #include "utils/stdtypes.h" #include "utils/symbol.h" -#include "drivers/elf/elf.h" +#include "drivers/builtin/elf/elf.h" void stack_dump_call_info (uint64_t rip, symbol_T* symbol); void stack_trace_call_stack (uint64_t rbp); diff --git a/inc/modules/module.h b/inc/modules/module.h index 333a64a..e85a706 100644 --- a/inc/modules/module.h +++ b/inc/modules/module.h @@ -5,7 +5,7 @@ #include #include -#include +#include typedef struct { string_t name; diff --git a/inc/proc/file_descriptor.h b/inc/proc/file_descriptor.h index 6a2bd49..720dc0b 100644 --- a/inc/proc/file_descriptor.h +++ b/inc/proc/file_descriptor.h @@ -5,7 +5,7 @@ #include "utils/stdtypes.h" #include "utils/bitmap.h" -#include "drivers/fs/vfs.h" +#include "drivers/builtin/fs/vfs.h" #define FILE_DESCRIPTOR_ARRAY_CHUNK_SIZE 32 diff --git a/inc/proc/process.h b/inc/proc/process.h index 127a189..ec39459 100644 --- a/inc/proc/process.h +++ b/inc/proc/process.h @@ -9,7 +9,7 @@ #include "proc/file_descriptor.h" #include "proc/pipe.h" #include "mm/page_map.h" -#include "drivers/elf/elf.h" +#include "drivers/builtin/elf/elf.h" #define MAX_THREADS_PER_PROCESS 64 #define THREAD_ID_INVALID (-1) diff --git a/ramdisk/noxos.json b/ramdisk/noxos.json index 7cc68a0..22fe65e 100644 --- a/ramdisk/noxos.json +++ b/ramdisk/noxos.json @@ -3,6 +3,6 @@ "LOG_GRAPHICAL": false, "modules": { - "FAT32": "/initrd/modules/fat32.nxmod" + "FAT32": "/initrd/modules/fat32.nxkm" } } \ No newline at end of file diff --git a/src/boot/config.c b/src/boot/config.c index 2279d05..9e16ab0 100644 --- a/src/boot/config.c +++ b/src/boot/config.c @@ -1,8 +1,8 @@ // This file is part of noxos and licensed under the MIT open source license #include -#include -#include "drivers/json.h" +#include +#include "drivers/builtin/json.h" #include #include diff --git a/src/boot/kmain.c b/src/boot/kmain.c index 68c5d84..cacbf5d 100644 --- a/src/boot/kmain.c +++ b/src/boot/kmain.c @@ -12,14 +12,14 @@ #include "mm/page_frame.h" #include "mm/page_map.h" #include "mm/region.h" -#include "drivers/time/pit.h" -#include "drivers/graphics/renderer.h" -#include "drivers/fs/vfs.h" -#include "drivers/acpi/acpi.h" -#include "drivers/drive_manager.h" -#include "drivers/pci.h" -#include "drivers/ps2/controller.h" -#include "drivers/tty.h" +#include "drivers/builtin/time/pit.h" +#include "drivers/builtin/graphics/renderer.h" +#include "drivers/builtin/fs/vfs.h" +#include "drivers/builtin/acpi/acpi.h" +#include "drivers/builtin/drive_manager.h" +#include "drivers/builtin/pci.h" +#include "drivers/builtin/ps2/controller.h" +#include "drivers/builtin/tty.h" #include "proc/scheduler.h" #include "modules/loader.h" diff --git a/src/drivers/builtin/acpi/acpi.c b/src/drivers/builtin/acpi/acpi.c index d7401ff..d2f39eb 100644 --- a/src/drivers/builtin/acpi/acpi.c +++ b/src/drivers/builtin/acpi/acpi.c @@ -1,9 +1,9 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/acpi/acpi.h" -#include "drivers/acpi/rsdp.h" -#include "drivers/acpi/fadt.h" -#include "drivers/acpi/mcfg.h" +#include "drivers/builtin/acpi/acpi.h" +#include "drivers/builtin/acpi/rsdp.h" +#include "drivers/builtin/acpi/fadt.h" +#include "drivers/builtin/acpi/mcfg.h" #include "utils/logger.h" #include "utils/memory.h" #include "utils/panic.h" diff --git a/src/drivers/builtin/acpi/rsdp.c b/src/drivers/builtin/acpi/rsdp.c index fd73a18..8a2fddf 100644 --- a/src/drivers/builtin/acpi/rsdp.c +++ b/src/drivers/builtin/acpi/rsdp.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/acpi/rsdp.h" +#include "drivers/builtin/acpi/rsdp.h" bool rsdp_descriptor_v1_verify(rsdp_descriptor_v1_T* descriptor) { uint8_t* data = (uint8_t*)descriptor; diff --git a/src/drivers/builtin/ahci.c b/src/drivers/builtin/ahci.c index a35fb45..48f3fc9 100644 --- a/src/drivers/builtin/ahci.c +++ b/src/drivers/builtin/ahci.c @@ -1,8 +1,8 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/ahci.h" -#include "drivers/fs/mbr.h" -#include "drivers/fs/gpt.h" +#include "drivers/builtin/ahci.h" +#include "drivers/builtin/fs/mbr.h" +#include "drivers/builtin/fs/gpt.h" #include "utils/memory.h" #include "utils/logger.h" #include "mm/page_map.h" diff --git a/src/drivers/builtin/drive_manager.c b/src/drivers/builtin/drive_manager.c index 73f211b..1573556 100644 --- a/src/drivers/builtin/drive_manager.c +++ b/src/drivers/builtin/drive_manager.c @@ -1,7 +1,7 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/drive_manager.h" -#include "drivers/ahci.h" +#include "drivers/builtin/drive_manager.h" +#include "drivers/builtin/ahci.h" #include "utils/memory.h" #include "utils/logger.h" diff --git a/src/drivers/builtin/elf/elf.c b/src/drivers/builtin/elf/elf.c index 7504a31..20d25f9 100644 --- a/src/drivers/builtin/elf/elf.c +++ b/src/drivers/builtin/elf/elf.c @@ -1,8 +1,8 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/elf/elf.h" -#include "drivers/elf/symbol.h" -#include "drivers/elf/segment.h" +#include "drivers/builtin/elf/elf.h" +#include "drivers/builtin/elf/symbol.h" +#include "drivers/builtin/elf/segment.h" #include "utils/memory.h" #include "utils/logger.h" #include "utils/math.h" diff --git a/src/drivers/builtin/elf/header.c b/src/drivers/builtin/elf/header.c index feecfbe..af76be6 100644 --- a/src/drivers/builtin/elf/header.c +++ b/src/drivers/builtin/elf/header.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/elf/header.h" +#include "drivers/builtin/elf/header.h" string_t g_elf_target_architecture_strings[3] = { "Invalid", diff --git a/src/drivers/builtin/elf/mapping.c b/src/drivers/builtin/elf/mapping.c index 0cb1372..a91d382 100644 --- a/src/drivers/builtin/elf/mapping.c +++ b/src/drivers/builtin/elf/mapping.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/elf/mapping.h" +#include "drivers/builtin/elf/mapping.h" #include "mm/page_frame.h" #include "utils/math.h" #include "utils/logger.h" diff --git a/src/drivers/builtin/elf/section.c b/src/drivers/builtin/elf/section.c index 971e0ce..7b2b35d 100644 --- a/src/drivers/builtin/elf/section.c +++ b/src/drivers/builtin/elf/section.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/elf/section.h" +#include "drivers/builtin/elf/section.h" string_t g_elf_section_type_strings[ELF_SECTION_ENUM_END+1] = { "Null", diff --git a/src/drivers/builtin/elf/segment.c b/src/drivers/builtin/elf/segment.c index e759bfb..551d85e 100644 --- a/src/drivers/builtin/elf/segment.c +++ b/src/drivers/builtin/elf/segment.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/elf/segment.h" +#include "drivers/builtin/elf/segment.h" string_t g_elf_segment_type_strings[ELF_SEGMENT_ENUM_END+1] = { "Null", diff --git a/src/drivers/builtin/elf/symbol.c b/src/drivers/builtin/elf/symbol.c index 84d549e..1f8ace7 100644 --- a/src/drivers/builtin/elf/symbol.c +++ b/src/drivers/builtin/elf/symbol.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/elf/symbol.h" +#include "drivers/builtin/elf/symbol.h" string_t g_elf_symbol_type_strings[7] = { "None", diff --git a/src/drivers/builtin/fs/gpt.c b/src/drivers/builtin/fs/gpt.c index 59aec6c..74487f2 100644 --- a/src/drivers/builtin/fs/gpt.c +++ b/src/drivers/builtin/fs/gpt.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/fs/gpt.h" +#include "drivers/builtin/fs/gpt.h" #include "utils/memory.h" uint8_t g_gpt_partition_type_guides[GPT_PARTITION_GUID_ENUM_END][16] = { diff --git a/src/drivers/builtin/fs/mbr.c b/src/drivers/builtin/fs/mbr.c index 75eaad6..ebc5f62 100644 --- a/src/drivers/builtin/fs/mbr.c +++ b/src/drivers/builtin/fs/mbr.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/fs/mbr.h" +#include "drivers/builtin/fs/mbr.h" string_t mbr_partition_type_to_string(mbr_partition_types_E type) { switch (type) { diff --git a/src/drivers/builtin/fs/ramfs.c b/src/drivers/builtin/fs/ramfs.c index bf5ae62..dff71fa 100644 --- a/src/drivers/builtin/fs/ramfs.c +++ b/src/drivers/builtin/fs/ramfs.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/fs/ramfs.h" +#include "drivers/builtin/fs/ramfs.h" #include "utils/memory.h" #include "utils/math.h" diff --git a/src/drivers/builtin/fs/vfs.c b/src/drivers/builtin/fs/vfs.c index 5bff873..4a7ae25 100644 --- a/src/drivers/builtin/fs/vfs.c +++ b/src/drivers/builtin/fs/vfs.c @@ -1,8 +1,8 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/fs/vfs.h" -#include "drivers/fs/ramfs.h" -#include "drivers/fs/ustar.h" +#include "drivers/builtin/fs/vfs.h" +#include "drivers/builtin/fs/ramfs.h" +#include "drivers/builtin/fs/ustar.h" #include "utils/memory.h" #include "utils/logger.h" #include "utils/math.h" diff --git a/src/drivers/builtin/graphics/color.c b/src/drivers/builtin/graphics/color.c index 5ed61ec..e34b1cd 100644 --- a/src/drivers/builtin/graphics/color.c +++ b/src/drivers/builtin/graphics/color.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/graphics/color.h" +#include "drivers/builtin/graphics/color.h" color_argb_T g_color_palette[COLOR_PAL_ENUM_END] = { {0xFF, 0x36, 0x36, 0x36}, // GREY_DARK diff --git a/src/drivers/builtin/graphics/font.c b/src/drivers/builtin/graphics/font.c index 1d15359..27a14e3 100644 --- a/src/drivers/builtin/graphics/font.c +++ b/src/drivers/builtin/graphics/font.c @@ -22,7 +22,7 @@ * Fetched from: http://dimensionalrift.homelinux.net/combuster/mos3/?p=viewsource&file=/modules/gfx/font8_8.asm **/ -#include "drivers/graphics/font.h" +#include "drivers/builtin/graphics/font.h" uint8_t font8x16_monocle[128][16] = { { 0x00, 0x00, 0xe0, 0xa0, 0xaa, 0xa4, 0xea, 0x00, 0xee, 0xaa, 0xaa, 0xaa, 0xee, 0x00, 0x00, 0x00}, // 0x00 diff --git a/src/drivers/builtin/graphics/renderer.c b/src/drivers/builtin/graphics/renderer.c index 1297304..626f458 100644 --- a/src/drivers/builtin/graphics/renderer.c +++ b/src/drivers/builtin/graphics/renderer.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/graphics/renderer.h" +#include "drivers/builtin/graphics/renderer.h" #include "utils/memory.h" #include "utils/core.h" diff --git a/src/drivers/builtin/json.c b/src/drivers/builtin/json.c index 09b23b8..52616e6 100644 --- a/src/drivers/builtin/json.c +++ b/src/drivers/builtin/json.c @@ -1,6 +1,6 @@ // This file is part of cmlc and licensed under the MIT open source license -#include "drivers/json.h" +#include "drivers/builtin/json.h" #include "utils/memory.h" #include "utils/logger.h" diff --git a/src/drivers/builtin/pci.c b/src/drivers/builtin/pci.c index b38afe9..2a1b8f3 100644 --- a/src/drivers/builtin/pci.c +++ b/src/drivers/builtin/pci.c @@ -1,9 +1,9 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/pci.h" -#include "drivers/acpi/acpi.h" -#include "drivers/acpi/mcfg.h" -#include "drivers/ahci.h" +#include "drivers/builtin/pci.h" +#include "drivers/builtin/acpi/acpi.h" +#include "drivers/builtin/acpi/mcfg.h" +#include "drivers/builtin/ahci.h" #include "mm/page_map.h" #include "utils/logger.h" #include "utils/memory.h" diff --git a/src/drivers/builtin/ps2/controller.c b/src/drivers/builtin/ps2/controller.c index 811b4c7..83262b5 100644 --- a/src/drivers/builtin/ps2/controller.c +++ b/src/drivers/builtin/ps2/controller.c @@ -1,8 +1,8 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/ps2/controller.h" -#include "drivers/ps2/keyboard.h" -#include "drivers/acpi/fadt.h" +#include "drivers/builtin/ps2/controller.h" +#include "drivers/builtin/ps2/keyboard.h" +#include "drivers/builtin/acpi/fadt.h" #include "utils/io.h" #include "utils/logger.h" #include "boot/config.h" diff --git a/src/drivers/builtin/ps2/keyboard.c b/src/drivers/builtin/ps2/keyboard.c index 16c17ce..3a97218 100644 --- a/src/drivers/builtin/ps2/keyboard.c +++ b/src/drivers/builtin/ps2/keyboard.c @@ -1,9 +1,9 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/ps2/keyboard.h" -#include "drivers/ps2/scancodes.h" -#include "drivers/ps2/controller.h" -#include "drivers/tty.h" +#include "drivers/builtin/ps2/keyboard.h" +#include "drivers/builtin/ps2/scancodes.h" +#include "drivers/builtin/ps2/controller.h" +#include "drivers/builtin/tty.h" #include "utils/logger.h" #include "utils/io.h" #include "platform/interrupts.h" diff --git a/src/drivers/builtin/time/pit.c b/src/drivers/builtin/time/pit.c index f4e5b84..d780126 100644 --- a/src/drivers/builtin/time/pit.c +++ b/src/drivers/builtin/time/pit.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/time/pit.h" +#include "drivers/builtin/time/pit.h" #include "utils/io.h" #include "utils/logger.h" diff --git a/src/drivers/builtin/tty.c b/src/drivers/builtin/tty.c index 8220a9d..a23a5d1 100644 --- a/src/drivers/builtin/tty.c +++ b/src/drivers/builtin/tty.c @@ -1,6 +1,6 @@ // This file is part of noxos and licensed under the MIT open source license -#include "drivers/tty.h" +#include "drivers/builtin/tty.h" #include "utils/memory.h" // this global state tty is just a placeholder diff --git a/src/modules/loader.c b/src/modules/loader.c index a56de14..ba80c9d 100644 --- a/src/modules/loader.c +++ b/src/modules/loader.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include module_manager_T g_module_manager; diff --git a/src/platform/interrupts.c b/src/platform/interrupts.c index a8d88dd..1db3ef2 100644 --- a/src/platform/interrupts.c +++ b/src/platform/interrupts.c @@ -9,7 +9,7 @@ #include "utils/logger.h" #include "utils/io.h" #include "proc/scheduler.h" -#include "drivers/ps2/keyboard.h" +#include "drivers/builtin/ps2/keyboard.h" idt_register_T g_idt_register; uint8_t g_handling_interrupt; diff --git a/src/platform/syscall.c b/src/platform/syscall.c index 5161426..b246ae8 100644 --- a/src/platform/syscall.c +++ b/src/platform/syscall.c @@ -5,7 +5,7 @@ #include "utils/panic.h" #include "utils/memory.h" #include "proc/scheduler.h" -#include "drivers/fs/vfs.h" +#include "drivers/builtin/fs/vfs.h" #include "mm/page_frame.h" #include "mm/region.h" diff --git a/src/proc/scheduler.c b/src/proc/scheduler.c index aa3de50..2b57e21 100644 --- a/src/proc/scheduler.c +++ b/src/proc/scheduler.c @@ -4,7 +4,7 @@ #include "utils/memory.h" #include "utils/logger.h" #include "utils/core.h" -#include "drivers/graphics/renderer.h" +#include "drivers/builtin/graphics/renderer.h" #include "platform/syscall.h" scheduler_T g_scheduler; diff --git a/src/utils/logger.c b/src/utils/logger.c index d04edb7..5582612 100644 --- a/src/utils/logger.c +++ b/src/utils/logger.c @@ -3,7 +3,7 @@ #include "utils/logger.h" #include "utils/io.h" #include "utils/core.h" -#include "drivers/graphics/renderer.h" +#include "drivers/builtin/graphics/renderer.h" string_t g_log_prefixes[LOG_ENUM_END] = { "", // LOG_NONE