Merge pull request #14 from E-Almqvist/dev

Dev

src/bios.asm

@@ -1,5 +1,5 @@
 ; EQUs
-%include "equ/BIOS.asm"
+%include "equ/bios.asm"
 
 ; SRs
 %include "bios/convert.asm"

src/bios/disk.asm

@@ -1,5 +1,4 @@
 disk_read:
-	pusha
 	push dx ; store dx on stack so that we can compare later
 
 	mov ah, BIOS_DISK_READ ; specify function
@@ -18,7 +17,6 @@ disk_read:
 	cmp dh, al ; if dh != al then error
 	jne sector_error
 	
-	popa
 	ret
 
 sector_error:

src/bootloader.asm

@@ -12,8 +12,8 @@
 
 	; Read second sector (outside bootsector)
 	mov bx, 0x9000			; LOAD LOCATION 
-	mov dh, 2				; SECTOR-COUNT
-	mov dl, [BOOT_DRIVE]	; DISK-INDEX
+	mov dh, 2			; SECTOR-COUNT
+	mov dl, [BOOT_DRIVE]		; DISK-INDEX
 	call disk_read
 
 
@@ -29,11 +29,12 @@
 
 	jmp $  ; inf loop
 
-%include "equ/ASCII.asm"
+%include "equ/ascii.asm"
 %include "bios.asm"
+%include "pm.asm"
 
 ; Data
-welcome_string:		db "e Operating-System (eOS)", ASCII_CARRIAGE_RETURN, ASCII_LINEBREAK, "Version 2021 0.0", ASCII_END
+welcome_string:	db "e Operating-System (eOS)", ASCII_CARRIAGE_RETURN, ASCII_LINEBREAK, "Version 2021 0.0", ASCII_END
 BOOT_DRIVE: db 0
 
 ; Bootsector

src/pm.asm

@@ -0,0 +1,2 @@
+%include "equ/vga.asm"
+%include "pm/vga/print.asm"