[src/netbsd-6]: src/sys/dev/ic Pull up following revision(s) (requested by uw...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a2f28f3077c6
branches:  netbsd-6
changeset: 774412:a2f28f3077c6
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 12 13:27:43 2012 +0000

description:
Pull up following revision(s) (requested by uwe in ticket #472):
        sys/dev/ic/vga.c: revision 1.109
Reset flip/flop using dedicated vga_reset_state() macro we already have.
Explicit vga_raw_read() used here before was incorrect since it reads
from *wrong* io handle!
Fixes weird problem under VirtualBox where first switch to a different
VT caused text mode color 0 (normally black) to become something else.

diffstat:

 sys/dev/ic/vga.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r c073a7128c8f -r a2f28f3077c6 sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Sun Aug 12 13:19:14 2012 +0000
+++ b/sys/dev/ic/vga.c  Sun Aug 12 13:27:43 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.108 2012/01/11 20:41:28 macallan Exp $ */
+/* $NetBSD: vga.c,v 1.108.2.1 2012/08/12 13:27:43 martin Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.108 2012/01/11 20:41:28 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.108.2.1 2012/08/12 13:27:43 martin Exp $");
 
 /* for WSCONS_SUPPORT_PCVTFONTS */
 #include "opt_wsdisplay_compat.h"
@@ -1565,7 +1565,7 @@
        for (i = 0; i < sizeof(vc->palette); i++)
                *palette++ = vga_raw_read(vh, VGA_DAC_PALETTE);
 
-       vga_raw_read(vh, 0x0a);                 /* reset flip/flop */
+       vga_reset_state(vh);                    /* reset flip/flop */
 }
 
 void
@@ -1583,6 +1583,6 @@
        for (i = 0; i < sizeof(vc->palette); i++)
                vga_raw_write(vh, VGA_DAC_PALETTE, *palette++);
 
-       vga_raw_read(vh, 0x0a);                 /* reset flip/flop */
+       vga_reset_state(vh);                    /* reset flip/flop */
        vga_enable(vh);
 }