move all kernel sources to src/kernel/

23 files changed, 22 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 8c321e9..d40066f 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ out/fs/boot/init: src/test_module
 	@mkdir -p $(@D)
 	cp $< $@
 
-out/fs/boot/kernel.bin: $(call from_sources, src/)
+out/fs/boot/kernel.bin: $(call from_sources, src/kernel/)
 	@mkdir -p $(@D)
 	$(CC) $(LFLAGS) -T linker.ld $^ -o $@
 	grub-file --is-x86-multiboot $@
diff --git a/src/arch/generic.h b/src/kernel/arch/generic.h
index 4bed2fe..17980fd 100644
--- a/src/arch/generic.h
+++ b/src/kernel/arch/generic.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <arch/log.h>
+#include <kernel/arch/log.h>
 
 // i have no idea where else to put it
 // some code assumes that it's a power of 2
diff --git a/src/arch/i386/boot.c b/src/kernel/arch/i386/boot.c
index 242d070..2bb18be 100644
--- a/src/arch/i386/boot.c
+++ b/src/kernel/arch/i386/boot.c
@@ -1,9 +1,9 @@
-#include <arch/generic.h>
-#include <arch/i386/gdt.h>
-#include <arch/i386/interrupts/idt.h>
-#include <arch/i386/multiboot.h>
-#include <arch/i386/sysenter.h>
-#include <arch/i386/tty.h>
+#include <kernel/arch/generic.h>
+#include <kernel/arch/i386/gdt.h>
+#include <kernel/arch/i386/interrupts/idt.h>
+#include <kernel/arch/i386/multiboot.h>
+#include <kernel/arch/i386/sysenter.h>
+#include <kernel/arch/i386/tty.h>
 #include <kernel/main.h>
 #include <kernel/panic.h>
 
diff --git a/src/arch/i386/boot.s b/src/kernel/arch/i386/boot.s
index 74de9b7..74de9b7 100644
--- a/src/arch/i386/boot.s
+++ b/src/kernel/arch/i386/boot.s
diff --git a/src/arch/i386/gdt.h b/src/kernel/arch/i386/gdt.h
index bcb9870..bcb9870 100644
--- a/src/arch/i386/gdt.h
+++ b/src/kernel/arch/i386/gdt.h
diff --git a/src/arch/i386/gdt/farjump.s b/src/kernel/arch/i386/gdt/farjump.s
index 85d8ba5..85d8ba5 100644
--- a/src/arch/i386/gdt/farjump.s
+++ b/src/kernel/arch/i386/gdt/farjump.s
diff --git a/src/arch/i386/gdt/gdt.c b/src/kernel/arch/i386/gdt/gdt.c
index c61002b..2935e6e 100644
--- a/src/arch/i386/gdt/gdt.c
+++ b/src/kernel/arch/i386/gdt/gdt.c
@@ -1,5 +1,5 @@
-#include <arch/generic.h>
-#include <arch/i386/gdt.h>
+#include <kernel/arch/generic.h>
+#include <kernel/arch/i386/gdt.h>
 #include <kernel/util.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/arch/i386/interrupts/idt.c b/src/kernel/arch/i386/interrupts/idt.c
index 4e23118..5573928 100644
--- a/src/arch/i386/interrupts/idt.c
+++ b/src/kernel/arch/i386/interrupts/idt.c
@@ -1,6 +1,6 @@
-#include <arch/i386/gdt.h>
-#include <arch/i386/interrupts/idt.h>
-#include <arch/i386/interrupts/isr.h>
+#include <kernel/arch/i386/gdt.h>
+#include <kernel/arch/i386/interrupts/idt.h>
+#include <kernel/arch/i386/interrupts/isr.h>
 #include <kernel/panic.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/arch/i386/interrupts/idt.h b/src/kernel/arch/i386/interrupts/idt.h
index 5627657..5627657 100644
--- a/src/arch/i386/interrupts/idt.h
+++ b/src/kernel/arch/i386/interrupts/idt.h
diff --git a/src/arch/i386/interrupts/isr.c b/src/kernel/arch/i386/interrupts/isr.c
index 1603fba..d2e3d0f 100644
--- a/src/arch/i386/interrupts/isr.c
+++ b/src/kernel/arch/i386/interrupts/isr.c
@@ -1,5 +1,5 @@
-#include <arch/i386/interrupts/isr.h>
-#include <arch/log.h>
+#include <kernel/arch/i386/interrupts/isr.h>
+#include <kernel/arch/log.h>
 #include <kernel/panic.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/arch/i386/interrupts/isr.h b/src/kernel/arch/i386/interrupts/isr.h
index 150fc46..150fc46 100644
--- a/src/arch/i386/interrupts/isr.h
+++ b/src/kernel/arch/i386/interrupts/isr.h
diff --git a/src/arch/i386/log.c b/src/kernel/arch/i386/log.c
index fc82023..84f8b04 100644
--- a/src/arch/i386/log.c
+++ b/src/kernel/arch/i386/log.c
@@ -1,5 +1,5 @@
-#include <arch/i386/tty.h>
-#include <arch/log.h>
+#include <kernel/arch/i386/tty.h>
+#include <kernel/arch/log.h>
 
 void log_write(const char *buf, size_t len) {
 	tty_write(buf, len);
diff --git a/src/arch/i386/multiboot.h b/src/kernel/arch/i386/multiboot.h
index f030247..f030247 100644
--- a/src/arch/i386/multiboot.h
+++ b/src/kernel/arch/i386/multiboot.h
diff --git a/src/arch/i386/multiboot.s b/src/kernel/arch/i386/multiboot.s
index db502cc..db502cc 100644
--- a/src/arch/i386/multiboot.s
+++ b/src/kernel/arch/i386/multiboot.s
diff --git a/src/arch/i386/sysenter.h b/src/kernel/arch/i386/sysenter.h
index b531fe8..b531fe8 100644
--- a/src/arch/i386/sysenter.h
+++ b/src/kernel/arch/i386/sysenter.h
diff --git a/src/arch/i386/sysenter.s b/src/kernel/arch/i386/sysenter.s
index 666c0f0..666c0f0 100644
--- a/src/arch/i386/sysenter.s
+++ b/src/kernel/arch/i386/sysenter.s
diff --git a/src/arch/i386/tty.c b/src/kernel/arch/i386/tty.c
index a7c74f5..b9ebdb6 100644
--- a/src/arch/i386/tty.c
+++ b/src/kernel/arch/i386/tty.c
@@ -1,4 +1,4 @@
-#include <arch/i386/tty.h>
+#include <kernel/arch/i386/tty.h>
 
 struct vga_cell {
 	unsigned char c;
diff --git a/src/arch/i386/tty.h b/src/kernel/arch/i386/tty.h
index cbb8efc..cbb8efc 100644
--- a/src/arch/i386/tty.h
+++ b/src/kernel/arch/i386/tty.h
diff --git a/src/arch/log.h b/src/kernel/arch/log.h
index 0a5d5a0..0a5d5a0 100644
--- a/src/arch/log.h
+++ b/src/kernel/arch/log.h
diff --git a/src/kernel/main.c b/src/kernel/main.c
index 761e499..677faaf 100644
--- a/src/kernel/main.c
+++ b/src/kernel/main.c
@@ -1,4 +1,4 @@
-#include <arch/generic.h>
+#include <kernel/arch/generic.h>
 #include <kernel/main.h>
 #include <kernel/mem.h>
 #include <kernel/panic.h>
diff --git a/src/kernel/mem.c b/src/kernel/mem.c
index b455b25..ba5b504 100644
--- a/src/kernel/mem.c
+++ b/src/kernel/mem.c
@@ -1,4 +1,4 @@
-#include <arch/generic.h>
+#include <kernel/arch/generic.h>
 #include <kernel/mem.h>
 #include <stdint.h>
 
diff --git a/src/kernel/panic.h b/src/kernel/panic.h
index 12d26fd..ea2cef5 100644
--- a/src/kernel/panic.h
+++ b/src/kernel/panic.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <arch/generic.h>
+#include <kernel/arch/generic.h>
 
 // dumb c shit
 #define panic_tostr2(x) #x
diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index 7d42bce..4a931a5 100644
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -1,4 +1,4 @@
-#include <arch/generic.h>
+#include <kernel/arch/generic.h>
 #include <kernel/mem.h>
 #include <kernel/proc.h>