From b7b33fefca2c9879e3934453272d5a03dd614e23 Mon Sep 17 00:00:00 2001
From: Ruslan Isaev <ubijca16@gmail.com>
Date: Fri, 4 Apr 2025 14:28:33 +0300
Subject: [PATCH] organize source files into separate directories

---
 Makefile                     | 32 ++++++++++++++++----------------
 src/{ => drivers}/disk.c     |  0
 src/{ => drivers}/fat.c      |  0
 src/{ => drivers}/keyboard.c |  0
 src/{ => drivers}/screen.c   |  0
 src/{ => kernel}/idt.c       |  0
 src/{ => kernel}/isr.c       |  0
 src/{ => kernel}/kernel.c    |  0
 src/{ => kernel}/pic.c       |  0
 src/{ => kernel}/pit.c       |  0
 src/{ => mm}/paging.c        |  0
 src/{ => tasking}/switch.asm |  0
 src/{ => tasking}/task.c     |  0
 src/{ => utils}/stdio.c      |  0
 src/{ => utils}/string.c     |  0
 src/{ => utils}/utils.c      |  0
 16 files changed, 16 insertions(+), 16 deletions(-)
 rename src/{ => drivers}/disk.c (100%)
 rename src/{ => drivers}/fat.c (100%)
 rename src/{ => drivers}/keyboard.c (100%)
 rename src/{ => drivers}/screen.c (100%)
 rename src/{ => kernel}/idt.c (100%)
 rename src/{ => kernel}/isr.c (100%)
 rename src/{ => kernel}/kernel.c (100%)
 rename src/{ => kernel}/pic.c (100%)
 rename src/{ => kernel}/pit.c (100%)
 rename src/{ => mm}/paging.c (100%)
 rename src/{ => tasking}/switch.asm (100%)
 rename src/{ => tasking}/task.c (100%)
 rename src/{ => utils}/stdio.c (100%)
 rename src/{ => utils}/string.c (100%)
 rename src/{ => utils}/utils.c (100%)

diff --git a/Makefile b/Makefile
index 34f836a..c66beeb 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CC = gcc -D__is_katauos
 AS = nasm
 
 # Define the compiler flags
-CFLAGS = -std=gnu99 -ffreestanding -O0 -Wall -Wextra -m32 -g
+CFLAGS = -I./include/ -std=gnu99 -ffreestanding -O0 -Wall -Wextra -m32 -g
 ASFLAGS = -f elf32
 
 # Define the linker flags
@@ -57,49 +57,49 @@ $(OUTPUT): $(OBJS)
 bin/boot.o: src/boot.asm
 	$(AS) $(ASFLAGS) $< -o $@
 
-bin/kernel.o: src/kernel.c
+bin/kernel.o: src/kernel/kernel.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/screen.o: src/screen.c
+bin/screen.o: src/drivers/screen.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/isr.o: src/isr.c
+bin/isr.o: src/kernel/isr.c
 	$(CC) $(CFLAGS) -mgeneral-regs-only -c $< -o $@
 
-bin/idt.o: src/idt.c
+bin/idt.o: src/kernel/idt.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/utils.o: src/utils.c
+bin/utils.o: src/utils/utils.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/string.o: src/string.c
+bin/string.o: src/utils/string.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/stdio.o: src/stdio.c
+bin/stdio.o: src/utils/stdio.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/disk.o: src/disk.c
+bin/disk.o: src/drivers/disk.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/pic.o: src/pic.c
+bin/pic.o: src/kernel/pic.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/pit.o: src/pit.c
+bin/pit.o: src/kernel/pit.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/keyboard.o: src/keyboard.c
+bin/keyboard.o: src/drivers/keyboard.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/paging.o: src/paging.c
+bin/paging.o: src/mm/paging.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/fat.o: src/fat.c
+bin/fat.o: src/drivers/fat.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-bin/switch.o: src/switch.asm
+bin/switch.o: src/tasking/switch.asm
 	$(AS) $(ASFLAGS) $< -o $@
 
-bin/task.o: src/task.c
+bin/task.o: src/tasking/task.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
 clean:
diff --git a/src/disk.c b/src/drivers/disk.c
similarity index 100%
rename from src/disk.c
rename to src/drivers/disk.c
diff --git a/src/fat.c b/src/drivers/fat.c
similarity index 100%
rename from src/fat.c
rename to src/drivers/fat.c
diff --git a/src/keyboard.c b/src/drivers/keyboard.c
similarity index 100%
rename from src/keyboard.c
rename to src/drivers/keyboard.c
diff --git a/src/screen.c b/src/drivers/screen.c
similarity index 100%
rename from src/screen.c
rename to src/drivers/screen.c
diff --git a/src/idt.c b/src/kernel/idt.c
similarity index 100%
rename from src/idt.c
rename to src/kernel/idt.c
diff --git a/src/isr.c b/src/kernel/isr.c
similarity index 100%
rename from src/isr.c
rename to src/kernel/isr.c
diff --git a/src/kernel.c b/src/kernel/kernel.c
similarity index 100%
rename from src/kernel.c
rename to src/kernel/kernel.c
diff --git a/src/pic.c b/src/kernel/pic.c
similarity index 100%
rename from src/pic.c
rename to src/kernel/pic.c
diff --git a/src/pit.c b/src/kernel/pit.c
similarity index 100%
rename from src/pit.c
rename to src/kernel/pit.c
diff --git a/src/paging.c b/src/mm/paging.c
similarity index 100%
rename from src/paging.c
rename to src/mm/paging.c
diff --git a/src/switch.asm b/src/tasking/switch.asm
similarity index 100%
rename from src/switch.asm
rename to src/tasking/switch.asm
diff --git a/src/task.c b/src/tasking/task.c
similarity index 100%
rename from src/task.c
rename to src/tasking/task.c
diff --git a/src/stdio.c b/src/utils/stdio.c
similarity index 100%
rename from src/stdio.c
rename to src/utils/stdio.c
diff --git a/src/string.c b/src/utils/string.c
similarity index 100%
rename from src/string.c
rename to src/utils/string.c
diff --git a/src/utils.c b/src/utils/utils.c
similarity index 100%
rename from src/utils.c
rename to src/utils/utils.c