# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1511199491 -3600
# Node ID 1497c26c2e4c8ad01b80696bd9179dbe52a718b0
# Parent  0b12a93c210e51640145bcfd48f8fc7dae40a7d4# Parent  6e88e6cdc19a41cc297d91947b69f67c17b4905e
Merged changes from a parallel development branch.

diff -r 0b12a93c210e -r 1497c26c2e4c vga.S
--- a/vga.S	Mon Nov 20 17:34:53 2017 +0100
+++ b/vga.S	Mon Nov 20 18:38:11 2017 +0100
@@ -327,22 +327,6 @@
 	li $v1, HFREQ_LIMIT
 	sw $v1, 0($v0)		/* PR2 = HFREQ_LIMIT */
 
-	/* Initialise Timer2 interrupt. */
-
-	la $v0, IFS0
-	li $v1, (1 << 9)
-	sw $v1, CLR($v0)	/* T2IF = 0 */
-
-	la $v0, IPC2
-	li $v1, 0b11111
-	sw $v1, CLR($v0)	/* T2IP, T2IS = 0 */
-	li $v1, 0b00111
-	sw $v1, SET($v0)	/* T2IP = 1; T2IS = 3 */
-
-	la $v0, IEC0
-	li $v1, (1 << 9)
-	sw $v1, SET($v0)	/* T2IE = 1 */
-
 	/* Start timer. */
 
 	la $v0, T2CON