# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1511212753 -3600
# Node ID 64f326c52ab144cc3ec0e303d54e968b5cafd020
# Parent  0aecc44b03ad0aa6c18f4952a554862eb4ac8d6d# Parent  11840489990bf3ec63aff01351a7fec57be3b6d0
Merged changes from a parallel development branch.

diff -r 0aecc44b03ad -r 64f326c52ab1 vga.S
--- a/vga.S	Mon Nov 20 18:39:43 2017 +0100
+++ b/vga.S	Mon Nov 20 22:19:13 2017 +0100
@@ -498,15 +498,15 @@
 init_dma:
 	/* Disable DMA interrupts. */
 
+	li $v1, (0b111 << 28)
+
 	la $v0, IEC1
-	li $v1, (0b111 << 28)	/* IEC1<30:28> = DMA2IE, DMA1IE, DMA0IE = 0 */
-	sw $v1, CLR($v0)
+	sw $v1, CLR($v0)	/* IEC1<30:28> = DMA2IE, DMA1IE, DMA0IE = 0 */
 
 	/* Clear DMA interrupt flags. */
 
 	la $v0, IFS1
-	li $v1, (0b111 << 28)	/* IFS1<30:28> = DMA2IF, DMA1IF, DMA0IF = 0 */
-	sw $v1, CLR($v0)
+	sw $v1, CLR($v0)	/* IFS1<30:28> = DMA2IF, DMA1IF, DMA0IF = 0 */
 
 	/* Enable DMA. */
 
@@ -538,17 +538,14 @@
 
 	Chain the channel to channel 0:
 	DCHxCON<5> = CHCHN = 1
-
-	Allow the channel to receive events when disabled:
-	DCHxCON<6> = CHAED = 1
 	*/
 
 	la $v0, DCH1CON
-	li $v1, 0b1100011
+	li $v1, 0b100011
 	sw $v1, 0($v0)
 
 	la $v0, DCH2CON
-	li $v1, 0b1100011
+	li $v1, 0b100011
 	sw $v1, 0($v0)
 
 	/*