Merge pull request #14 from E-Almqvist/dev

Dev
3 years ago · 071888af8f
parent d518245ba6 9289fa6ef6
commit 071888af8f
8 changed files with 8 additions and 7 deletions
--- a/src/bios.asm
+++ b/src/bios.asm
@ -1,5 +1,5 @@
 ; EQUs
-%include "equ/BIOS.asm"
+%include "equ/bios.asm"

 ; SRs
 %include "bios/convert.asm"
--- a/src/bios/disk.asm
+++ b/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:
--- a/src/bootloader.asm
+++ b/src/bootloader.asm
@ -29,8 +29,9 @@

 	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
--- a/src/equ/ascii.asm
+++ b/src/equ/ascii.asm
--- a/src/equ/bios.asm
+++ b/src/equ/bios.asm
--- a/src/equ/vga.asm
+++ b/src/equ/vga.asm
--- a/src/pm.asm
+++ b/src/pm.asm
@ -0,0 +1,2 @@
+%include "equ/vga.asm"
+%include "pm/vga/print.asm" 
--- a/src/pm/vga/print.asm
+++ b/src/pm/vga/print.asm