From 78622a134da309667d28c0377984aab4c8d8de08 Mon Sep 17 00:00:00 2001
From: Julian Barathieu <spectral@os-k.eu>
Date: Tue, 14 May 2019 13:17:24 +0200
Subject: [PATCH] cpu => ke

---
 Makefile                           | 16 ++++++++--------
 kaleid/kernel/{cpu => ke}/cpuf.asm |  2 +-
 kaleid/kernel/{cpu => ke}/cpuf.inc |  0
 kaleid/kernel/{cpu => ke}/cpuid.c  |  0
 kaleid/kernel/{cpu => ke}/idt.c    |  0
 kaleid/kernel/{cpu => ke}/isr.asm  |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename kaleid/kernel/{cpu => ke}/cpuf.asm (98%)
 rename kaleid/kernel/{cpu => ke}/cpuf.inc (100%)
 rename kaleid/kernel/{cpu => ke}/cpuid.c (100%)
 rename kaleid/kernel/{cpu => ke}/idt.c (100%)
 rename kaleid/kernel/{cpu => ke}/isr.asm (99%)

diff --git a/Makefile b/Makefile
index bf3045d..86a11ad 100644
--- a/Makefile
+++ b/Makefile
@@ -91,8 +91,8 @@ LibCDep=$(patsubst %.c,$(KOBJDIR)/%.d,$(LibCSources))
 LibCObj += $(KOBJDIR)/libc/atoi.o $(KOBJDIR)/libc/itoa.o
 
 # Kernel sources
-KernSources =	kernel/cpu/cpuid.c                             \
-		kernel/cpu/idt.c kernel/init/init.c                            \
+KernSources =	kernel/ke/cpuid.c                             \
+		kernel/ke/idt.c kernel/init/init.c                            \
 		kernel/init/table.c kernel/io/cursor.c                         \
 		kernel/ke/log.c kernel/io/vga.c                                \
 		kernel/ke/panic.c kernel/mm/map.c                              \
@@ -152,10 +152,10 @@ $(KOBJDIR)/libc/mem.o: $(KALEIDDIR)/libc/mem.c | $(KOBJDIR)
 ## KERNEL MAKEFILE ----------------------------------------------------------- #
 -include $(KernDep)
 
-$(KOBJDIR)/kernel/cpu/idt.o: $(KALEIDDIR)/kernel/cpu/idt.c \
-	$(KALEIDDIR)/kernel/cpu/isr.asm  | $(KOBJDIR)
+$(KOBJDIR)/kernel/ke/idt.o: $(KALEIDDIR)/kernel/ke/idt.c \
+	$(KALEIDDIR)/kernel/ke/isr.asm  | $(KOBJDIR)
 	@mkdir -p $(shell dirname $@)
-	@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/cpu/isr.asm -o $@.1
+	@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/ke/isr.asm -o $@.1
 	@$(KCC) $< -o $@.2
 	@$(LD) $(LDFLAGS) -r $@.1 $@.2 -o $@
 	@rm -f $@.1 $@.2
@@ -170,10 +170,10 @@ $(KOBJDIR)/kernel/mm/gdt.o: $(KALEIDDIR)/kernel/mm/gdt.c \
 	@rm -f $@.1 $@.2
 	@echo ${CL2}[$@] ${CL}Compiled.${CL3}
 
-$(KOBJDIR)/kernel/cpu/cpuid.o: $(KALEIDDIR)/kernel/cpu/cpuid.c \
-	$(KALEIDDIR)/kernel/cpu/cpuf.asm  | $(KOBJDIR)
+$(KOBJDIR)/kernel/ke/cpuid.o: $(KALEIDDIR)/kernel/ke/cpuid.c \
+	$(KALEIDDIR)/kernel/ke/cpuf.asm  | $(KOBJDIR)
 	@mkdir -p $(shell dirname $@)
-	@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/cpu/cpuf.asm -o $@.1
+	@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/ke/cpuf.asm -o $@.1
 	@$(KCC) $< -o $@.2
 	@$(LD) $(LDFLAGS) -r $@.1 $@.2 -o $@
 	@rm -f $@.1 $@.2
diff --git a/kaleid/kernel/cpu/cpuf.asm b/kaleid/kernel/ke/cpuf.asm
similarity index 98%
rename from kaleid/kernel/cpu/cpuf.asm
rename to kaleid/kernel/ke/cpuf.asm
index ecffec7..fd0295c 100644
--- a/kaleid/kernel/cpu/cpuf.asm
+++ b/kaleid/kernel/ke/cpuf.asm
@@ -24,5 +24,5 @@
 
 [BITS 64]
 
-%include "kaleid/kernel/cpu/cpuf.inc"
+%include "kaleid/kernel/ke/cpuf.inc"
 
diff --git a/kaleid/kernel/cpu/cpuf.inc b/kaleid/kernel/ke/cpuf.inc
similarity index 100%
rename from kaleid/kernel/cpu/cpuf.inc
rename to kaleid/kernel/ke/cpuf.inc
diff --git a/kaleid/kernel/cpu/cpuid.c b/kaleid/kernel/ke/cpuid.c
similarity index 100%
rename from kaleid/kernel/cpu/cpuid.c
rename to kaleid/kernel/ke/cpuid.c
diff --git a/kaleid/kernel/cpu/idt.c b/kaleid/kernel/ke/idt.c
similarity index 100%
rename from kaleid/kernel/cpu/idt.c
rename to kaleid/kernel/ke/idt.c
diff --git a/kaleid/kernel/cpu/isr.asm b/kaleid/kernel/ke/isr.asm
similarity index 99%
rename from kaleid/kernel/cpu/isr.asm
rename to kaleid/kernel/ke/isr.asm
index d565eb1..11905da 100644
--- a/kaleid/kernel/cpu/isr.asm
+++ b/kaleid/kernel/ke/isr.asm
@@ -24,7 +24,7 @@
 
 [BITS 64]
 
-%include "kaleid/kernel/cpu/cpuf.inc"
+%include "kaleid/kernel/ke/cpuf.inc"
 
 global KeLoadIDT
 global divideByZero