X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fstartup.s;h=ef3cd38b443a03e5f435f420cd841d987ac70012;hb=c1a6b9caf99005e0496f51d07b727ac73d09e3fd;hp=8041c13d404f7bb8fa1fb8217a2bf11ea568359d;hpb=4c7af0d72e32cc07c04345bc9fe57a4a32a29695;p=bootcensus

diff --git a/src/startup.s b/src/startup.s
index 8041c13..ef3cd38 100644
--- a/src/startup.s
+++ b/src/startup.s
@@ -20,8 +20,11 @@
 	.extern _bss_start
 	.extern _bss_end
 	.extern pcboot_main
+	.extern wait_vsync
+	.extern kb_getkey
 
 	# move the stack to the top of the conventional memory
+	cli
 	movl $0x80000, %esp
 
 	# zero the BSS section
@@ -42,6 +45,8 @@ skip_bss_zero:
 
 	.global logohack
 logohack:
+	pusha
+
 	# copy palette
 	mov $logo_pal, %esi
 	xor %cl, %cl
@@ -131,16 +136,18 @@ xloop:
 
 	incl frameno
 
-	# wait vsync
-	mov $0x3da, %dx
-0:	in %dx, %al
-	and $8, %al
-	jnz 0b
-0:	in %dx, %al
-	and $8, %al
-	jz 0b
+	call wait_vsync
+
+	# check for escape keypress
+	call kb_getkey
+	cmp $27, %eax
+	jz 0f
+
 	jmp frameloop
 
+0:	popa
+	ret
+
 xval: .long 0
 yval: .long 0
 frameno: .long 0