vga(4): Remove VGA_SLOW_IOACCESS option.

Byte outs should not be needed anymore since years.

For example, they are described as being obsolete in M.Abrash's
"Graphics Programming Black Book" (1997).

diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index 7732448..299f33f 100644 (file)
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -40,7 +40,6 @@
 .Cd "options VGA_ALT_SEQACCESS"
 .Cd "options VGA_NO_FONT_LOADING"
 .Cd "options VGA_NO_MODE_CHANGE"
-.Cd "options VGA_SLOW_IOACCESS"
 .Cd "options VGA_DEBUG=N"
 .Cd "options VGA_WIDTH90"
 .Cd "device vga0 at isa? port ?"
@@ -90,10 +89,6 @@ Set the VGA support debug level to
 .Fa N .
 The default value is 0, which suppresses all debugging output.
 A value of 2 gives maximum verbosity.
-.It Dv VGA_SLOW_IOACCESS
-Older VGA cards may require this option for proper operation.
-It makes the driver perform byte-wide I/O to VGA registers and
-slow down a little.
 .It Dv VGA_WIDTH90
 This option enables 90 column modes: 90x25, 90x30, 90x43, 90x50, 90x60.
 These modes are not always supported by the video card and the display.

diff --git a/sys/config/LINT b/sys/config/LINT
index 21f06ae..7df2b05 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -1129,9 +1129,6 @@ options           VGA_DEBUG=2             # enable VGA debug output
 #options       VGA_NO_FONT_LOADING     # don't save/load font
 #options       VGA_NO_MODE_CHANGE      # don't change video modes
 
-# Older video cards may require this option for proper operation.
-options        VGA_SLOW_IOACCESS       # do byte-wide i/o's to TS and GDC regs
-
 # The following option probably won't work with the LCD displays.
 options        VGA_WIDTH90             # support 90 column modes
 

diff --git a/sys/dev/video/fb/vga.c b/sys/dev/video/fb/vga.c
index 3cf293b..dee045c 100644 (file)
--- a/sys/dev/video/fb/vga.c
+++ b/sys/dev/video/fb/vga.c
@@ -1257,19 +1257,6 @@ set_font_mode(video_adapter_t *adp, u_char *buf)
     inb(CRTC + 6);                             /* reset flip-flop */
     outb(ATC, 0x20);                           /* enable palette */
 
-#if VGA_SLOW_IOACCESS
-#ifdef VGA_ALT_SEQACCESS
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);
-#endif
-    outb(TSIDX, 0x02); outb(TSREG, 0x04);
-    outb(TSIDX, 0x04); outb(TSREG, 0x07);
-#ifdef VGA_ALT_SEQACCESS
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);
-#endif
-    outb(GDCIDX, 0x04); outb(GDCREG, 0x02);
-    outb(GDCIDX, 0x05); outb(GDCREG, 0x00);
-    outb(GDCIDX, 0x06); outb(GDCREG, 0x04);
-#else /* VGA_SLOW_IOACCESS */
 #ifdef VGA_ALT_SEQACCESS
     outw(TSIDX, 0x0100);
 #endif
@@ -1281,7 +1268,6 @@ set_font_mode(video_adapter_t *adp, u_char *buf)
     outw(GDCIDX, 0x0204);
     outw(GDCIDX, 0x0005);
     outw(GDCIDX, 0x0406);               /* addr = a0000, 64kb */
-#endif /* VGA_SLOW_IOACCESS */
 
     crit_exit();
 }
@@ -1297,19 +1283,6 @@ set_normal_mode(video_adapter_t *adp, u_char *buf)
     inb(CRTC + 6);                             /* reset flip-flop */
     outb(ATC, 0x20);                           /* enable palette */
 
-#if VGA_SLOW_IOACCESS
-#ifdef VGA_ALT_SEQACCESS
-    outb(TSIDX, 0x00); outb(TSREG, 0x01);
-#endif
-    outb(TSIDX, 0x02); outb(TSREG, buf[0]);
-    outb(TSIDX, 0x04); outb(TSREG, buf[1]);
-#ifdef VGA_ALT_SEQACCESS
-    outb(TSIDX, 0x00); outb(TSREG, 0x03);
-#endif
-    outb(GDCIDX, 0x04); outb(GDCREG, buf[2]);
-    outb(GDCIDX, 0x05); outb(GDCREG, buf[3]);
-    outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x0c);
-#else /* VGA_SLOW_IOACCESS */
 #ifdef VGA_ALT_SEQACCESS
     outw(TSIDX, 0x0100);
 #endif
@@ -1321,7 +1294,6 @@ set_normal_mode(video_adapter_t *adp, u_char *buf)
     outw(GDCIDX, 0x0004 | (buf[2] << 8));
     outw(GDCIDX, 0x0005 | (buf[3] << 8));
     outw(GDCIDX, 0x0006 | (((buf[4] & 0x03) | 0x0c)<<8));
-#endif /* VGA_SLOW_IOACCESS */
 
     crit_exit();
 }

diff --git a/sys/platform/pc32/conf/options b/sys/platform/pc32/conf/options
index 2dd1537..4699b19 100644 (file)
--- a/sys/platform/pc32/conf/options
+++ b/sys/platform/pc32/conf/options
@@ -93,7 +93,6 @@ VGA_ALT_SEQACCESS     opt_vga.h
 VGA_DEBUG              opt_vga.h
 VGA_NO_FONT_LOADING    opt_vga.h
 VGA_NO_MODE_CHANGE     opt_vga.h
-VGA_SLOW_IOACCESS      opt_vga.h
 VGA_WIDTH90            opt_vga.h
 
 VESA                   opt_vesa.h

diff --git a/sys/platform/pc64/conf/options b/sys/platform/pc64/conf/options
index 6b2147d..f60d0eb 100644 (file)
--- a/sys/platform/pc64/conf/options
+++ b/sys/platform/pc64/conf/options
@@ -46,7 +46,6 @@ VGA_ALT_SEQACCESS     opt_vga.h
 VGA_DEBUG              opt_vga.h
 VGA_NO_FONT_LOADING    opt_vga.h
 VGA_NO_MODE_CHANGE     opt_vga.h
-VGA_SLOW_IOACCESS      opt_vga.h
 VGA_WIDTH90            opt_vga.h
 
 PSM_HOOKRESUME         opt_psm.h