From 80cfeccdc0ee300e4d92afc545fd980fd47ae8c6 Mon Sep 17 00:00:00 2001
From: Baptiste Wicht <baptiste.wicht@gmail.com>
Date: Sun, 27 Oct 2013 15:36:15 +0100
Subject: [PATCH] Cleanup

---
 Makefile                              |   4 ++--
 {src => kernel/include}/addresses.hpp |   0
 {src => kernel/src}/kernel.cpp        |   8 ++++----
 micro_kernel.g                        | Bin 59200 -> 59200 bytes
 src/micro_kernel.asm                  |   2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)
 rename {src => kernel/include}/addresses.hpp (100%)
 rename {src => kernel/src}/kernel.cpp (97%)

diff --git a/Makefile b/Makefile
index 3d2b5407..1b30d9ac 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ micro_kernel.bin: $(KERNEL_SRC) $(KERNEL_UTILS_SRC)
 	nasm -w+all -f bin -o micro_kernel.bin src/micro_kernel.asm
 	nasm -D DEBUG -g -w+all -f elf64 -o micro_kernel.g src/micro_kernel.asm
 
-kernel.o: src/kernel.cpp
-	g++ -masm=intel -O2 -std=c++11 -Wall -Wextra -fno-exceptions -fno-rtti -ffreestanding -c src/kernel.cpp -o kernel.o
+kernel.o: kernel/src/kernel.cpp
+	g++ -masm=intel -Ikernel/include/ -O2 -std=c++11 -Wall -Wextra -fno-exceptions -fno-rtti -ffreestanding -c kernel/src/kernel.cpp -o kernel.o
 
 kernel.bin: kernel.o
 	g++ -std=c++11 -T linker.ld -o kernel.bin.o -ffreestanding -O2 -nostdlib kernel.o
diff --git a/src/addresses.hpp b/kernel/include/addresses.hpp
similarity index 100%
rename from src/addresses.hpp
rename to kernel/include/addresses.hpp
diff --git a/src/kernel.cpp b/kernel/src/kernel.cpp
similarity index 97%
rename from src/kernel.cpp
rename to kernel/src/kernel.cpp
index b27ac163..ed2d2bc8 100644
--- a/src/kernel.cpp
+++ b/kernel/src/kernel.cpp
@@ -16,15 +16,12 @@ void out_byte (uint16_t _port, uint8_t _data){
     __asm__ __volatile__ ("out %0, %1" : : "dN" (_port), "a" (_data));
 }
 
-void __attribute__((naked)) keyboard_handler(){
+void keyboard_handler(){
     in_byte(0x60);
 
     k_print("key");
 }
 
-long current_line = 0;
-long current_column = 0;
-
 extern "C"
 void  __attribute__ ((section ("main_section"))) kernel_main(){
     k_print("thor> ");
@@ -40,6 +37,9 @@ void  __attribute__ ((section ("main_section"))) kernel_main(){
     return;
 }
 
+long current_line = 0;
+long current_column = 0;
+
 enum vga_color {
     BLACK = 0,
     BLUE = 1,
diff --git a/micro_kernel.g b/micro_kernel.g
index 5b210603216c6a4b560085eeb58f629e77eb319b..f16a303bc3f48dbb5f481fc65ce5b4098de845b9 100644
GIT binary patch
delta 300
zcmX}h%L)Nu0LAft&BBv-0UKG^eNSPhB+1GHnB2;Taw`@d!qnK<j9EwulX6M9<WbPn
zId$sSIbr04k>gcuHqVkch5{?ONFbM3%Vjol#a~!A>DCBR@n)#Al^g8jCVRQXL2h%D
uJ4CYOBzHN>JuY&e>)*Lw4FhgEhTP>54|&W}p74^VyyY1mdG05?O!^BSO*1M0

delta 300
zcmX}h%L)Nu0LAft&BBv-0UKG^%~M!Ok}R#&=TaDjQ7k-#sj;ycvyc?NluODbkAkMo
zsZ+nsiLDb`C#ZY*B1@9Elvv4SBDum^uCkG9;leX%(;&(un~Py9H`&Q8_Hvtp+~Fv9
tv2u@-+~+KNT;u`QzYD**47uqTahJzDWS^%z;U!Ob%QHUmJWK_->=y$)GWh@i

diff --git a/src/micro_kernel.asm b/src/micro_kernel.asm
index 2b0f1337..8fc0f3e0 100644
--- a/src/micro_kernel.asm
+++ b/src/micro_kernel.asm
@@ -93,8 +93,10 @@ lm_start:
     ; Install ISRs
     call install_isrs
 
+    ; Remap IRQs with wrong numbers
     call remap_irqs
 
+    ; Install all IRQs
     call install_irqs
 
     sti