From 1181f545add9403e813071ce98a4487bb5e21a74 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Wed, 3 Jun 2015 12:17:40 -0700
Subject: [PATCH] Minor VGA source code fixes

---
 .editorconfig                         | 2 +-
 devices/pc/video/ibm/vga/ibm-vga.nasm | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e88e630f8..350383ad4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,7 +12,7 @@ indent_style = space
 indent_size = 8
 trim_trailing_whitespace = true
 
-[{*.ASM,*.INC,*.asm,*.inc,*.nasm}]
+[{*.ASM,*.INC,*.asm,*.inc,*.nasm,*.lst}]
 indent_style = tab
 indent_size = 8
 trim_trailing_whitespace = true
diff --git a/devices/pc/video/ibm/vga/ibm-vga.nasm b/devices/pc/video/ibm/vga/ibm-vga.nasm
index 2b89a84d1..682d38879 100644
--- a/devices/pc/video/ibm/vga/ibm-vga.nasm
+++ b/devices/pc/video/ibm/vga/ibm-vga.nasm
@@ -5,7 +5,6 @@
 
 	push	bp			; 0000003B  55
 	mov	ds,[cs:0x71c]		; 0000003C  2E8E1E1C07
-	mov	ds,[0x71c]		; 0000003D  8E1E1C07  '....'
 	mov	ax,0x1201		; 00000041  B80112  '...'
 	mov	bl,0x32			; 00000044  B332  '.2'
 	int	0x10			; 00000046  CD10  '..'
@@ -412,7 +411,7 @@ x381:	mov	dx,0x3c6		; 00000381  BAC603  '...'
 	mov	si,0x454		; 00000391  BE5404  '.T.'
 	mov	cx,0x1			; 00000394  B90100  '...'
 	call	x40c			; 00000397  E87200  '.r.'
-	jz	0x3bc			; 0000039A  7420  't '
+	jz	x3bc			; 0000039A  7420  't '
 	mov	si,0x450		; 0000039C  BE5004  '.P.'
 	mov	cx,0x1			; 0000039F  B90100  '...'
 	call	x40c			; 000003A2  E86700  '.g.'
@@ -424,7 +423,7 @@ x381:	mov	dx,0x3c6		; 00000381  BAC603  '...'
 	call	x40c			; 000003B7  E85200  '.R.'
 	jmp	short x3da		; 000003BA  EB1E  '..'
 
-	and	byte [0x489],0xfb	; 000003BC  80268904FB  '.&...'
+x3bc:	and	byte [0x489],0xfb	; 000003BC  80268904FB  '.&...'
 	mov	si,0x428		; 000003C1  BE2804  '.(.'
 	mov	cx,0x5			; 000003C4  B90500  '...'
 	call	x40c			; 000003C7  E84200  '.B.'
@@ -5738,7 +5737,7 @@ x2e8b:	pop	ax			; 00002E8B  58  'X'
 	pop	ax			; 00002EA8  58  'X'
 	push	ax			; 00002EA9  50  'P'
 	test	al,0x3			; 00002EAA  A803  '..'
-	jz	0x2ece			; 00002EAC  7420  't '
+	jz	x2ece			; 00002EAC  7420  't '
 	add	si,byte +0x10		; 00002EAE  83C610  '...'
 	call	x2f98			; 00002EB1  E8E400  '...'
 	pop	ax			; 00002EB4  58  'X'
@@ -6756,7 +6755,7 @@ x3639:	sub	al,0x20			; 00003639  2C20  ', '
 x364d:	sub	al,0x20			; 0000364D  2C20  ', '
 	mov	ds,[cs:0x71c]		; 0000364F  2E8E1E1C07  '.....'
 	dec	al			; 00003654  FEC8  '..'
-	jz	0x3678			; 00003656  7420  't '
+	jz	x3678			; 00003656  7420  't '
 	push	cs			; 00003658  0E  '.'
 	pop	es			; 00003659  07  '.'
 	dec	al			; 0000365A  FEC8  '..'