From e91db91d4e4f2cb91aa31840718ce5e2111d30c5 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Thu, 24 Sep 1998 13:20:47 +0000
Subject: [PATCH] SC_BAD_FLICKER -> SC_ALT_SEQACCESS Now supposedly less
 harmful way of accessing VGA sequencer registers is default. An alternative,
 often troublesome, I/O access is optional.

Discussed with: sos, jkh
---
 sys/conf/options.i386      |  4 ++--
 sys/i386/conf/options.i386 |  4 ++--
 sys/i386/isa/videoio.c     | 26 +++++++++++++-------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 21c45983b68..2d8b5297aaf 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.86 1998/09/15 10:01:14 gibbs Exp $
+#	$Id: options.i386,v 1.87 1998/09/15 18:16:37 sos Exp $
 
 BOUNCEPAGES		opt_bounce.h
 DISABLE_PSE
@@ -75,7 +75,7 @@ STD8X16FONT		opt_syscons.h
 SC_HISTORY_SIZE		opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
-SC_BAD_FLICKER		opt_syscons.h
+SC_ALT_SEQACCESS	opt_syscons.h
 
 VESA			opt_vesa.h
 
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 21c45983b68..2d8b5297aaf 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.86 1998/09/15 10:01:14 gibbs Exp $
+#	$Id: options.i386,v 1.87 1998/09/15 18:16:37 sos Exp $
 
 BOUNCEPAGES		opt_bounce.h
 DISABLE_PSE
@@ -75,7 +75,7 @@ STD8X16FONT		opt_syscons.h
 SC_HISTORY_SIZE		opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
-SC_BAD_FLICKER		opt_syscons.h
+SC_ALT_SEQACCESS	opt_syscons.h
 
 VESA			opt_vesa.h
 
diff --git a/sys/i386/isa/videoio.c b/sys/i386/isa/videoio.c
index 681134c100e..927bf4280da 100644
--- a/sys/i386/isa/videoio.c
+++ b/sys/i386/isa/videoio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: videoio.c,v 1.1 1998/09/15 18:16:38 sos Exp $
+ * $Id: videoio.c,v 1.2 1998/09/23 09:59:00 yokota Exp $
  */
 
 #include "sc.h"
@@ -1069,24 +1069,24 @@ set_font_mode(video_adapter_t *adp, u_char *buf)
     outb(ATC, 0x20);				/* enable palette */
 
 #if SLOW_VGA
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     outb(TSIDX, 0x00); outb(TSREG, 0x01);
 #endif
     outb(TSIDX, 0x02); outb(TSREG, 0x04);
     outb(TSIDX, 0x04); outb(TSREG, 0x07);
-#ifndef SC_BAD_FLICKER
+#ifdef SC_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
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     outw(TSIDX, 0x0100);
 #endif
     outw(TSIDX, 0x0402);
     outw(TSIDX, 0x0704);
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     outw(TSIDX, 0x0300);
 #endif
     outw(GDCIDX, 0x0204);
@@ -1111,12 +1111,12 @@ set_normal_mode(video_adapter_t *adp, u_char *buf)
     outb(ATC, 0x20);				/* enable palette */
 
 #if SLOW_VGA
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     outb(TSIDX, 0x00); outb(TSREG, 0x01);
 #endif
     outb(TSIDX, 0x02); outb(TSREG, buf[0]);
     outb(TSIDX, 0x04); outb(TSREG, buf[1]);
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     outb(TSIDX, 0x00); outb(TSREG, 0x03);
 #endif
     outb(GDCIDX, 0x04); outb(GDCREG, buf[2]);
@@ -1127,12 +1127,12 @@ set_normal_mode(video_adapter_t *adp, u_char *buf)
 	outb(GDCIDX, 0x06); outb(GDCREG,(buf[4] & 0x03) | 0x0c);
     }
 #else
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     outw(TSIDX, 0x0100);
 #endif
     outw(TSIDX, 0x0002 | (buf[0] << 8));
     outw(TSIDX, 0x0004 | (buf[1] << 8));
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     outw(TSIDX, 0x0300);
 #endif
     outw(GDCIDX, 0x0004 | (buf[2] << 8));
@@ -1182,7 +1182,7 @@ vid_save_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
     if (page > 3)
 	segment -= 0xe000;
 
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     if (adapter[ad].va_type == KD_VGA) {	/* what about EGA? XXX */
 	s = splhigh();
 	outb(TSIDX, 0x00); outb(TSREG, 0x01);
@@ -1206,7 +1206,7 @@ vid_save_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
     }
     set_normal_mode(&adapter[ad], buf);
 
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     if (adapter[ad].va_type == KD_VGA) {
 	s = splhigh();
 	outb(TSIDX, 0x00); outb(TSREG, 0x01);
@@ -1257,7 +1257,7 @@ vid_load_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
     if (page > 3)
 	segment -= 0xe000;
 
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     if (adapter[ad].va_type == KD_VGA) {	/* what about EGA? XXX */
 	s = splhigh();
 	outb(TSIDX, 0x00); outb(TSREG, 0x01);
@@ -1281,7 +1281,7 @@ vid_load_font(int ad, int page, int fontsize, u_char *data, int ch, int count)
     }
     set_normal_mode(&adapter[ad], buf);
 
-#ifndef SC_BAD_FLICKER
+#ifdef SC_ALT_SEQACCESS
     if (adapter[ad].va_type == KD_VGA) {
 	s = splhigh();
 	outb(TSIDX, 0x00); outb(TSREG, 0x01);