From 336af1c2ad93a9fa79ba530ccaf1f57526724fee Mon Sep 17 00:00:00 2001 From: kaguya Date: Sun, 26 Apr 2026 14:44:40 -0400 Subject: [PATCH] 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 --- libs/uacpi/source/kernel_api.c | 8 ++--- src/arch/x86_64/{ => boot}/gdt.c | 0 src/arch/x86_64/{ => boot}/gdt.h | 0 src/arch/x86_64/{ => boot}/gdt_asm.S | 0 src/arch/x86_64/{ => boot}/idt.c | 2 +- src/arch/x86_64/{ => boot}/idt.h | 0 src/arch/x86_64/{ => boot}/idt_asm.S | 0 src/arch/x86_64/{ => boot}/isr.c | 6 ++-- src/arch/x86_64/{ => boot}/isr.h | 0 src/arch/x86_64/{ => boot}/isr_asm.S | 2 +- src/arch/x86_64/{ => boot}/isrs_gen.c | 0 src/arch/x86_64/{ => boot}/isrs_gen.inc | 0 src/arch/x86_64/{ => bus}/ata.c | 5 ++- src/arch/x86_64/{ => bus}/ata.h | 0 src/arch/x86_64/{ => bus}/pci.c | 4 +-- src/arch/x86_64/{ => bus}/pci.h | 0 src/arch/x86_64/{ => cpu}/io.h | 0 src/arch/x86_64/{ => cpu}/io_asm.S | 0 src/arch/x86_64/{ => cpu}/usermode.c | 4 +-- src/arch/x86_64/{ => cpu}/usermode.h | 0 src/arch/x86_64/{ => sys}/apic.c | 4 +-- src/arch/x86_64/{ => sys}/apic.h | 0 src/arch/x86_64/{ => sys}/e9.c | 2 +- src/arch/x86_64/{ => sys}/e9.h | 0 src/arch/x86_64/{ => sys}/i8259.c | 2 +- src/arch/x86_64/{ => sys}/i8259.h | 0 src/arch/x86_64/{ => sys}/ioapic.c | 2 +- src/arch/x86_64/{ => sys}/ioapic.h | 0 src/arch/x86_64/{ => sys}/irq.c | 8 ++--- src/arch/x86_64/{ => sys}/irq.h | 2 +- src/arch/x86_64/{ => sys}/pic.h | 0 src/arch/x86_64/{ => sys}/pit.c | 4 +-- src/arch/x86_64/{ => sys}/pit.h | 5 ++- src/{time/time.c => arch/x86_64/sys/tsc.c} | 8 ++--- src/arch/x86_64/sys/tsc.h | 9 +++++ src/{sound => drivers/audio}/hda.c | 2 +- src/{sound => drivers/audio}/hda.h | 2 +- src/{sound => drivers/audio}/pcm.c | 0 src/{sound => drivers/audio}/pcm.h | 0 src/{ => drivers}/input/input.c | 6 ++-- src/{ => drivers}/input/input.h | 0 src/{ => drivers}/input/ps2.c | 14 ++++---- src/{ => drivers}/input/ps2.h | 0 src/{ => drivers}/video/font.h | 0 src/{ => drivers}/video/render.c | 0 src/{ => drivers}/video/render.h | 0 src/{ => drivers}/video/tga.c | 0 src/{ => drivers}/video/tga.h | 0 src/fs/elf.c | 4 +-- src/fs/ext2.c | 8 ++--- src/fs/vfs.c | 8 ++--- src/{util => libk}/arrays.h | 0 src/{util => libk}/binary.h | 0 src/{ => libk}/debug.c | 0 src/{ => libk}/debug.h | 2 +- src/{ => libk}/stdio.c | 4 +-- src/{ => libk}/stdio.h | 0 src/{ => libk}/string.c | 0 src/{ => libk}/string.h | 0 src/main.c | 38 +++++++++++----------- src/mm/memory.c | 2 +- src/mm/memory.h | 2 +- src/mm/pmm.c | 2 +- src/mm/slab.c | 10 +++--- src/mm/vmm.c | 2 +- src/syscall/syscall.c | 2 +- src/time/time.h | 10 ------ 67 files changed, 96 insertions(+), 99 deletions(-) rename src/arch/x86_64/{ => boot}/gdt.c (100%) rename src/arch/x86_64/{ => boot}/gdt.h (100%) rename src/arch/x86_64/{ => boot}/gdt_asm.S (100%) rename src/arch/x86_64/{ => boot}/idt.c (97%) rename src/arch/x86_64/{ => boot}/idt.h (100%) rename src/arch/x86_64/{ => boot}/idt_asm.S (100%) rename src/arch/x86_64/{ => boot}/isr.c (97%) rename src/arch/x86_64/{ => boot}/isr.h (100%) rename src/arch/x86_64/{ => boot}/isr_asm.S (92%) rename src/arch/x86_64/{ => boot}/isrs_gen.c (100%) rename src/arch/x86_64/{ => boot}/isrs_gen.inc (100%) rename src/arch/x86_64/{ => bus}/ata.c (98%) rename src/arch/x86_64/{ => bus}/ata.h (100%) rename src/arch/x86_64/{ => bus}/pci.c (98%) rename src/arch/x86_64/{ => bus}/pci.h (100%) rename src/arch/x86_64/{ => cpu}/io.h (100%) rename src/arch/x86_64/{ => cpu}/io_asm.S (100%) rename src/arch/x86_64/{ => cpu}/usermode.c (98%) rename src/arch/x86_64/{ => cpu}/usermode.h (100%) rename src/arch/x86_64/{ => sys}/apic.c (99%) rename src/arch/x86_64/{ => sys}/apic.h (100%) rename src/arch/x86_64/{ => sys}/e9.c (82%) rename src/arch/x86_64/{ => sys}/e9.h (100%) rename src/arch/x86_64/{ => sys}/i8259.c (99%) rename src/arch/x86_64/{ => sys}/i8259.h (100%) rename src/arch/x86_64/{ => sys}/ioapic.c (99%) rename src/arch/x86_64/{ => sys}/ioapic.h (100%) rename src/arch/x86_64/{ => sys}/irq.c (95%) rename src/arch/x86_64/{ => sys}/irq.h (92%) rename src/arch/x86_64/{ => sys}/pic.h (100%) rename src/arch/x86_64/{ => sys}/pit.c (96%) rename src/arch/x86_64/{ => sys}/pit.h (81%) rename src/{time/time.c => arch/x86_64/sys/tsc.c} (90%) create mode 100644 src/arch/x86_64/sys/tsc.h rename src/{sound => drivers/audio}/hda.c (99%) rename src/{sound => drivers/audio}/hda.h (99%) rename src/{sound => drivers/audio}/pcm.c (100%) rename src/{sound => drivers/audio}/pcm.h (100%) rename src/{ => drivers}/input/input.c (97%) rename src/{ => drivers}/input/input.h (100%) rename src/{ => drivers}/input/ps2.c (97%) rename src/{ => drivers}/input/ps2.h (100%) rename src/{ => drivers}/video/font.h (100%) rename src/{ => drivers}/video/render.c (100%) rename src/{ => drivers}/video/render.h (100%) rename src/{ => drivers}/video/tga.c (100%) rename src/{ => drivers}/video/tga.h (100%) rename src/{util => libk}/arrays.h (100%) rename src/{util => libk}/binary.h (100%) rename src/{ => libk}/debug.c (100%) rename src/{ => libk}/debug.h (95%) rename src/{ => libk}/stdio.c (99%) rename src/{ => libk}/stdio.h (100%) rename src/{ => libk}/string.c (100%) rename src/{ => libk}/string.h (100%) delete mode 100644 src/time/time.h diff --git a/libs/uacpi/source/kernel_api.c b/libs/uacpi/source/kernel_api.c index 6dc42eb..c14df59 100644 --- a/libs/uacpi/source/kernel_api.c +++ b/libs/uacpi/source/kernel_api.c @@ -1,10 +1,10 @@ #include #include #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 #include #include "mm/vmm.h" diff --git a/src/arch/x86_64/gdt.c b/src/arch/x86_64/boot/gdt.c similarity index 100% rename from src/arch/x86_64/gdt.c rename to src/arch/x86_64/boot/gdt.c diff --git a/src/arch/x86_64/gdt.h b/src/arch/x86_64/boot/gdt.h similarity index 100% rename from src/arch/x86_64/gdt.h rename to src/arch/x86_64/boot/gdt.h diff --git a/src/arch/x86_64/gdt_asm.S b/src/arch/x86_64/boot/gdt_asm.S similarity index 100% rename from src/arch/x86_64/gdt_asm.S rename to src/arch/x86_64/boot/gdt_asm.S diff --git a/src/arch/x86_64/idt.c b/src/arch/x86_64/boot/idt.c similarity index 97% rename from src/arch/x86_64/idt.c rename to src/arch/x86_64/boot/idt.c index 0aedfc5..72bb696 100644 --- a/src/arch/x86_64/idt.c +++ b/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]; diff --git a/src/arch/x86_64/idt.h b/src/arch/x86_64/boot/idt.h similarity index 100% rename from src/arch/x86_64/idt.h rename to src/arch/x86_64/boot/idt.h diff --git a/src/arch/x86_64/idt_asm.S b/src/arch/x86_64/boot/idt_asm.S similarity index 100% rename from src/arch/x86_64/idt_asm.S rename to src/arch/x86_64/boot/idt_asm.S diff --git a/src/arch/x86_64/isr.c b/src/arch/x86_64/boot/isr.c similarity index 97% rename from src/arch/x86_64/isr.c rename to src/arch/x86_64/boot/isr.c index b255b6d..3818712 100644 --- a/src/arch/x86_64/isr.c +++ b/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" diff --git a/src/arch/x86_64/isr.h b/src/arch/x86_64/boot/isr.h similarity index 100% rename from src/arch/x86_64/isr.h rename to src/arch/x86_64/boot/isr.h diff --git a/src/arch/x86_64/isr_asm.S b/src/arch/x86_64/boot/isr_asm.S similarity index 92% rename from src/arch/x86_64/isr_asm.S rename to src/arch/x86_64/boot/isr_asm.S index e6ce249..9066d91 100644 --- a/src/arch/x86_64/isr_asm.S +++ b/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 diff --git a/src/arch/x86_64/isrs_gen.c b/src/arch/x86_64/boot/isrs_gen.c similarity index 100% rename from src/arch/x86_64/isrs_gen.c rename to src/arch/x86_64/boot/isrs_gen.c diff --git a/src/arch/x86_64/isrs_gen.inc b/src/arch/x86_64/boot/isrs_gen.inc similarity index 100% rename from src/arch/x86_64/isrs_gen.inc rename to src/arch/x86_64/boot/isrs_gen.inc diff --git a/src/arch/x86_64/ata.c b/src/arch/x86_64/bus/ata.c similarity index 98% rename from src/arch/x86_64/ata.c rename to src/arch/x86_64/bus/ata.c index a03c43e..54cd467 100644 --- a/src/arch/x86_64/ata.c +++ b/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 diff --git a/src/arch/x86_64/ata.h b/src/arch/x86_64/bus/ata.h similarity index 100% rename from src/arch/x86_64/ata.h rename to src/arch/x86_64/bus/ata.h diff --git a/src/arch/x86_64/pci.c b/src/arch/x86_64/bus/pci.c similarity index 98% rename from src/arch/x86_64/pci.c rename to src/arch/x86_64/bus/pci.c index 07b2d2f..be8b427 100644 --- a/src/arch/x86_64/pci.c +++ b/src/arch/x86_64/bus/pci.c @@ -1,6 +1,6 @@ #include "pci.h" -#include "arch/x86_64/io.h" -#include +#include "arch/x86_64/cpu/io.h" +#include "libk/stdio.h" #define PCI_CFG_ADDR 0x0CF8 #define PCI_CFG_DATA 0x0CFC diff --git a/src/arch/x86_64/pci.h b/src/arch/x86_64/bus/pci.h similarity index 100% rename from src/arch/x86_64/pci.h rename to src/arch/x86_64/bus/pci.h diff --git a/src/arch/x86_64/io.h b/src/arch/x86_64/cpu/io.h similarity index 100% rename from src/arch/x86_64/io.h rename to src/arch/x86_64/cpu/io.h diff --git a/src/arch/x86_64/io_asm.S b/src/arch/x86_64/cpu/io_asm.S similarity index 100% rename from src/arch/x86_64/io_asm.S rename to src/arch/x86_64/cpu/io_asm.S diff --git a/src/arch/x86_64/usermode.c b/src/arch/x86_64/cpu/usermode.c similarity index 98% rename from src/arch/x86_64/usermode.c rename to src/arch/x86_64/cpu/usermode.c index 5728f7e..4ff7b4d 100644 --- a/src/arch/x86_64/usermode.c +++ b/src/arch/x86_64/cpu/usermode.c @@ -1,9 +1,9 @@ #include -#include +#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; diff --git a/src/arch/x86_64/usermode.h b/src/arch/x86_64/cpu/usermode.h similarity index 100% rename from src/arch/x86_64/usermode.h rename to src/arch/x86_64/cpu/usermode.h diff --git a/src/arch/x86_64/apic.c b/src/arch/x86_64/sys/apic.c similarity index 99% rename from src/arch/x86_64/apic.c rename to src/arch/x86_64/sys/apic.c index 3511e50..4210a6e 100644 --- a/src/arch/x86_64/apic.c +++ b/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 */ diff --git a/src/arch/x86_64/apic.h b/src/arch/x86_64/sys/apic.h similarity index 100% rename from src/arch/x86_64/apic.h rename to src/arch/x86_64/sys/apic.h diff --git a/src/arch/x86_64/e9.c b/src/arch/x86_64/sys/e9.c similarity index 82% rename from src/arch/x86_64/e9.c rename to src/arch/x86_64/sys/e9.c index ec5ee00..391a55a 100644 --- a/src/arch/x86_64/e9.c +++ b/src/arch/x86_64/sys/e9.c @@ -1,5 +1,5 @@ #include "e9.h" -#include +#include "arch/x86_64/cpu/io.h" void e9_putc(char c) { diff --git a/src/arch/x86_64/e9.h b/src/arch/x86_64/sys/e9.h similarity index 100% rename from src/arch/x86_64/e9.h rename to src/arch/x86_64/sys/e9.h diff --git a/src/arch/x86_64/i8259.c b/src/arch/x86_64/sys/i8259.c similarity index 99% rename from src/arch/x86_64/i8259.c rename to src/arch/x86_64/sys/i8259.c index f66967e..40a9b48 100644 --- a/src/arch/x86_64/i8259.c +++ b/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 #define PIC1_COMMAND_PORT 0x20 diff --git a/src/arch/x86_64/i8259.h b/src/arch/x86_64/sys/i8259.h similarity index 100% rename from src/arch/x86_64/i8259.h rename to src/arch/x86_64/sys/i8259.h diff --git a/src/arch/x86_64/ioapic.c b/src/arch/x86_64/sys/ioapic.c similarity index 99% rename from src/arch/x86_64/ioapic.c rename to src/arch/x86_64/sys/ioapic.c index 177bcf2..c1d192c 100644 --- a/src/arch/x86_64/ioapic.c +++ b/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_table_find_by_signature / uacpi_table_unref */ #include "pic.h" diff --git a/src/arch/x86_64/ioapic.h b/src/arch/x86_64/sys/ioapic.h similarity index 100% rename from src/arch/x86_64/ioapic.h rename to src/arch/x86_64/sys/ioapic.h diff --git a/src/arch/x86_64/irq.c b/src/arch/x86_64/sys/irq.c similarity index 95% rename from src/arch/x86_64/irq.c rename to src/arch/x86_64/sys/irq.c index 14ed264..cbd26fb 100644 --- a/src/arch/x86_64/irq.c +++ b/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 -#include -#include "stdio.h" -#include +#include "libk/arrays.h" +#include "libk/stdio.h" +#include "libk/debug.h" #include "apic.h" #include "ioapic.h" diff --git a/src/arch/x86_64/irq.h b/src/arch/x86_64/sys/irq.h similarity index 92% rename from src/arch/x86_64/irq.h rename to src/arch/x86_64/sys/irq.h index f35e664..4684e56 100644 --- a/src/arch/x86_64/irq.h +++ b/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); diff --git a/src/arch/x86_64/pic.h b/src/arch/x86_64/sys/pic.h similarity index 100% rename from src/arch/x86_64/pic.h rename to src/arch/x86_64/sys/pic.h diff --git a/src/arch/x86_64/pit.c b/src/arch/x86_64/sys/pit.c similarity index 96% rename from src/arch/x86_64/pit.c rename to src/arch/x86_64/sys/pit.c index 8893dd8..c6708db 100644 --- a/src/arch/x86_64/pit.c +++ b/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 -#include "stdio.h" +#include "libk/stdio.h" #include "e9.h" #include "limine.h" #include "apic.h" diff --git a/src/arch/x86_64/pit.h b/src/arch/x86_64/sys/pit.h similarity index 81% rename from src/arch/x86_64/pit.h rename to src/arch/x86_64/sys/pit.h index a6341fa..57ad5f9 100644 --- a/src/arch/x86_64/pit.h +++ b/src/arch/x86_64/sys/pit.h @@ -1,9 +1,8 @@ #pragma once #include #include "irq.h" -#include "io.h" -#include -#include "stdio.h" +#include "arch/x86_64/cpu/io.h" +#include "libk/stdio.h" #include "e9.h" extern volatile uint64_t g_Ticks; diff --git a/src/time/time.c b/src/arch/x86_64/sys/tsc.c similarity index 90% rename from src/time/time.c rename to src/arch/x86_64/sys/tsc.c index 1176d93..b9ff044 100644 --- a/src/time/time.c +++ b/src/arch/x86_64/sys/tsc.c @@ -1,8 +1,8 @@ #include -#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); diff --git a/src/arch/x86_64/sys/tsc.h b/src/arch/x86_64/sys/tsc.h new file mode 100644 index 0000000..ae61562 --- /dev/null +++ b/src/arch/x86_64/sys/tsc.h @@ -0,0 +1,9 @@ +#include +#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); \ No newline at end of file diff --git a/src/sound/hda.c b/src/drivers/audio/hda.c similarity index 99% rename from src/sound/hda.c rename to src/drivers/audio/hda.c index 385185c..7b76459 100644 --- a/src/sound/hda.c +++ b/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 ─────────────────────────────────────────────────────────── */ diff --git a/src/sound/hda.h b/src/drivers/audio/hda.h similarity index 99% rename from src/sound/hda.h rename to src/drivers/audio/hda.h index c027117..98e3b22 100644 --- a/src/sound/hda.h +++ b/src/drivers/audio/hda.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include "arch/x86_64/pci.h" +#include "arch/x86_64/bus/pci.h" /* ── HDA MMIO register offsets ─────────────────────────────────────────────── */ #define HDA_GCAP 0x00 /* u16 Global Capabilities */ diff --git a/src/sound/pcm.c b/src/drivers/audio/pcm.c similarity index 100% rename from src/sound/pcm.c rename to src/drivers/audio/pcm.c diff --git a/src/sound/pcm.h b/src/drivers/audio/pcm.h similarity index 100% rename from src/sound/pcm.h rename to src/drivers/audio/pcm.h diff --git a/src/input/input.c b/src/drivers/input/input.c similarity index 97% rename from src/input/input.c rename to src/drivers/input/input.c index fba95c2..6c476f6 100644 --- a/src/input/input.c +++ b/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 #include "mm/memory.h" -#include "string.h" +#include "libk/string.h" /* ------------------------------------------------------------------ * * Event ring-buffer diff --git a/src/input/input.h b/src/drivers/input/input.h similarity index 100% rename from src/input/input.h rename to src/drivers/input/input.h diff --git a/src/input/ps2.c b/src/drivers/input/ps2.c similarity index 97% rename from src/input/ps2.c rename to src/drivers/input/ps2.c index 05ff4a6..cf54090 100644 --- a/src/input/ps2.c +++ b/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 */ diff --git a/src/input/ps2.h b/src/drivers/input/ps2.h similarity index 100% rename from src/input/ps2.h rename to src/drivers/input/ps2.h diff --git a/src/video/font.h b/src/drivers/video/font.h similarity index 100% rename from src/video/font.h rename to src/drivers/video/font.h diff --git a/src/video/render.c b/src/drivers/video/render.c similarity index 100% rename from src/video/render.c rename to src/drivers/video/render.c diff --git a/src/video/render.h b/src/drivers/video/render.h similarity index 100% rename from src/video/render.h rename to src/drivers/video/render.h diff --git a/src/video/tga.c b/src/drivers/video/tga.c similarity index 100% rename from src/video/tga.c rename to src/drivers/video/tga.c diff --git a/src/video/tga.h b/src/drivers/video/tga.h similarity index 100% rename from src/video/tga.h rename to src/drivers/video/tga.h diff --git a/src/fs/elf.c b/src/fs/elf.c index 5d229e6..310001c 100644 --- a/src/fs/elf.c +++ b/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" diff --git a/src/fs/ext2.c b/src/fs/ext2.c index 1b7ec31..6d2132b 100644 --- a/src/fs/ext2.c +++ b/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 -#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 ───────────────────────────────────────────────────────────── diff --git a/src/fs/vfs.c b/src/fs/vfs.c index e4f42d8..b148d7f 100644 --- a/src/fs/vfs.c +++ b/src/fs/vfs.c @@ -1,10 +1,10 @@ #include "vfs.h" -#include