[src/trunk]: src/sys/dev/ic Also unmap video memory when detaching console

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

details:   https://anonhg.NetBSD.org/src/rev/9807586d02dd
branches:  trunk
changeset: 336429:9807586d02dd
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Mar 01 07:05:59 2015 +0000

description:
Also unmap video memory when detaching console

diffstat:

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

diffs (52 lines):

diff -r 15e13afaaa75 -r 9807586d02dd sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Sun Mar 01 01:14:41 2015 +0000
+++ b/sys/dev/ic/vga.c  Sun Mar 01 07:05:59 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.114 2015/01/14 17:45:27 chs Exp $ */
+/* $NetBSD: vga.c,v 1.115 2015/03/01 07:05:59 mlelstv Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.114 2015/01/14 17:45:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.115 2015/03/01 07:05:59 mlelstv Exp $");
 
 #include "opt_vga.h"
 /* for WSCONS_SUPPORT_PCVTFONTS */
@@ -725,6 +725,7 @@
 
                bus_space_unmap(vh->vh_iot, vh->vh_ioh_vga, 0x10);
                bus_space_unmap(vh->vh_iot, vh->vh_ioh_6845, 0x10);
+               bus_space_unmap(vh->vh_memt, vh->vh_allmemh, 0x20000);
 
                vga_console_attached = 0;
                vgaconsole = 0;
diff -r 15e13afaaa75 -r 9807586d02dd sys/dev/ic/vga_raster.c
--- a/sys/dev/ic/vga_raster.c   Sun Mar 01 01:14:41 2015 +0000
+++ b/sys/dev/ic/vga_raster.c   Sun Mar 01 07:05:59 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vga_raster.c,v 1.43 2015/01/14 17:45:27 chs Exp $      */
+/*     $NetBSD: vga_raster.c,v 1.44 2015/03/01 07:05:59 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.43 2015/01/14 17:45:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.44 2015/03/01 07:05:59 mlelstv Exp $");
 
 #include "opt_vga.h"
 #include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -567,6 +567,7 @@
 
                bus_space_unmap(vh->vh_iot, vh->vh_ioh_vga, 0x10);
                bus_space_unmap(vh->vh_iot, vh->vh_ioh_6845, 0x10);
+               bus_space_unmap(vh->vh_memt, vh->vh_allmemh, 0x20000);
 
                vga_console_attached = 0;
                vgaconsole = 0;