Merge pull request #8 from E-Almqvist/dev

Update
pull/13/head
E. Almqvist 4 years ago committed by GitHub
commit a6dcf78f83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 30
      src/bootloader.asm
  2. 0
      src/bootloader_bios_disk.asm

@ -1,34 +1,30 @@
[org 0x7c00] ; bootsector [org 0x7c00] ; bootsector
mov bx, welcomeString ; Print the welcome string mov bx, welcomeString ; Print the welcome string
call println call println
mov bx, infoString mov bx, infoString ; Print version info
call println call println
mov bx, hexTestPrefixString mov bx, hexTestPrefixString ; Hex print test (not needed but fun)
call print call print
mov dx, 0x002e ; test the conversion
call hexToASCII
call println
mov dx, 0x002e ; test the conversion jmp $ ; inf loop
call hexToASCII
call println
jmp $ ; inf loop ; Load the EQUs
;; includes
; EQU
%include "equ/BIOS.asm" %include "equ/BIOS.asm"
%include "equ/ASCII.asm" %include "equ/ASCII.asm"
; eLIB ; SRs
%include "elib/io.asm" %include "elib/io.asm"
%include "elib/convert.asm" %include "elib/convert.asm"
;; Data
welcomeString: db "Welcome to: e Operating-System (eOS)", ASCII_END welcomeString: db "Welcome to: e Operating-System (eOS)", ASCII_END
infoString: db "Version 2021 0.0", ASCII_END infoString: db "Version 2021 0.0", ASCII_END
hexTestPrefixString: db "Hex printing test: ", ASCII_END hexTestPrefixString: db "Hex printing test: ", ASCII_END
; Magic BIOS number
times 510-($-$$) db 0 times 510-($-$$) db 0
db 0x55, 0xaa db 0x55, 0xaa ; magic BIOS numbers

Loading…
Cancel
Save