summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2017-06-02 18:15:18 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2017-06-02 18:15:18 +0200
commiteccf664c7e54e9064bead66febc189b9dc94e049 (patch)
tree2ee8d7739492e8e1eb3efe82d0c541f398547c2c
parentbb4b53475cbd5ddc72200dcb8080fe3d324ffc34 (diff)
downloadabaos-eccf664c7e54e9064bead66febc189b9dc94e049.tar.gz
abaos-eccf664c7e54e9064bead66febc189b9dc94e049.tar.bz2
hopefully fixed A20 enable with keyboard commands
-rw-r--r--src/stage2_a20.asm7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/stage2_a20.asm b/src/stage2_a20.asm
index c4262a5..c5ebe27 100644
--- a/src/stage2_a20.asm
+++ b/src/stage2_a20.asm
@@ -81,14 +81,12 @@ A20_ENABLE_KBD_PORT:
cmp ax, 1
je A20_ENABLED
- jmp A20_FAST_SPECIAL_PORT
-
A20_ENABLE_KBD_OUT:
mov al, 'k'
call print_char
- cli
+ cli ; disable interrupts, we talk directly to the keyboard ports
call .wait_input
mov al,0xAD
@@ -116,8 +114,9 @@ A20_ENABLE_KBD_OUT:
out 0x64,al
call .wait_input
- popa
+
sti
+
jmp .retest
; wait for input buffer to be clear