summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--boot/print_string_16.asm2
-rw-r--r--boot/vesa_setup_16.asm20
3 files changed, 22 insertions, 2 deletions
diff --git a/README.md b/README.md
index 1e0461f..d7bf7cf 100644
--- a/README.md
+++ b/README.md
@@ -64,8 +64,8 @@ Please note that all features are only very rudimentary and buggy.
Todos
-----
-* Shell
* Sync primitives
+* Shell
* E1000 driver
* Port c lib and gcc
* Networking stack
diff --git a/boot/print_string_16.asm b/boot/print_string_16.asm
index b758725..9f81a87 100644
--- a/boot/print_string_16.asm
+++ b/boot/print_string_16.asm
@@ -49,7 +49,7 @@ pusha
mov ah,0x2
mov bh,0
mov dl,0
- mov dh,15
+ mov dh,20
int 0x10
popa
diff --git a/boot/vesa_setup_16.asm b/boot/vesa_setup_16.asm
index 40ca0c1..62d8d46 100644
--- a/boot/vesa_setup_16.asm
+++ b/boot/vesa_setup_16.asm
@@ -4,6 +4,8 @@ VESA_CHECK2:
db "VESA: get info on target mode!",0
VESA_CHECK3:
db "VESA: switching to target mode!",0
+VESA_PAUSE:
+ db "[Press any key to switch to VESA 0x114]",0
VesaSetup:
@@ -42,6 +44,24 @@ VesaSetup:
jmp vesa_err2
vesa_ok2:
+ ;show press any key
+; call print_nextline
+; mov bx, VESA_PAUSE
+; call print_string
+; call print_nextline
+
+ ;preempt keyboard buffer
+; next_key:
+;
+; mov al,0
+; mov ah,1 ; block waiting for keyboard scancode
+;
+; int 0x16
+; cmp ax,0
+; jne next_key
+;
+; mov ah,0 ; block waiting for keyboard scancode
+; int 0x16
;VESA: finally switch to the mode of choice!
mov ax,0x4f02 ;vesa function: Set Mode