merge

[plan9front.git] / sys / src / boot / pc / l.s

diff --git a/sys/src/boot/pc/l.s b/sys/src/boot/pc/l.s
index 8e47c4bf950e12e7d5e1bceb6aaa8eec07e68b86..44a22a266e437276ea0b61b8b3a79cc0ec0cf81b 100644 (file)
--- a/sys/src/boot/pc/l.s
+++ b/sys/src/boot/pc/l.s
@@ -25,14 +25,6 @@ TEXT origin(SB), $0
 TEXT pmode32(SB), $0
        CLI
 
-       /* disable nmi */
-       PUSHA
-       LWI(0x70, rDX)
-       INB
-       ANDB $0x7F, AL
-       OUTB
-       POPA
-
        /* get return pc */
        POPR(rDI)
 
@@ -129,41 +121,23 @@ TEXT halt(SB), $0
 _halt:
        JMP _halt
 
-TEXT spllo(SB), $0
-       /* enable nmi */
-       PUSHA
-       LWI(0x70, rDX)
-       INB
-       ORB $0x80, AL
-       OUTB
-       POPA
-
-       STI
-       RET
-
-TEXT getc(SB), $0
+TEXT kbdgetc(SB), $0
        CALL rmode16(SB)
-       CALL16(spllo(SB))
-       MOVB $0x00, AH
-       BIOSCALL(0x16)
-_getcret:
-       CALL16(pmode32(SB))
-       ANDL $0xFF, AX
-       RET
-
-TEXT gotc(SB), $0
-       CALL rmode16(SB)
-       CALL16(spllo(SB))
+       STI
        MOVB $0x01, AH
        BIOSCALL(0x16)
-       JNZ _getcret
+       JNZ _gotkey
        CLR(rAX)
-       JMP _getcret
+       JMP _pret32
+_gotkey:
+       CLR(rAX)
+       BIOSCALL(0x16)
+       JMP _pret32
        
-TEXT putc(SB), $0
+TEXT cgaputc(SB), $0
        MOVL 4(SP),AX
        CALL rmode16(SB)
-       CALL16(spllo(SB))
+       STI
        MOVB $0x0E, AH
        BIOSCALL(0x10)
 _pret32:
@@ -175,7 +149,7 @@ TEXT usleep(SB), $0
        MOVL t+4(SP), AX
        PUSHL AX
        CALL rmode16(SB)
-       CALL16(spllo(SB))
+       STI
        POPR(rDX)
        POPR(rCX)
        MOVB $0x86, AH
@@ -236,7 +210,7 @@ TEXT pxecall(SB), $0
        LW(pxepoff(SB), rAX)
        PUSHR(rAX)
 
-       CALL16(spllo(SB))
+       STI
 
        CLR(rAX)
        CLR(rBX)
@@ -297,7 +271,7 @@ TEXT readsect(SB), $0
        MOVW 10(SP), BX
        MOVL 12(SP), SI 
        CALL rmode16(SB)
-       CALL16(spllo(SB))
+       STI
        CALL16(readsect16(SB))
        CALL16(pmode32(SB))
        ANDL $0xFFFF, AX
@@ -315,8 +289,8 @@ TEXT bootname(SB), $0
 
 #endif
 
-TEXT crnl(SB), $0
-       BYTE $'\r'; BYTE $'\n'; BYTE $0
+TEXT uart(SB), $0
+       BYTE $0xff
 
 TEXT hex(SB), $0
        BYTE $'0'; BYTE $'1'; BYTE $'2'; BYTE $'3';