VGAPIC32

Changeset

91:64f326c52ab1
2017-11-20 Paul Boddie raw files shortlog changelog graph Merged changes from a parallel development branch.
vga.S (file)
     1.1 --- a/vga.S	Mon Nov 20 18:39:43 2017 +0100
     1.2 +++ b/vga.S	Mon Nov 20 22:19:13 2017 +0100
     1.3 @@ -498,15 +498,15 @@
     1.4  init_dma:
     1.5  	/* Disable DMA interrupts. */
     1.6  
     1.7 +	li $v1, (0b111 << 28)
     1.8 +
     1.9  	la $v0, IEC1
    1.10 -	li $v1, (0b111 << 28)	/* IEC1<30:28> = DMA2IE, DMA1IE, DMA0IE = 0 */
    1.11 -	sw $v1, CLR($v0)
    1.12 +	sw $v1, CLR($v0)	/* IEC1<30:28> = DMA2IE, DMA1IE, DMA0IE = 0 */
    1.13  
    1.14  	/* Clear DMA interrupt flags. */
    1.15  
    1.16  	la $v0, IFS1
    1.17 -	li $v1, (0b111 << 28)	/* IFS1<30:28> = DMA2IF, DMA1IF, DMA0IF = 0 */
    1.18 -	sw $v1, CLR($v0)
    1.19 +	sw $v1, CLR($v0)	/* IFS1<30:28> = DMA2IF, DMA1IF, DMA0IF = 0 */
    1.20  
    1.21  	/* Enable DMA. */
    1.22  
    1.23 @@ -538,17 +538,14 @@
    1.24  
    1.25  	Chain the channel to channel 0:
    1.26  	DCHxCON<5> = CHCHN = 1
    1.27 -
    1.28 -	Allow the channel to receive events when disabled:
    1.29 -	DCHxCON<6> = CHAED = 1
    1.30  	*/
    1.31  
    1.32  	la $v0, DCH1CON
    1.33 -	li $v1, 0b1100011
    1.34 +	li $v1, 0b100011
    1.35  	sw $v1, 0($v0)
    1.36  
    1.37  	la $v0, DCH2CON
    1.38 -	li $v1, 0b1100011
    1.39 +	li $v1, 0b100011
    1.40  	sw $v1, 0($v0)
    1.41  
    1.42  	/*