summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2017-12-02 16:34:48 -0500
committerJoseph Hunkeler <jhunkeler@gmail.com>2017-12-02 16:34:48 -0500
commit11adba68c348ca81961943940e6b64d7e8f3e2ac (patch)
tree731b0d197325db06db7480b02dbec34d37e4a0ea
parent0742f46b3138a29b2f8e6ca65d8295bbc2985f92 (diff)
downloadminos-11adba68c348ca81961943940e6b64d7e8f3e2ac.tar.gz
Add terminal
-rw-r--r--kernel.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel.asm b/kernel.asm
index 46ab984..3d6608b 100644
--- a/kernel.asm
+++ b/kernel.asm
@@ -7,6 +7,7 @@ jmp kmain
%include "disk.asm"
%include "console.asm"
%include "stdio.asm"
+%include "terminal.asm" ; eventually will become its own "program"
kmain:
@@ -51,8 +52,7 @@ kmain:
add sp, 12
.mainloop:
- call kbd_read
- call putc
+ call terminal
jmp .mainloop