[src/trunk]: src/sys/dev/ic detach wscons when detaching console

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

details:   https://anonhg.NetBSD.org/src/rev/67e478f13b7a
branches:  trunk
changeset: 330494:67e478f13b7a
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sat Jul 12 05:30:33 2014 +0000

description:
detach wscons when detaching console

diffstat:

 sys/dev/ic/vga.c        |  10 ++++++++--
 sys/dev/ic/vga_raster.c |   9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diffs (68 lines):

diff -r a930736c95e0 -r 67e478f13b7a sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Sat Jul 12 05:28:07 2014 +0000
+++ b/sys/dev/ic/vga.c  Sat Jul 12 05:30:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.111 2013/11/04 16:54:56 christos Exp $ */
+/* $NetBSD: vga.c,v 1.112 2014/07/12 05:30:33 mlelstv Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,8 +28,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.111 2013/11/04 16:54:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.112 2014/07/12 05:30:33 mlelstv Exp $");
 
+#include "opt_vga.h"
 /* for WSCONS_SUPPORT_PCVTFONTS */
 #include "opt_wsdisplay_compat.h"
 /* for WSDISPLAY_CUSTOM_BORDER */
@@ -727,9 +728,14 @@
        vh = &vc->hdl;
 
        if (vgaconsole) {
+               wsdisplay_cndetach();
+
                bus_space_unmap(vh->vh_iot, vh->vh_ioh_vga, 0x10);
                bus_space_unmap(vh->vh_iot, vh->vh_ioh_6845, 0x10);
 
+               vga_console_attached = 0;
+               vgaconsole = 0;
+
                return 1;
        }
 
diff -r a930736c95e0 -r 67e478f13b7a sys/dev/ic/vga_raster.c
--- a/sys/dev/ic/vga_raster.c   Sat Jul 12 05:28:07 2014 +0000
+++ b/sys/dev/ic/vga_raster.c   Sat Jul 12 05:30:33 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vga_raster.c,v 1.40 2014/04/18 22:02:44 mlelstv Exp $  */
+/*     $NetBSD: vga_raster.c,v 1.41 2014/07/12 05:30:33 mlelstv Exp $  */
 
 /*
  * Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.40 2014/04/18 22:02:44 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.41 2014/07/12 05:30:33 mlelstv Exp $");
 
 #include "opt_vga.h"
 #include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -570,9 +570,14 @@
        vh = &vc->hdl;
 
        if (vgaconsole) {
+               wsdisplay_cndetach();
+
                bus_space_unmap(vh->vh_iot, vh->vh_ioh_vga, 0x10);
                bus_space_unmap(vh->vh_iot, vh->vh_ioh_6845, 0x10);
 
+               vga_console_attached = 0;
+               vgaconsole = 0;
+
                return 1;
        }