chore: reorganize file directories

We have reorganized all the file directories that previously looked ugly as hell (cough cough arch/x86_64 cough)

Now it looks much cleaner

Signed-off-by: kaguya <vpshinomiya@protonmail.com>

libs/uacpi/source/kernel_api.c

@@ -1,10 +1,10 @@
 #include <uacpi/types.h>
 #include <uacpi/platform/arch_helpers.h>
 #include "mm/memory.h"
-#include "arch/x86_64/io.h"
-#include "arch/x86_64/irq.h"
-#include "arch/x86_64/pit.h"
-#include "time/time.h"
+#include "arch/x86_64/cpu/io.h"
+#include "arch/x86_64/sys/irq.h"
+#include "arch/x86_64/sys/pit.h"
+#include "arch/x86_64/sys/tsc.h"
 #include <stdatomic.h>
 #include <stdarg.h>
 #include "mm/vmm.h"

src/arch/x86_64/boot/idt.c

@@ -1,5 +1,5 @@
 #include "idt.h"
-#include "util/binary.h"
+#include "libk/binary.h"
 
 
 IDTEntry g_IDT[256];

src/arch/x86_64/boot/isr.c

@@ -1,7 +1,7 @@
 // ... includes ...
-#include "io.h"
-#include "debug.h"
-#include "arch/x86_64/isr.h"
+#include "arch/x86_64/cpu/io.h"
+#include "libk/debug.h"
+#include "arch/x86_64/boot/isr.h"
 #include "idt.h"
 #define MODULE "ISR"
 

src/arch/x86_64/boot/isr_asm.S

@@ -16,7 +16,7 @@ x86_64_ISR\num:
     jmp isr_common
 .endm
 
-.include "arch/x86_64/isrs_gen.inc"   // ← update path if needed
+.include "arch/x86_64/boot/isrs_gen.inc"
 
 isr_common:
     push rax

src/arch/x86_64/bus/ata.c

@@ -1,7 +1,6 @@
 #include "ata.h"
-#include "io.h"
-#include "stdio.h"
-#include "memory.h"
+#include "arch/x86_64/cpu/io.h"
+#include "libk/stdio.h"
 #include <stdbool.h>
 
 

src/arch/x86_64/bus/pci.c

@@ -1,6 +1,6 @@
 #include "pci.h"
-#include "arch/x86_64/io.h"
-#include <stdio.h>
+#include "arch/x86_64/cpu/io.h"
+#include "libk/stdio.h"
 
 #define PCI_CFG_ADDR 0x0CF8
 #define PCI_CFG_DATA 0x0CFC

src/arch/x86_64/cpu/usermode.c

@@ -1,9 +1,9 @@
 #include <stdint.h>
-#include <string.h>
+#include "libk/string.h"
 #include "mm/pmm.h"
 #include "mm/vmm.h"
 #include "mm/memory.h"
-#include "stdio.h"
+#include "libk/stdio.h"
 #include "fs/elf.h"
 
 extern uintptr_t g_hhdm_offset;

src/arch/x86_64/sys/apic.c

@@ -1,8 +1,8 @@
 #include "apic.h"
 #include "mm/vmm.h"
 #include "mm/memory.h"
-#include "stdio.h"
-
+#include "arch/x86_64/cpu/io.h"
+#include "libk/stdio.h"
 /* ── Internal state ───────────────────────────────────────────────────────── */
 static volatile uint32_t *g_lapic = NULL;   /* Virtual address of LAPIC MMIO */
 

src/arch/x86_64/sys/e9.c

@@ -1,5 +1,5 @@
 #include "e9.h"
-#include <arch/x86_64/io.h>
+#include "arch/x86_64/cpu/io.h"
 
 void e9_putc(char c)
 {

src/arch/x86_64/sys/i8259.c

@@ -1,5 +1,5 @@
 #include "pic.h"
-#include "io.h"
+#include "arch/x86_64/cpu/io.h"
 #include <stdbool.h>
 
 #define PIC1_COMMAND_PORT           0x20

src/arch/x86_64/sys/ioapic.c

@@ -2,7 +2,7 @@
 #include "apic.h"
 #include "mm/vmm.h"
 #include "mm/memory.h"
-#include "stdio.h"
+#include "libk/stdio.h"
 #include <uacpi/tables.h>   /* uacpi_table_find_by_signature / uacpi_table_unref */
 #include "pic.h"
 

src/arch/x86_64/sys/irq.c

@@ -1,10 +1,10 @@
 #include "irq.h"
 #include "i8259.h"
-#include "io.h"
+#include "arch/x86_64/cpu/io.h"
 #include <stddef.h>
-#include <util/arrays.h>
-#include "stdio.h"
-#include <debug.h>
+#include "libk/arrays.h"
+#include "libk/stdio.h"
+#include "libk/debug.h"
 #include "apic.h"
 #include "ioapic.h"
 

src/arch/x86_64/sys/irq.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "isr.h"
+#include "arch/x86_64/boot/isr.h"
 
 
 typedef void (*IRQHandler)(Registers* regs);

src/arch/x86_64/sys/pit.c

@@ -1,8 +1,8 @@
 #include "pit.h"
 #include "irq.h"
-#include "io.h"
+#include "arch/x86_64/cpu/io.h"
 #include <stdint.h>
-#include "stdio.h"
+#include "libk/stdio.h"
 #include "e9.h"
 #include "limine.h"
 #include "apic.h"

src/arch/x86_64/sys/pit.h

@@ -1,9 +1,8 @@
 #pragma once
 #include <stdint.h>
 #include "irq.h"
-#include "io.h"
-#include <stdint.h>
-#include "stdio.h"
+#include "arch/x86_64/cpu/io.h"
+#include "libk/stdio.h"
 #include "e9.h"
 
 extern volatile uint64_t g_Ticks;

src/arch/x86_64/sys/tsc.c

@@ -1,8 +1,8 @@
 #include <stdint.h>
-#include "arch/x86_64/pit.h"
-#include "arch/x86_64/io.h"
-#include "stdio.h"
-#include "time.h"
+#include "arch/x86_64/sys/pit.h"
+#include "arch/x86_64/cpu/io.h"
+#include "libk/stdio.h"
+#include "tsc.h"
 
 extern uint64_t PIT_GetTicks(void);
 

src/arch/x86_64/sys/tsc.h

@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include "arch/x86_64/sys/pit.h"
+#include "arch/x86_64/cpu/io.h"
+#include "libk/stdio.h"
+uint64_t rdtsc(void);
+
+
+
+void calibrate_tsc(void);

src/drivers/audio/hda.c

@@ -2,7 +2,7 @@
 #include "mm/vmm.h"
 #include "mm/pmm.h"
 #include "mm/memory.h"
-#include "stdio.h"
+#include "libk/stdio.h"
 
 /* ── Module globals ─────────────────────────────────────────────────────────── */
 

src/drivers/audio/hda.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <stdint.h>
 #include <stdbool.h>
-#include "arch/x86_64/pci.h"
+#include "arch/x86_64/bus/pci.h"
  
 /* ── HDA MMIO register offsets ─────────────────────────────────────────────── */
 #define HDA_GCAP        0x00   /* u16  Global Capabilities                     */

src/drivers/input/input.c

@@ -1,10 +1,10 @@
-#include "input/input.h"
+#include "drivers/input/input.h"
 #include "mp/spinlock.h"
-#include "stdio.h"
+#include "libk/stdio.h"
 #include "fs/vfs.h"
 #include <stddef.h>
 #include "mm/memory.h"
-#include "string.h"
+#include "libk/string.h"
 
 /* ------------------------------------------------------------------ *
  * Event ring-buffer

src/drivers/input/ps2.c

@@ -1,11 +1,11 @@
 #include "ps2.h"
-#include "input/input.h"
-#include "arch/x86_64/irq.h"
-#include "arch/x86_64/isr.h"
-#include "arch/x86_64/io.h"
-#include "arch/x86_64/ioapic.h"
-#include "arch/x86_64/apic.h"
-#include "stdio.h"
+#include "drivers/input/input.h"
+#include "arch/x86_64/sys/irq.h"
+#include "arch/x86_64/boot/isr.h"
+#include "arch/x86_64/cpu/io.h"
+#include "arch/x86_64/sys/ioapic.h"
+#include "arch/x86_64/sys/apic.h"
+#include "libk/stdio.h"
 
 /* ── PS/2 I/O ports ───────────────────────────────────────────────────────── */
 #define PS2_DATA_PORT   0x60    /* Read: scancode / Write: command data */

src/fs/elf.c

@@ -1,6 +1,6 @@
 #include "elf.h"
-#include "stdio.h"
-#include "string.h"
+#include "libk/stdio.h"
+#include "libk/string.h"
 #include "mm/pmm.h"
 #include "mm/vmm.h"
 #include "mm/memory.h"

src/fs/ext2.c

@@ -1,11 +1,11 @@
 #include "ext2.h"
-#include "arch/x86_64/ata.h"
+#include "arch/x86_64/bus/ata.h"
 #include "mm/memory.h"
-#include "stdio.h"
+#include "libk/stdio.h"
 #include <stdbool.h>
-#include "string.h"
+#include "libk/string.h"
 #include "mp/spinlock.h"
-#include "arch/x86_64/pit.h"
+#include "arch/x86_64/sys/pit.h"
 
 // ── module state ─────────────────────────────────────────────────────────────
 

src/fs/vfs.c

@@ -1,10 +1,10 @@
 #include "vfs.h"
-#include <video/render.h>
-#include <arch/x86_64/e9.h>
+#include "drivers/video/render.h"
+#include "arch/x86_64/sys/e9.h"
 #include "mp/spinlock.h"
-#include "stdio.h"
+#include "libk/stdio.h"
 #include "mm/memory.h"
-#include "string.h"
+#include "libk/string.h"
 
 static spinlock_t s_vfs_lock = SPINLOCK_INIT;
 static vfs_file_t vfs_fd_table[VFS_MAX_FDS];

src/libk/debug.h

@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include "libk/stdio.h"
 
 #define MIN_LOG_LEVEL LVL_DEBUG
 

src/libk/stdio.c

@@ -2,8 +2,8 @@
 #include <stdbool.h>
 #include "stdio.h"
 #include "debug.h"
-#include "video/render.h"
-#include "arch/x86_64/e9.h"
+#include "drivers/video/render.h"
+#include "arch/x86_64/sys/e9.h"
 #include "mp/spinlock.h"
 #include <stddef.h>
 #include <limits.h>

src/main.c

@@ -2,35 +2,35 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <limine.h>
-#include "video/render.h"
-#include "video/tga.h"
-#include "stdio.h"
-#include "arch/x86_64/gdt.h"
-#include "arch/x86_64/idt.h"
-#include "arch/x86_64/isr.h"
-#include "arch/x86_64/irq.h"
+#include "drivers/video/render.h"
+#include "drivers/video/tga.h"
+#include "libk/stdio.h"
+#include "arch/x86_64/boot/gdt.h"
+#include "arch/x86_64/boot/idt.h"
+#include "arch/x86_64/boot/isr.h"
+#include "arch/x86_64/sys/irq.h"
 #include "mm/memory.h"
 #include "mm/pmm.h"
 #include "mm/vmm.h"
-#include "arch/x86_64/ata.h"
+#include "arch/x86_64/bus/ata.h"
 #include "fs/ext2.h"
 #include "string.h"
-#include "arch/x86_64/io.h"
-#include "arch/x86_64/usermode.h"
+#include "arch/x86_64/cpu/io.h"
+#include "arch/x86_64/cpu/usermode.h"
 #include "syscall/syscall.h"
 #include "fs/vfs.h"
-#include "time/time.h"
-#include "arch/x86_64/pit.h"
+#include "arch/x86_64/sys/tsc.h"
+#include "arch/x86_64/sys/pit.h"
 #include <uacpi/uacpi.h>
 #include <uacpi/event.h>
 #include <uacpi/sleep.h>
-#include "arch/x86_64/pci.h"
-#include "sound/hda.h"
-#include "sound/pcm.h"
-#include "input/input.h"
-#include "arch/x86_64/apic.h"
-#include "arch/x86_64/ioapic.h"
-#include "input/ps2.h"
+#include "arch/x86_64/bus/pci.h"
+#include "drivers/audio/hda.h"
+#include "drivers/audio/pcm.h"
+#include "drivers/input/input.h"
+#include "arch/x86_64/sys/apic.h"
+#include "arch/x86_64/sys/ioapic.h"
+#include "drivers/input/ps2.h"
 
 
 uintptr_t g_hhdm_offset;

src/mm/memory.c

@@ -2,7 +2,7 @@
 #include "stddef.h"
 
 #include "pmm.h"
-#include "stdio.h"
+#include "libk/stdio.h"
 #include "vmm.h"
 #include <stdbool.h>
 #include "mp/spinlock.h"

src/mm/memory.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <stdint.h>
 #include "stddef.h"
-#include "slab.h"   // kmalloc/kfree now come from slab
+#include "slab.h"
 
 #define ALIGN_DOWN(x, a)   ((x) & ~((a)-1))
 #define ALIGN_UP(x, a)     (((x) + (a)-1) & ~((a)-1))

src/mm/pmm.c

@@ -1,7 +1,7 @@
 #include "pmm.h"
 #include "vmm.h"          // for MEM_PHYS_OFFSET
 #include "memory.h"    // memset
-#include "stdio.h"
+#include "libk/stdio.h"
 
 static spinlock_t memory_lock = SPINLOCK_INIT;
 static uint8_t *bitmap = NULL;

src/mm/slab.c

@@ -1,11 +1,11 @@
 #include "memory.h"
-#include <mp/spinlock.h>
-#include <mm/pmm.h>
-#include <mm/slab.h>
-#include <mm/vmm.h>
+#include "mp/spinlock.h"
+#include "pmm.h"
+#include "slab.h"
+#include "vmm.h"
 #include <stdbool.h>
 #include <stdint.h>
-#include "stdio.h"
+#include "libk/stdio.h"
 
 struct slab {
 	spinlock_t lock;

src/mm/vmm.c

@@ -1,7 +1,7 @@
 #include "vmm.h"
 #include "pmm.h"
 #include "memory.h"
-#include "stdio.h"
+#include "libk/stdio.h"
 
 
 struct pagemap *kernel_pagemap = NULL;

src/syscall/syscall.c

@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "stdio.h"
+#include "libk/stdio.h"
 #include "mp/percpu.h"
 #include "fs/vfs.h"
 #include "syscall.h"

src/time/time.h

@@ -1,10 +0,0 @@
-#include <stdint.h>
-#include "arch/x86_64/pit.h"
-#include "arch/x86_64/io.h"
-#include "stdio.h"
-
-uint64_t rdtsc(void);
-
-
-
-void calibrate_tsc(void);