X-Git-Url: http://git.joshuawise.com/fpgaboy.git/blobdiff_plain/3785d05a183aa8de851f361432c5da2cc8f11c16..318331120b0bd48a06902e70a63b4f536a85de5f:/rom.asm?ds=inline

diff --git a/rom.asm b/rom.asm
index 7994d3e..437f01e 100644
--- a/rom.asm
+++ b/rom.asm
@@ -9,15 +9,38 @@ main:
 
 	ld hl, signon
 	call puts
+
+	ld c, $07
+	ld a, $04	;start timer, 4.096KHz
+	ld [c], a
+	ei
 	
 	call memtest
 
 	call insntest
 
 	call waitsw
+	di
 
 	jr main
 
+	section "fuq",HOME[$100]
+irqhand:
+	PUSH AF
+	PUSH BC
+	PUSH DE
+	PUSH HL
+	xor a
+	ld c, $0F	; ack the irq
+	ld [c], a
+	ld a, $41	; print A
+	call putc
+	POP HL
+	POP DE
+	POP BC
+	POP AF
+	RETI
+
 signon:
 	db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
 
@@ -103,23 +126,13 @@ puthex:				; Put two hex nibbles to the serial console.
 waitsw:
 	ld hl,waitswstr
 	call puts
-	
-	ld c, $07
-	ld a, $04	;start timer, 4.096KHz
-	ld [c], a
-	
+
 	ld c, $51
-	ld a, $00
+	xor a
 	ld [c],a
 	
-	ld e, a
-	
-.loop1:
-	push bc
-	call testa
-	pop bc
-	ld c, $51
 	ld b, $0
+.loop1:
 	ld a,[c]
 	cp b
 	jr z,.loop1
@@ -132,23 +145,6 @@ waitsw:
 waitswstr:
 	db "Diagnostic ROM complete; flip switches to nonzero and then to zero to reset. Expect A.",$0D,$0A,0
 
-testa:
-	ld c, $0F
-	ld a, [c]
-	ld b, $00
-	cp b
-	ret z
-	xor a
-	ld [c], a
-	ld a, $41
-	call putc
-	ld a, 1
-	add e
-	ld c, $51
-	ld [c], a
-	ld e, a
-	ret
-
 ; Core instruction basic acceptance tests.
 insntest:
 	ld hl, .insnteststr