svn commit: r331191 - stable/11/sys/dev/fb

[Eitan Adler]

Author: eadler
Date: Mon Mar 19 07:03:02 2018
New Revision: 331191
URL: https://svnweb.freebsd.org/changeset/base/331191

Log:
  MFC r315986:
  
  Fix 3 entries in mode tables related to mono and 90-column text modes.
  Newer VGAs don't support any mono modes, but bugs in the tables created
  2 virtual mono modes (#45 90x43 and #112 80x43) that behaved more
  strangely than crashing.  90-column modes are tweaked 80-column ones
  and also fail to work on newer VGAs.  #45 did crash (hang) on some
  hardware.

Modified:
  stable/11/sys/dev/fb/vga.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/fb/vga.c
==============================================================================
--- stable/11/sys/dev/fb/vga.c	Mon Mar 19 07:00:15 2018	(r331190)
+++ stable/11/sys/dev/fb/vga.c	Mon Mar 19 07:03:02 2018	(r331191)
@@ -347,7 +347,7 @@ static video_info_t bios_vmode[] = {
     { M_EGAMONO80x25, 0,          80, 25, 8, 14, 2, 1,
       MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
     /* EGA */
-    { M_ENH_B80x43, 0,            80, 43, 8,  8, 2, 1,
+    { M_ENH_B80x43, V_INFO_COLOR, 80, 43, 8,  8, 2, 1,
       CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
     { M_ENH_C80x43, V_INFO_COLOR, 80, 43, 8,  8, 4, 1,
       CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
@@ -377,7 +377,7 @@ static video_info_t bios_vmode[] = {
     { M_VGA_C90x30, V_INFO_COLOR, 90, 30, 8, 16, 4, 1,
       CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
     { M_VGA_M90x43, 0,            90, 43, 8,  8, 2, 1,
-      CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
+      MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
     { M_VGA_C90x43, V_INFO_COLOR, 90, 43, 8,  8, 4, 1,
       CGA_BUF_BASE, CGA_BUF_SIZE, CGA_BUF_SIZE, 0, 0, V_INFO_MM_TEXT },
     { M_VGA_M90x50, 0,            90, 50, 8,  8, 2, 1,
@@ -593,7 +593,7 @@ map_mode_num(int mode)
         { M_VGA_C90x25, M_VGA_C80x25 },
         { M_VGA_M90x30, M_VGA_M80x25 },
         { M_VGA_C90x30, M_VGA_C80x25 },
-        { M_VGA_M90x43, M_ENH_B80x25 },
+        { M_VGA_M90x43, M_VGA_M80x25 },
         { M_VGA_C90x43, M_ENH_C80x25 },
         { M_VGA_M90x50, M_VGA_M80x25 },
         { M_VGA_C90x50, M_VGA_C80x25 },