From a1fd3c5e511202614d869ff80b8ba6d6ef28d1e1 Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Wed, 19 Feb 2020 19:28:30 +0100
Subject: [PATCH] Reworking on tree

---
 Makefile                              | 11 ++++++-----
 kaleid/{kernel/io => drivers}/ata.asm |  0
 kaleid/{kernel/io => drivers}/ata.c   |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename kaleid/{kernel/io => drivers}/ata.asm (100%)
 rename kaleid/{kernel/io => drivers}/ata.c (95%)

diff --git a/Makefile b/Makefile
index ebe01ea..d0963f3 100644
--- a/Makefile
+++ b/Makefile
@@ -113,10 +113,11 @@ KernSources =	kernel/ke/cpuid.c kernel/mm/paging.c			\
 		kernel/ke/rtc.c kernel/io/keyb.c			\
 		kernel/io/spkr.c kernel/po/shtdwn.c			\
 		kernel/sh/shell.c kernel/sh/shcmds.c			\
-		kernel/sh/musage.c kernel/io/ata.c			\
+		kernel/sh/musage.c 					\
 		kernel/sh/argv.c kernel/ke/pit.c			\
 		kernel/sh/testcmds.c kernel/mm/palloc.c			\
-		kernel/io/acpi.c kernel/io/pci.c
+		kernel/io/acpi.c kernel/io/pci.c			\
+		drivers/ata.c
 
 KernObj=$(patsubst %.c,$(KOBJDIR)/%.o,$(KernSources))
 KernDep=$(patsubst %.c,$(KOBJDIR)/%.d,$(KernSources))
@@ -219,10 +220,10 @@ $(KOBJDIR)/kernel/mm/gdt.o: $(KALEIDDIR)/kernel/mm/gdt.c \
 	@rm -f $@.1 $@.2
 	@echo ${CL2}[$@] ${CL}Compiled.${CL3}
 
-$(KOBJDIR)/kernel/io/ata.o: $(KALEIDDIR)/kernel/io/ata.c \
-	$(KALEIDDIR)/kernel/io/ata.asm  | $(KOBJDIR)
+$(KOBJDIR)/drivers/ata.o: $(KALEIDDIR)/drivers/ata.c \
+	$(KALEIDDIR)/drivers/ata.asm  | $(KOBJDIR)
 	@mkdir -p $(shell dirname $@)
-	@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/io/ata.asm -o $@.1
+	@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/drivers/ata.asm -o $@.1
 	@$(KCC) $< -o $@.2
 	@$(LD) $(LDFLAGS) -r $@.1 $@.2 -o $@
 	@rm -f $@.1 $@.2
diff --git a/kaleid/kernel/io/ata.asm b/kaleid/drivers/ata.asm
similarity index 100%
rename from kaleid/kernel/io/ata.asm
rename to kaleid/drivers/ata.asm
diff --git a/kaleid/kernel/io/ata.c b/kaleid/drivers/ata.c
similarity index 95%
rename from kaleid/kernel/io/ata.c
rename to kaleid/drivers/ata.c
index 3c58262..9ce48f4 100644
--- a/kaleid/kernel/io/ata.c
+++ b/kaleid/drivers/ata.c
@@ -54,4 +54,4 @@ void IoDetectATA(void)
 
     DebugLog("AHCI controller found ! PCI config addr = %p\n",
                  ataDevice->configAddr);
-}
+}