refactor (drivers): applied driver directory change to include statements

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;

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;

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

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"
 

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 {

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);

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 {

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"
 

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);

inc/modules/module.h

@@ -5,7 +5,7 @@
 
 #include <utils/stdtypes.h>
 #include <utils/string.h>
-#include <drivers/elf/elf.h>
+#include <drivers/builtin/elf/elf.h>
 
 typedef struct {
     string_t            name;

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
 

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)

ramdisk/noxos.json

@@ -3,6 +3,6 @@
     "LOG_GRAPHICAL": false,
 
     "modules": {
-        "FAT32": "/initrd/modules/fat32.nxmod"
+        "FAT32": "/initrd/modules/fat32.nxkm"
     }
 }

src/boot/config.c

@@ -1,8 +1,8 @@
 // This file is part of noxos and licensed under the MIT open source license
 
 #include <boot/config.h>
-#include <drivers/fs/vfs.h>
-#include "drivers/json.h"
+#include <drivers/builtin/fs/vfs.h>
+#include "drivers/builtin/json.h"
 #include <utils/logger.h>
 #include <utils/memory.h>
 

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"
 

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"

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;

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"

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"
 

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"

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",

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"

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",

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",

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",

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] = {

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) {

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"
 

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"

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

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

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"
 

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"
 

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"

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"

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"

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"
 

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

src/modules/loader.c

@@ -3,7 +3,7 @@
 #include <modules/loader.h>
 #include <utils/memory.h>
 #include <utils/logger.h>
-#include <drivers/fs/vfs.h>
+#include <drivers/builtin/fs/vfs.h>
 
 module_manager_T g_module_manager;
 

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;

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"
 

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;

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