Merge branch 'disk' of gitlab.os-k.eu:os-k-team/os-k into disk

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

kaleid/drivers/ata.c

@@ -54,4 +54,4 @@ void IoDetectATA(void)
 
     DebugLog("AHCI controller found ! PCI config addr = %p\n",
                  ataDevice->configAddr);
-}
+}