Module Name: src
Committed By: mlelstv
Date: Sun Mar 1 07:05:59 UTC 2015
Modified Files:
src/sys/dev/ic: vga.c vga_raster.c
Log Message:
Also unmap video memory when detaching console
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/ic/vga_raster.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.114 src/sys/dev/ic/vga.c:1.115
--- src/sys/dev/ic/vga.c:1.114 Wed Jan 14 17:45:27 2015
+++ src/sys/dev/ic/vga.c Sun Mar 1 07:05:59 2015
@@ -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 @@ vga_cndetach(void)
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;
Index: src/sys/dev/ic/vga_raster.c
diff -u src/sys/dev/ic/vga_raster.c:1.43 src/sys/dev/ic/vga_raster.c:1.44
--- src/sys/dev/ic/vga_raster.c:1.43 Wed Jan 14 17:45:27 2015
+++ src/sys/dev/ic/vga_raster.c Sun Mar 1 07:05:59 2015
@@ -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 @@ vga_cndetach(void)
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;
