Development

arch/x86_64/interrupts/Interrupts.c

@@ -1,6 +1,6 @@
 #include <Interrupts.h>
-#include <../../../drivers/APIC/APIC.h>
-#include <../../../drivers/storage/Ide.h>
+#include <APIC/APIC.h>
+#include <storage/Ide.h>
 #include <Atomics.h>
 #include <Console.h>
 #include <Kernel.h>

cmake/ccache.cmake

@@ -2,7 +2,7 @@
 # CCache Configuration for Faster Builds
 # ============================================================================
 
-option(VF_ENABLE_CCACHE "Enable ccache for faster compilation" ON)
+option(VF_ENABLE_CCACHE "Enable ccache for faster compilation" OFF)
 
 if(VF_ENABLE_CCACHE)
     find_program(CCACHE_PROGRAM ccache)

cmake/source.cmake

@@ -144,58 +144,63 @@ set(OBJ_SOURCES)
 # ============================================================================
 include_directories(
         .
-        include
-        kernel/atomic
-        kernel/core
-        kernel/ipc
-        kernel/sched
-        kernel/etc
-        kernel/execf
-        kernel/execf/elf
-        kernel/execf/pe
-        kernel/execf/aout
+        arch/x86_64
+        arch/x86_64/asm
+        arch/x86_64/features
+        arch/x86_64/gdt
+        arch/x86_64/idt
+        arch/x86_64/interrupts
+        arch/x86_64/syscall
+        crypto
         drivers
-        drivers/PCI
+        drivers/APIC
         drivers/ethernet
         drivers/ethernet/intel
         drivers/ethernet/realtek
         drivers/ethernet/interface
-        drivers/RTC
-        drivers/xHCI
+        drivers/input
         drivers/ISA
+        drivers/LPT
+        drivers/OPIC
+        drivers/PCI
+        drivers/RTC
         drivers/sound
         drivers/storage
-        drivers/virtio
-        drivers/vmware
-        drivers/APIC
-        drivers/OPIC
         drivers/usb
         drivers/usb/hid
-        drivers/input
+        drivers/virtio
+        drivers/vmware
+        drivers/xHCI
         fs
-        fs/FAT
+        fs/devfs
         fs/EXT
+        fs/FAT
         fs/NTFS
-        fs/devfs
+        fs/procfs
+        include
+        include/Switch
+        include/Vector
+        kernel/atomic
+        kernel/core
+        kernel/etc
+        kernel/execf
+        kernel/execf/elf
+        kernel/execf/pe
+        kernel/execf/aout
+        kernel/execf/macho
+        kernel/ipc
+        kernel/sched
         mm
+        mm/asm
         mm/dynamic
         mm/dynamic/c
         mm/dynamic/rust
-        mm/trace
         mm/security
-        ports/6502
+        mm/trace
         ports
-        ports/raytracer
-        arch/x86_64
-        arch/x86_64/asm
-        arch/x86_64/features
-        arch/x86_64/gdt
-        arch/x86_64/idt
-        arch/x86_64/interrupts
-        arch/x86_64/syscall
+        ports/6502
         vfcompositor
         vfcompositor/app
-        crypto
 )
 
 # ============================================================================

drivers/APIC/APIC.c

@@ -1,9 +1,9 @@
 #include <APIC.h>
-#include <../../include/Io.h>
-#include <../../kernel/core/Kernel.h>
-#include <../../kernel/etc/Console.h>
-#include <../../mm/VMem.h>
-#include <../sound/Generic.h>
+#include <include/Io.h>
+#include <kernel/core/Kernel.h>
+#include <kernel/etc/Console.h>
+#include <mm/VMem.h>
+#include <sound/Generic.h>
 #include <Panic.h>
 #include <x64.h>
 

drivers/ISA/ISA.c

@@ -1,5 +1,5 @@
 #include <ISA.h>
-#include <../../mm/KernelHeap.h>
+#include <mm/KernelHeap.h>
 #include <Console.h>
 #include <Io.h>
 #include <SB16.h>

drivers/OPIC/OPIC.c

@@ -10,10 +10,10 @@
  */
 
 #include <OPIC.h>
-#include <../../include/Io.h>
-#include <../../kernel/core/Kernel.h>
-#include <../../kernel/etc/Console.h>
-#include <../../mm/VMem.h>
+#include <include/Io.h>
+#include <kernel/core/Kernel.h>
+#include <kernel/etc/Console.h>
+#include <mm/VMem.h>
 #include <x64.h>
 #include <Panic.h>
 

drivers/Random.c

@@ -1,6 +1,6 @@
 #include <Random.h>
-#include <../crypto/RNG.h>
-#include <../fs/CharDevice.h>
+#include <crypto/RNG.h>
+#include <fs/CharDevice.h>
 
 static int RandomDevRead(struct CharDevice* dev, void* buffer, uint32_t size) {
     uint8_t* buf = (uint8_t*)buffer;

drivers/Serial.c

@@ -1,7 +1,7 @@
 #include <Serial.h>
 #include <Io.h>
-#include <../fs/CharDevice.h>
-#include <../kernel/etc/Console.h>
+#include <fs/CharDevice.h>
+#include <kernel/etc/Console.h>
 
 // Serial port register offsets
 #define SERIAL_DATA_REG     0  // Data register (DLAB=0)

drivers/Vesa.c

@@ -1,5 +1,5 @@
 #include <Vesa.h>
-#include <../mm/MemOps.h>
+#include <mm/MemOps.h>
 #include <Font.h>
 #include <Multiboot2.h>
 #include <Serial.h>

drivers/ethernet/intel/E1000.c

@@ -1,6 +1,6 @@
 #include <E1000.h>
-#include <../interface/Arp.h>
-#include <../interface/Ip.h>
+#include <interface/Arp.h>
+#include <interface/Ip.h>
 #include <Console.h>
 #include <TSC.h>
 #include <Io.h>

drivers/ethernet/interface/Arp.c

@@ -1,5 +1,5 @@
 #include <Arp.h>
-#include <../Network.h>
+#include <Network.h>
 #include <Console.h>
 #include <Ip.h>
 #include <MemOps.h>

drivers/ethernet/interface/Arp.h

@@ -2,7 +2,7 @@
 #define ARP_H
 
 #include <stdint.h>
-#include <../Packet.h>
+#include <Packet.h>
 #include <stdbool.h>
 
 #define ARP_CACHE_SIZE 16

drivers/ethernet/interface/Ip.c

@@ -1,5 +1,5 @@
 #include <Ip.h>
-#include <../Network.h>
+#include <Network.h>
 #include <Arp.h>
 #include <Console.h>
 #include <KernelHeap.h>

drivers/ethernet/realtek/RTL8139.c

@@ -1,9 +1,9 @@
 #include <RTL8139.h>
-#include <../../../mm/KernelHeap.h>
-#include <../../../mm/MemOps.h>
-#include <../../../mm/VMem.h>
-#include <../interface/Arp.h>
-#include <../interface/Ip.h>
+#include <mm/KernelHeap.h>
+#include <mm/MemOps.h>
+#include <mm/VMem.h>
+#include <interface/Arp.h>
+#include <interface/Ip.h>
 #include <Console.h>
 #include <Io.h>
 #include <ethernet/Packet.h>

drivers/input/Keyboard.c

@@ -1,6 +1,6 @@
 #include <Keyboard.h>
-#include <../PS2.h>
-#include <../usb/hid/USBKeyboard.h>
+#include <PS2.h>
+#include <usb/hid/USBKeyboard.h>
 
 /**
  * @brief Checks for input, prioritizing USB keyboards over PS/2.

drivers/storage/Ide.c

@@ -1,5 +1,5 @@
 #include <Ide.h>
-#include <../APIC/APIC.h>
+#include <APIC/APIC.h>
 #include <BlockDevice.h>
 #include <Console.h>
 #include <DriveNaming.h>

drivers/usb/hid/USBKeyboard.h

@@ -1,7 +1,7 @@
 #ifndef USB_KEYBOARD_H
 #define USB_KEYBOARD_H
 
-#include <../../xHCI/xHCI.h>
+#include <xHCI/xHCI.h>
 
 // Represents the 8-byte report sent by a standard USB HID keyboard.
 typedef struct {

drivers/vmware/SVGAII.c

@@ -1,8 +1,8 @@
 #include <SVGAII.h>
-#include <../../drivers/PCI/PCI.h>
-#include <../../include/Io.h>
-#include <../../mm/VMem.h>
-#include <../../kernel/etc/Console.h>
+#include <drivers/PCI/PCI.h>
+#include <include/Io.h>
+#include <mm/VMem.h>
+#include <kernel/etc/Console.h>
 
 // Global device info instance
 SVGAII_DeviceInfo svgaII_device;

drivers/xHCI/xHCI.c

@@ -1,7 +1,7 @@
 #include <xHCI.h>
 #include <usb/hid/USBKeyboard.h>
-#include <../../mm/MemOps.h>
-#include <../../mm/VMem.h>
+#include <mm/MemOps.h>
+#include <mm/VMem.h>
 #include <Console.h>
 #include <TSC.h>
 

fs/CharDevice.c

@@ -1,5 +1,5 @@
 #include <CharDevice.h>
-#include <../kernel/etc/StringOps.h>
+#include <kernel/etc/StringOps.h>
 
 static CharDevice_t* g_char_devices[MAX_CHAR_DEVICES];
 static int g_num_char_devices = 0;

fs/EXT/Ext2.c

@@ -1,10 +1,10 @@
 #include <Ext2.h>
-#include <../../kernel/etc/Console.h>
-#include <../../kernel/etc/StringOps.h>
+#include <kernel/etc/Console.h>
+#include <kernel/etc/StringOps.h>
 #include <Scheduler.h>
-#include <../../mm/KernelHeap.h>
-#include <../../mm/MemOps.h>
-#include <../VFS.h>
+#include <mm/KernelHeap.h>
+#include <mm/MemOps.h>
+#include <VFS.h>
 #include <FileSystem.h>
 #include <Rtc.h>
 #include <SpinlockRust.h>

fs/FsUtils.h

@@ -1,7 +1,7 @@
 #ifndef FS_UTILS_H
 #define FS_UTILS_H
 
-#include <../mm/MemOps.h>
+#include <mm/MemOps.h>
 #include <StringOps.h>
 #define MAX_PATH_COMPONENTS 32
 

fs/Iso9660.c

@@ -1,8 +1,8 @@
 #include <Iso9660.h>
 
-#include <../drivers/storage/Ide.h>
-#include <../kernel/etc/StringOps.h>
-#include <../mm/KernelHeap.h>
+#include <drivers/storage/Ide.h>
+#include <kernel/etc/StringOps.h>
+#include <mm/KernelHeap.h>
 #include <Console.h>
 #include <Format.h>
 #include <MemOps.h>

fs/VFS.c

@@ -1,5 +1,5 @@
 #include <VFS.h>
-#include <../mm/MemOps.h>
+#include <mm/MemOps.h>
 #include <BlockDevice.h>
 #include <CharDevice.h>
 #include <Console.h>

fs/devfs/DevFS.c

@@ -1,7 +1,7 @@
 #include <DevFS.h>
-#include <../CharDevice.h>
-#include <../../kernel/etc/Console.h>
-#include <../../kernel/etc/StringOps.h>
+#include <CharDevice.h>
+#include <kernel/etc/Console.h>
+#include <kernel/etc/StringOps.h>
 
 int DevfsMount(struct BlockDevice* device, const char* mount_point) {
     // DevFS is a virtual filesystem and doesn't need a device.

fs/devfs/DevFS.h

@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_DEVFS_H
 #define VOIDFRAME_DEVFS_H
 
-#include <../BlockDevice.h>
+#include <BlockDevice.h>
 
 // This is a virtual filesystem, so it doesn't have a block device.
 // The mount function is just a placeholder to satisfy the FileSystemDriver struct.

fs/procfs/ProcFS.h

@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_PROCFS_H
 #define VOIDFRAME_PROCFS_H
 
-#include <../BlockDevice.h>
+#include <BlockDevice.h>
 #include <stdint.h>
 #include <stdbool.h>
 

kernel/core/Panic.c

@@ -2,13 +2,13 @@
 #include <Io.h>
 // The ONLY necessary includes for display are now Console and Serial
 #include <ACPI.h>
-#include <../../mm/KernelHeap.h>
-#include <../../mm/PMem.h>
+#include <mm/KernelHeap.h>
+#include <mm/PMem.h>
 #include <Console.h>
 #include <Serial.h>
 
-#include <../../mm/MemOps.h>
-#include <../../mm/VMem.h>
+#include <mm/MemOps.h>
+#include <mm/VMem.h>
 #include <MLFQ.h> // For Registers struct in PanicFromInterrupt
 #include <Vesa.h>
 #include <stdint.h>

kernel/etc/Shell.c

@@ -1,8 +1,8 @@
 #include <Shell.h>
 #include <Switch/Switch.h>
 #include <arch/x86_64/features/x64.h>
-#include <../../drivers/APIC/APIC.h>
-#include <../../drivers/ethernet/interface/Icmp.h>
+#include <APIC/APIC.h>
+#include <ethernet/interface/Icmp.h>
 #include <6502/6502.h>
 #include <ACPI.h>
 #include <Compositor.h>
@@ -17,7 +17,7 @@
 #include <InitRD.h>
 #include <Iso9660.h>
 #include <KernelHeap.h>
-#include <../../mm/dynamic/rust/KernelHeapRust.h>
+#include <mm/dynamic/rust/KernelHeapRust.h>
 #include <LPT/LPT.h>
 #include <MemOps.h>
 #include <NTFS.h>

kernel/etc/VBEConsole.c

@@ -1,6 +1,6 @@
 #include <VBEConsole.h>
 
-#include <../../mm/MemOps.h>
+#include <mm/MemOps.h>
 #include <Console.h>
 #include <Vesa.h>
 #include <stdint.h>