[VGA_NEW] Fix confusion between CRTC Controller and Graphics Controller registers.

diff --git a/win32ss/drivers/miniport/vga_new/vga.h b/win32ss/drivers/miniport/vga_new/vga.h
index 792eb03..56dd52f 100644 (file)
--- a/win32ss/drivers/miniport/vga_new/vga.h
+++ b/win32ss/drivers/miniport/vga_new/vga.h
@@ -114,7 +114,6 @@
 #define CRTC_ADDRESS_COLOR_OFFSET     0x24
 #define FEAT_CTRL_WRITE_COLOR_OFFSET  0x2A
 
 #define CRTC_ADDRESS_COLOR_OFFSET     0x24
 #define FEAT_CTRL_WRITE_COLOR_OFFSET  0x2A
 

-                                            // toggle in color mode

 //
 // VGA indexed register indexes.
 //
 //
 // VGA indexed register indexes.
 //

diff --git a/win32ss/drivers/miniport/vga_new/vgadata.c b/win32ss/drivers/miniport/vga_new/vgadata.c
index 128ee50..dd3bd56 100644 (file)
--- a/win32ss/drivers/miniport/vga_new/vgadata.c
+++ b/win32ss/drivers/miniport/vga_new/vgadata.c
@@ -96,9 +96,9 @@ USHORT VGA_640x480[] = {
     CRTC_ADDRESS_PORT_COLOR,
     0x511,                        
 
     CRTC_ADDRESS_PORT_COLOR,
     0x511,                        
 

-    METAOUT+INDXOUT,                // program gdc registers
-    GRAPH_ADDRESS_PORT,
-    VGA_NUM_CRTC_PORTS,0,            // count, startindex
+    METAOUT+INDXOUT,                // program crtc registers
+    CRTC_ADDRESS_PORT_COLOR,
+    VGA_NUM_CRTC_PORTS,0,           // count, startindex

     0x5F,0x4F,0x50,0x82,0x54,0x80,0x0B,0x3E,0x00,0x40,0x0,0x0,0x0,0x0,0x0,0x0,
     0xEA,0x8C,0xDF,0x28,0x0,0xE7,0x4,0xE3,0xFF,
 
     0x5F,0x4F,0x50,0x82,0x54,0x80,0x0B,0x3E,0x00,0x40,0x0,0x0,0x0,0x0,0x0,0x0,
     0xEA,0x8C,0xDF,0x28,0x0,0xE7,0x4,0xE3,0xFF,
 


@@ -165,8 +165,8 @@ USHORT VGA_TEXT_0[] = {
     CRTC_ADDRESS_PORT_COLOR,
     0xE11,                        
 
     CRTC_ADDRESS_PORT_COLOR,
     0xE11,                        
 

-    METAOUT+INDXOUT,                // program gdc registers
-    GRAPH_ADDRESS_PORT,
+    METAOUT+INDXOUT,                // program crtc registers
+    CRTC_ADDRESS_PORT_COLOR,

     VGA_NUM_CRTC_PORTS,0,           // count, startindex
     0x5F,0x4F,0x50,0x82,0x55,0x81,0xBF,0x1F,0x00,0x4F,0xD,0xE,0x0,0x0,0x0,0x0,
     0x9c,0x8E,0x8F,0x28,0x1F,0x96,0xB9,0xA3,0xFF,
     VGA_NUM_CRTC_PORTS,0,           // count, startindex
     0x5F,0x4F,0x50,0x82,0x55,0x81,0xBF,0x1F,0x00,0x4F,0xD,0xE,0x0,0x0,0x0,0x0,
     0x9c,0x8E,0x8F,0x28,0x1F,0x96,0xB9,0xA3,0xFF,


@@ -234,8 +234,8 @@ USHORT VGA_TEXT_1[] = {
     CRTC_ADDRESS_PORT_COLOR,
     0x511,                        
 
     CRTC_ADDRESS_PORT_COLOR,
     0x511,                        
 

-    METAOUT+INDXOUT,                // program gdc registers
-    GRAPH_ADDRESS_PORT,
+    METAOUT+INDXOUT,                // program crtc registers
+    CRTC_ADDRESS_PORT_COLOR,

     VGA_NUM_CRTC_PORTS,0,           // count, startindex
     0x5F,0x4F,0x50,0x82,0x55,0x81,0xBF,0x1F,0x00,0x4D,0xB,0xC,0x0,0x0,0x0,0x0,
     0x83,0x85,0x5D,0x28,0x1F,0x63,0xBA,0xA3,0xFF,
     VGA_NUM_CRTC_PORTS,0,           // count, startindex
     0x5F,0x4F,0x50,0x82,0x55,0x81,0xBF,0x1F,0x00,0x4D,0xB,0xC,0x0,0x0,0x0,0x0,
     0x83,0x85,0x5D,0x28,0x1F,0x63,0xBA,0xA3,0xFF,