summaryrefslogtreecommitdiff
path: root/kernel.asm
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2018-05-25 19:47:42 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2018-05-25 19:47:42 -0400
commit7d9316697f9a03ade1cd1d66a5269174f6b319e7 (patch)
tree02347df114749991972ce8c3d8b250a72d5794e2 /kernel.asm
parentf51bbf2ae219f6612681d6e354c581318153bf36 (diff)
downloadminos-7d9316697f9a03ade1cd1d66a5269174f6b319e7.tar.gz
* Incorporate new escape sequences
* Incorporate new width formatters
Diffstat (limited to 'kernel.asm')
-rw-r--r--kernel.asm19
1 files changed, 9 insertions, 10 deletions
diff --git a/kernel.asm b/kernel.asm
index 3a10d60..3a3531f 100644
--- a/kernel.asm
+++ b/kernel.asm
@@ -42,7 +42,7 @@ kmain:
add sp, 2
push banner
- call puts
+ call printf
add sp, 2
push word [drive0]
@@ -86,7 +86,6 @@ kmain:
cmp dx, 81h ; for 2 devices
jle .info_disk_loop ; continue
-
.mainloop:
call isr_inject
call terminal
@@ -153,16 +152,16 @@ panic:
; data
-banner: db "+========================+", ASCII_LF
- db "| Welcome to MINOS 0.0.1 |", ASCII_LF
- db "+========================+", ASCII_LF
- db ASCII_LF, 0
+banner: db "+========================+\n"
+ db "| Welcome to MINOS 0.0.1 |\n"
+ db "+========================+\n"
+ db "\n", 0
msg_entry_point_fmt:
- db 'Kernel address: %x:%x - %x:%x (%d:%d - %d:%d)', ASCII_LF
- db 'Stack address : %x:%x (%d:%d)', ASCII_LF
- db 'Boot device : %x', ASCII_LF, ASCII_LF, 0
-msg_isr_fmt: db "ISR %x:%x", ASCII_LF, 0
+ db 'Kernel address: %5x:%4x - %5x:%4x (%d:%d - %d:%d)\n'
+ db 'Stack address : %5x:%4x (%d:%d)\n'
+ db 'Boot device : %2x\n\n', 0
+msg_isr_fmt: db "ISR %5x:%4x\n", 0
; Error messages
error_msg_panic: db "PANIC: ", 0