From 8f0f29121c08bfc43bddc955c86363f7b0727c74 Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Sun, 7 Feb 2021 17:47:30 +0100
Subject: [PATCH 1/2] Clean up bootloader.asm

---
 src/bootloader.asm           | 28 +++++++++++-----------------
 src/bootloader_bios_disk.asm |  0
 2 files changed, 11 insertions(+), 17 deletions(-)
 create mode 100644 src/bootloader_bios_disk.asm

diff --git a/src/bootloader.asm b/src/bootloader.asm
index 0f68425..89c85df 100644
--- a/src/bootloader.asm
+++ b/src/bootloader.asm
@@ -1,34 +1,28 @@
 [org 0x7c00] ; bootsector
 
-mov bx, welcomeString ; Print the welcome string
-call println
+	mov bx, welcomeString		; Print the welcome string
+	call println
 
-mov bx, infoString
-call println
+	mov bx, infoString		; Print version info
+	call println
 
-mov bx, hexTestPrefixString
-call print
+	mov bx, hexTestPrefixString	; Hex print test (not needed but fun)
+	call print
+	mov dx, 0x002e ; test the conversion
+	call hexToASCII
+	call println
 
-mov dx, 0x002e ; test the conversion
-call hexToASCII
-call println
+	jmp $  ; inf loop
 
-jmp $  ; inf loop
-
-;; includes
-; EQU
 %include "equ/BIOS.asm"
 %include "equ/ASCII.asm"
 
-; eLIB
 %include "elib/io.asm"
 %include "elib/convert.asm"
 
-;; Data
 welcomeString:		db "Welcome to: e Operating-System (eOS)", ASCII_END
 infoString: 		db "Version 2021 0.0", ASCII_END
 hexTestPrefixString:	db "Hex printing test: ", ASCII_END
 
-; Magic BIOS number 
 times 510-($-$$) db 0
-db 0x55, 0xaa
+db 0x55, 0xaa ; magic BIOS numbers
diff --git a/src/bootloader_bios_disk.asm b/src/bootloader_bios_disk.asm
new file mode 100644
index 0000000..e69de29

From f3614031935c8826e5aefdd6d83d545a364a8714 Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Mon, 8 Feb 2021 09:21:54 +0100
Subject: [PATCH 2/2] Stuff

---
 src/bootloader.asm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bootloader.asm b/src/bootloader.asm
index 89c85df..e831fc2 100644
--- a/src/bootloader.asm
+++ b/src/bootloader.asm
@@ -14,9 +14,11 @@
 
 	jmp $  ; inf loop
 
+; Load the EQUs
 %include "equ/BIOS.asm"
 %include "equ/ASCII.asm"
 
+; SRs
 %include "elib/io.asm"
 %include "elib/convert.asm"