From 707d7e38b6c3da23e99e9cbf9ad3c0cd27459c90 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 18 Jul 2015 08:56:35 +0400
Subject: [PATCH 01/10] Add infinite loop to bootloader

---
 .gitignore                | 1 +
 bootloader/bootloader.asm | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index a8a0dce..6b7560c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.bin
+PiegOS
diff --git a/bootloader/bootloader.asm b/bootloader/bootloader.asm
index 25b9a46..8baeca7 100644
--- a/bootloader/bootloader.asm
+++ b/bootloader/bootloader.asm
@@ -8,6 +8,10 @@ start:
 mov ax, 0x0C70	;Put bootloader adress in ax register
 mov ds, ax	;Init data segment
 
+;Pause here !
+infiniteLoop:
+	jmp infiniteLoop
+
 ;Complete the MBR with nothing
 times 510 - ($ - start) db 0x0
 

From 9d2b511fd521fc61ed2eb6f0fc5ed23252ac3190 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 18 Jul 2015 10:23:36 +0400
Subject: [PATCH 02/10] Add some bios routines

---
 bootloader/Makefile                  |  2 +-
 bootloader/bootloader.asm            |  9 +++++++++
 bootloader/clearScreenIntBios.asm    | 30 ++++++++++++++++++++++++++++
 bootloader/resetCursorPosIntBios.asm | 21 +++++++++++++++++++
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 bootloader/clearScreenIntBios.asm
 create mode 100644 bootloader/resetCursorPosIntBios.asm

diff --git a/bootloader/Makefile b/bootloader/Makefile
index 9cb2ec5..5f252ed 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -2,7 +2,7 @@
 
 
 bootloader.bin: bootloader.asm
-	nasm -f bin -o $@ $^
+	nasm -f bin -o $@ $<
 
 clean:
 	rm bootloader.bin
diff --git a/bootloader/bootloader.asm b/bootloader/bootloader.asm
index 8baeca7..db80946 100644
--- a/bootloader/bootloader.asm
+++ b/bootloader/bootloader.asm
@@ -4,14 +4,23 @@
 ;Save the first adress with a label to complete the MBR at the end.
 start:
 
+
 ;Init CPU registers
 mov ax, 0x0C70	;Put bootloader adress in ax register
 mov ds, ax	;Init data segment
+mov ax, 0x8000
+mov ss, ax
+mov ax, 0xf000
+mov sp, ax
+
+call clearScreenIntBios
 
 ;Pause here !
 infiniteLoop:
 	jmp infiniteLoop
 
+%include "clearScreenIntBios.asm"
+
 ;Complete the MBR with nothing
 times 510 - ($ - start) db 0x0
 
diff --git a/bootloader/clearScreenIntBios.asm b/bootloader/clearScreenIntBios.asm
new file mode 100644
index 0000000..4739430
--- /dev/null
+++ b/bootloader/clearScreenIntBios.asm
@@ -0,0 +1,30 @@
+clearScreenIntBios:
+
+	;Save registers
+	push ax
+	push bx
+	push cx
+	push dx
+
+	mov ax, 0x0600 ;Clear
+	mov bx, 0x0F00 ;Color black behind white foreground
+
+	mov cx, 0x0000 ;Top left corner
+	mov dx, 0x5050 ;Bottom right corner 80x80
+
+	int 0x10 ;Clear the screen
+
+	;Restore registers
+	pop dx
+	pop cx
+	pop bx
+	pop ax
+
+	;Reset Cursor Position
+	call resetCursorPosIntBios
+
+	;Back to previous task
+	ret
+
+;Include resetCursorPosIntBios
+%include "resetCursorPosIntBios.asm"
diff --git a/bootloader/resetCursorPosIntBios.asm b/bootloader/resetCursorPosIntBios.asm
new file mode 100644
index 0000000..18cb0d2
--- /dev/null
+++ b/bootloader/resetCursorPosIntBios.asm
@@ -0,0 +1,21 @@
+resetCursorPosIntBios:
+
+	;Save registers
+	push ax
+	push bx
+	push dx
+
+	mov ax, 0x0200  ;Move cursor interrupt
+	mov bx, 0x0000	; X position
+	mov dx, 0x0000	; Y Position
+
+	;Call 0x10 interrupt service
+	int 0x10
+
+	;Restore registers
+	pop dx
+	pop bx
+	pop ax
+
+	;Back to previous task
+	ret

From 2dd46db7968caf87f6a54729c213811f302cb11a Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 18 Jul 2015 10:26:33 +0400
Subject: [PATCH 03/10] Move include in bootloader

---
 bootloader/bootloader.asm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bootloader/bootloader.asm b/bootloader/bootloader.asm
index db80946..5abfc8e 100644
--- a/bootloader/bootloader.asm
+++ b/bootloader/bootloader.asm
@@ -4,6 +4,10 @@
 ;Save the first adress with a label to complete the MBR at the end.
 start:
 
+;Include bios routines and jump to skip including code
+jmp skipInc
+%include "clearScreenIntBios.asm"
+skipInc:
 
 ;Init CPU registers
 mov ax, 0x0C70	;Put bootloader adress in ax register
@@ -13,13 +17,13 @@ mov ss, ax
 mov ax, 0xf000
 mov sp, ax
 
+;Clear the screen
 call clearScreenIntBios
 
 ;Pause here !
 infiniteLoop:
 	jmp infiniteLoop
 
-%include "clearScreenIntBios.asm"
 
 ;Complete the MBR with nothing
 times 510 - ($ - start) db 0x0

From 22a23d6784e8104366f81a3b4902c4a1c3c3726a Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 18 Jul 2015 10:30:53 +0400
Subject: [PATCH 04/10] Add some comments

---
 bootloader/bootloader.asm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bootloader/bootloader.asm b/bootloader/bootloader.asm
index 5abfc8e..ee11e2c 100644
--- a/bootloader/bootloader.asm
+++ b/bootloader/bootloader.asm
@@ -12,10 +12,12 @@ skipInc:
 ;Init CPU registers
 mov ax, 0x0C70	;Put bootloader adress in ax register
 mov ds, ax	;Init data segment
+
+;Init stack from 0x80000 to 0x8f000
 mov ax, 0x8000
-mov ss, ax
-mov ax, 0xf000
-mov sp, ax
+mov ss, ax	;Set stack segment
+mov ax, 0x0f00
+mov sp, ax	;Set stack offset
 
 ;Clear the screen
 call clearScreenIntBios

From b4c413da4b691dfd04beb5c747dd922e097dffc1 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 18 Jul 2015 11:16:14 +0400
Subject: [PATCH 05/10] Add print routine

---
 bootloader/bootloader.asm   |  9 ++++++++-
 bootloader/printIntBios.asm | 27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 bootloader/printIntBios.asm

diff --git a/bootloader/bootloader.asm b/bootloader/bootloader.asm
index ee11e2c..f1bb48a 100644
--- a/bootloader/bootloader.asm
+++ b/bootloader/bootloader.asm
@@ -7,10 +7,11 @@ start:
 ;Include bios routines and jump to skip including code
 jmp skipInc
 %include "clearScreenIntBios.asm"
+%include "printIntBios.asm"
 skipInc:
 
 ;Init CPU registers
-mov ax, 0x0C70	;Put bootloader adress in ax register
+mov ax, 0x07C0	;Put bootloader adress in ax register
 mov ds, ax	;Init data segment
 
 ;Init stack from 0x80000 to 0x8f000
@@ -22,10 +23,16 @@ mov sp, ax	;Set stack offset
 ;Clear the screen
 call clearScreenIntBios
 
+;Print msg
+mov si, helloBootloader ;load msg in si register
+call printIntBios	;print the msg
+
 ;Pause here !
 infiniteLoop:
 	jmp infiniteLoop
 
+;Define data
+helloBootloader db "PiegOS bootloader successfully running !", 0
 
 ;Complete the MBR with nothing
 times 510 - ($ - start) db 0x0
diff --git a/bootloader/printIntBios.asm b/bootloader/printIntBios.asm
new file mode 100644
index 0000000..2a6c735
--- /dev/null
+++ b/bootloader/printIntBios.asm
@@ -0,0 +1,27 @@
+printIntBios:
+
+	;Save registers
+	push ax
+	push bx
+
+	;Print loop
+	.loop:
+
+		mov ah, 0x0E	;Use 0xE bios service for teletype print
+		lodsb		;Load char in al and inc SI register
+		cmp al, 0x0	;Check if we print all the chain
+		je .end		;If yes go to end
+
+		mov bl, 0x0F	;Else set color register
+
+		int 0x10	;And print the character
+
+		jmp .loop	;Go to the next character
+	.end:
+
+	;Restore registers
+	pop bx
+	pop ax
+
+	;Back to previous task
+	ret

From 726beb6ea0fb6734771c0cbde90c2b24bb2c6770 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 18 Jul 2015 13:49:22 +0400
Subject: [PATCH 06/10] Edit Readme.md

---
 Readme.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Readme.md b/Readme.md
index 4ba7f66..55e0377 100644
--- a/Readme.md
+++ b/Readme.md
@@ -20,5 +20,9 @@
 > Un fichier PiegOS est créer à la racine du projet si la compilation c'est bien déroulée. Il n'y a plus qu'à le copier sur un support ou
 à le lancer dans une machine virtuelle.
 
+##Notes
+
+> Le bootloader n'est présent qu'à titre informatif. Grub ce chargera de charger le noyaux.
+
 ##Suite en construction...
   

From 18416dd901704a2e215c599a36868936e26bb99b Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 18 Jul 2015 20:23:49 +0400
Subject: [PATCH 07/10] Update project Makefile

---
 Makefile        | 10 +++++-----
 kernel/Makefile |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 kernel/Makefile

diff --git a/Makefile b/Makefile
index d57ab2f..02b8066 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 
 
-PiegOS: bootloader/bootloader.bin
-	cp $< ./$@
+PiegOS: kernel/kernel.bin
+	cp kernel/kernel.bin ./PiegOS
 
-bootloader/bootloader.bin: bootloader/Makefile
-	cd bootloader && make
+kernel/kernel.bin:
+	cd kernel/ && make
 
 clean:
-	cd bootloader && make clean
+	cd kernel && make clean
 	rm PiegOS
diff --git a/kernel/Makefile b/kernel/Makefile
new file mode 100644
index 0000000..0550f6d
--- /dev/null
+++ b/kernel/Makefile
@@ -0,0 +1,5 @@
+kernel.bin:
+	touch kernel.bin
+
+clean:
+	rm kernel.bin

From 5dafe39552d106e50ffa1f93cec21451df9e5a69 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 18 Jul 2015 20:25:11 +0400
Subject: [PATCH 08/10] Edit Readme.md

---
 Readme.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index 55e0377..f2c3569 100644
--- a/Readme.md
+++ b/Readme.md
@@ -17,12 +17,11 @@
 
 ##Comment utilisé le Noyaux Générer ?
 
-> Un fichier PiegOS est créer à la racine du projet si la compilation c'est bien déroulée. Il n'y a plus qu'à le copier sur un support ou
-à le lancer dans une machine virtuelle.
+> Un fichier PiegOS est créer à la racine du projet si la compilation c'est bien déroulée. Il n'y a plus qu'à charger ce fichier à l'aide de Grub.
 
 ##Notes
 
-> Le bootloader n'est présent qu'à titre informatif. Grub ce chargera de charger le noyaux.
+> Le bootloader n'est présent qu'à titre informatif. Pour le lancer, il suffit de booter dessus.
 
 ##Suite en construction...
   

From faefd1cfd21bb35cacf51c92c6153133a8aa2c0f Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 18 Jul 2015 21:22:25 +0400
Subject: [PATCH 09/10] Edit some file

---
 Readme.md           | 4 ++--
 bootloader/Makefile | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index f2c3569..522082c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -17,11 +17,11 @@
 
 ##Comment utilisé le Noyaux Générer ?
 
-> Un fichier PiegOS est créer à la racine du projet si la compilation c'est bien déroulée. Il n'y a plus qu'à charger ce fichier à l'aide de Grub.
+> Un fichier PiegOS est créer à la racine du projet aprés l'éxécution de make. Il n'y a plus qu'à charger ce fichier à l'aide d'un chargeur d'amorçage (Grub, LILO etc..).
 
 ##Notes
 
-> Le bootloader n'est présent qu'à titre informatif. Pour le lancer, il suffit de booter dessus.
+> Le bootloader n'est présent qu'à titre informatif. Pour le lancer, il suffit de le placer au premier secteur du support de boot.
 
 ##Suite en construction...
   
diff --git a/bootloader/Makefile b/bootloader/Makefile
index 5f252ed..7fb8173 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -1,6 +1,5 @@
 
 
-
 bootloader.bin: bootloader.asm
 	nasm -f bin -o $@ $<
 

From a49a53e48af9bdf64fee43c3772cb654ceb8e6ab Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 19 Jul 2015 08:28:50 +0400
Subject: [PATCH 10/10] Edit gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6b7560c..cddf862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.bin
 PiegOS
+Untracked