From d4636e74c86fad221c57a3a1704106e2367fc230 Mon Sep 17 00:00:00 2001
From: Daniel Borca <dborca@users.sourceforge.net>
Date: Tue, 20 Jan 2004 14:15:35 +0000
Subject: [PATCH] fixed a bug in VGA initialization routine

---
 docs/README.DJ             |  7 +++++--
 src/mesa/drivers/dos/vga.c | 22 +++++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/docs/README.DJ b/docs/README.DJ
index 95eb43c584f..2571a5327a0 100644
--- a/docs/README.DJ
+++ b/docs/README.DJ
@@ -1,4 +1,4 @@
-			Mesa 6.0 DOS/DJGPP Port v1.5
+			Mesa 6.1 DOS/DJGPP Port v1.6
 			~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
@@ -6,7 +6,7 @@
 Description:
 ~~~~~~~~~~~~
 
-Well, guess what... this is the DOS port of Mesa 6.0, for DJGPP fans... Whoa!
+Well, guess what... this is the DOS port of Mesa 6.1, for DJGPP fans... Whoa!
 The driver has its origins in ddsample.c, written by Brian Paul and found by me
 in Mesa 3.4.2.
 
@@ -237,6 +237,9 @@ v1.5 (jan-2004)
 	- removed Matrox Millennium MGA2064W driver
 	x more changes to the 3dfx driver
 
+v1.6 (???-2004)
+	* fixed a horrible bug in VGA initialization routine
+
 
 
 Contact:
diff --git a/src/mesa/drivers/dos/vga.c b/src/mesa/drivers/dos/vga.c
index 3a4bd9b6876..c8c0151ce32 100644
--- a/src/mesa/drivers/dos/vga.c
+++ b/src/mesa/drivers/dos/vga.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.5 for Mesa
+ * DOS/DJGPP device driver v1.6 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@users.sourceforge.net
@@ -40,8 +40,24 @@
 
 
 static vl_mode modes[] = {
-       {0x13 | 0x4000, 320, 200, 320, 8, -1, 320*200},
-       {0xffff, -1, -1, -1, -1, -1, -1}
+       {
+        /* .xres    = */ 320,
+        /* .yres    = */ 200,
+        /* .bpp     = */ 8,
+        /* .mode    = */ 0x13 | 0x4000,
+        /* .scanlen = */ 320,
+        /* .sel     = */ -1,
+        /* .gran    = */ 320*200
+       },
+       {
+        /* .xres    = */ -1,
+        /* .yres    = */ -1,
+        /* .bpp     = */ -1,
+        /* .mode    = */ 0xffff,
+        /* .scanlen = */ -1,
+        /* .sel     = */ -1,
+        /* .gran    = */ -1
+       }
 };
 
 static word16 vga_ver;
-- 
2.30.2