From 067f6efeccb3586318a50b20065c8350beee682b Mon Sep 17 00:00:00 2001
From: Baptiste Wicht <baptiste.wicht@gmail.com>
Date: Sat, 26 Oct 2013 16:58:11 +0200
Subject: [PATCH] Display a char from C++ :)

---
 .gitignore       |   3 ++-
 Makefile         |   5 -----
 kernel.bin.o     | Bin 66495 -> 0 bytes
 kernel.o         | Bin 1232 -> 0 bytes
 src/commands.asm |   1 +
 src/kernel.cpp   |   2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100755 kernel.bin.o
 delete mode 100644 kernel.o

diff --git a/.gitignore b/.gitignore
index bb620419..670f43f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.bin
-*.flp
\ No newline at end of file
+*.flp
+*.o
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 4b32af2a..36f61ed1 100644
--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,6 @@ micro_kernel.bin: $(KERNEL_SRC) $(KERNEL_UTILS_SRC)
 kernel.o: src/kernel.cpp
 	g++ -Wall -Wextra -O2 -fno-exceptions -fno-rtti -ffreestanding -c src/kernel.cpp -o kernel.o
 
-kernel2.bin:  kernel.o
-	ld -e kernel_main -Ttext 0x10000 -o kernel.bin.o kernel.o
-	ld -e kernel_main -i -Ttext 0x10000 -o kernel.bin.o kernel.o
-	objcopy -R .note -R .comment -S -O binary kernel.bin.o kernel.bin
-
 kernel.bin:  kernel.o
 	g++ -T linker.ld -o kernel.bin.o -ffreestanding -O2 -nostdlib kernel.o
 	objcopy -R .note -R .comment -S -O binary kernel.bin.o kernel.bin
diff --git a/kernel.bin.o b/kernel.bin.o
deleted file mode 100755
index 79a4a0501c3530d81960daa4158b0bc0c678b162..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66495
zcmeIwziJdg7y$6O+~tpuB8q|#!Ltw|n#B-<|3HF4(^#ma52v0)^pbG7BHE~L;3N1L
zmVzKDEG&Hi!PX~;v$r$xTvG(Bgx|vKH}lQ+?e6^UUf;QQcdXF}`5FtiLba;y%V}dT
zWy|GqxE5ORJ{87?+3{3!SXfJaIfl?4mfin8c+!fq<+NXqC)2}nENjc_LF}8TrboI@
zrK&flTHP>rq?Tb(?mK#iN&*B35FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5*B-vXao=R^1qI-k-p
zPNvv+^)NJcXBxB9lT+^+A(Z(uaeUq1-#?aW%Fvi?-ux1Cu_Szq@kbo1D=RnJbF1CW
z!PZv$N^!MVobNBRw-<`VOYQAv-TBMKQn7TQ+6kf9dD$Cu9>qB5S8*fH2Ho93D7qW#
zPy3x-_xEgl<4HdhkGFcg_>Pf}`G@Ijd6qaP4xUl2%BzZ_XC9_!hWCTpxl}opGBc?!
z$IAzm)nux+z8Kf#n{xkh>d!I%F1f9hCn;W!vFxwEXDvNvzE)qIs_H4Xj>plg)s)M(
zssDCuFZbv4=(p!w8TZDj%5Nz-8Dlx}`A?^O>3i7w-#4rNv#BnJ`ulVKu-F`);qQ)S
z)Xu-pXkRmaNp}A;UstdETH)vZXkDHkmY<HBCq}*}|F24i+Fz=A%=2!4v-_fWyuBT&
R>3Xm8Y%{Fy3_ATm_yuz1RxSVl

diff --git a/kernel.o b/kernel.o
deleted file mode 100644
index f668e50b20e3de4714514e3d928623b6d8f0b9ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1232
zcmbVL%}&BV5S|KZRSsx8nBbuvjGDj(g2cpwAt6X&hzFx*Qg96f`jfT?<f4z@Blrj&
zxtkat!PoE!bf(?KbtxAn>3%cc?96=KZJ(O$%N4@_X$D-tUnE%oQz7dyU570&;Ujwp
zFa`UaxK^WaZXLI{8+o2}%FbA|6jUs~!m35fAMjF{)mZH$$;3SXb_E)f8!*OsqmWxS
zUvL)j`y#g?Fa{PrI+5K47DhpWed$Gf909wxBO6#Z41x7L$3Zc`Trc9Rb$wR~BfB>Q
z7VweHc)#-y*bY~_FYOnwl8$Ii>rfZ*zjr_`ukAa)nCdec-_~LoW~C$W2+_o6+4>^Z
z()=<$s>%6GCDEt7WD;wNA1A~zQ3J)7b&|S5hqx6<2z(Z(>!Np6t%-qtCX}BFa!+ig
zd!Rd#^^)I4PCq*;d7}mGHi6ly>rc~8n?FU<FHyOPNVE0%q$_RytEOMHnVq|g7a{4&
z!uL;FKC_@pX6_b}>P)Ia(!HA29(nz5kbUNFDu<~ZMbGSi8S=p8Bi8eMNZgKN4_vUs
KMEYLTZ{`<UO+n`X

diff --git a/src/commands.asm b/src/commands.asm
index 9e688cbc..93740b16 100644
--- a/src/commands.asm
+++ b/src/commands.asm
@@ -565,6 +565,7 @@ date_command:
     ret
 
 load_command:
+    call 0x5000
 
     ret
 
diff --git a/src/kernel.cpp b/src/kernel.cpp
index feb49f2b..49f93e5d 100644
--- a/src/kernel.cpp
+++ b/src/kernel.cpp
@@ -1,6 +1,6 @@
 extern "C"
 void kernel_main(){
-   unsigned char *vidmem = (unsigned char*) 0xB80000;
+   unsigned char *vidmem = (unsigned char*) 0x0B8000;
 
    *vidmem = 'a';
 }