X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fstartup.s;h=0a36b67c67623d79ad8294191e7679c42396da4d;hb=91fc6b749ad3a64c9a2686952eb30be517c6beb9;hp=bff3991ff9e631fab41b2b4b419a3a68eba1f006;hpb=559dd7c3c836a69eac46bd12c7ef61bb5de8882c;p=bootcensus

diff --git a/src/startup.s b/src/startup.s
index bff3991..0a36b67 100644
--- a/src/startup.s
+++ b/src/startup.s
@@ -19,18 +19,33 @@
 
 	.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
+	movl $0x80000, %esp
 
 	# zero the BSS section
 	xor %eax, %eax
-	mov _bss_start, %edi
-	mov _bss_size, %ecx
+	mov $_bss_start, %edi
+	mov $_bss_size, %ecx
+	cmp $0, %ecx
 	jz skip_bss_zero
 	shr $4, %ecx
 	rep stosl
 skip_bss_zero:
 
+	call pcboot_main
+	# pcboot_main never returns
+0:	cli
+	hlt
+	jmp 0b
 
+	.global logohack
 logohack:
+	pusha
+
 	# copy palette
 	mov $logo_pal, %esi
 	xor %cl, %cl
@@ -120,16 +135,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