From b4b3a81a2ac0907c3c2a1ae727cc718cc12bb1f9 Mon Sep 17 00:00:00 2001
From: chs <chs@NetBSD.org>
Date: Wed, 14 Jan 2015 17:45:27 +0000
Subject: [PATCH] remove BIOS-mapping code that was #if-0'd in the previous
 commit.

---
 sys/dev/ic/vga.c        | 12 ++----------
 sys/dev/ic/vga_raster.c | 12 ++----------
 sys/dev/ic/vgavar.h     |  7 +------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 70a0fdad2481..6fbc83e6fd4c 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.113 2014/08/21 13:52:22 macallan Exp $ */
+/* $NetBSD: vga.c,v 1.114 2015/01/14 17:45:27 chs Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.113 2014/08/21 13:52:22 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.114 2015/01/14 17:45:27 chs Exp $");
 
 #include "opt_vga.h"
 /* for WSCONS_SUPPORT_PCVTFONTS */
@@ -555,14 +555,6 @@ vga_init(struct vga_config *vc, bus_space_tag_t iot, bus_space_tag_t memt)
 	    (vh->vh_mono ? 0x10000 : 0x18000), 0x8000, &vh->vh_memh))
 		panic("vga_init: mem subrange failed");
 
-#if 0
-	/* should only reserve the space (no need to map - save KVM) */
-	vc->vc_biostag = memt;
-	if (bus_space_map(vc->vc_biostag, 0xc0000, 0x8000, 0, &vc->vc_bioshdl))
-		vc->vc_biosmapped = 0;
-	else
-		vc->vc_biosmapped = 1;
-#endif
 	vc->nscreens = 0;
 	LIST_INIT(&vc->screens);
 	vc->active = NULL;
diff --git a/sys/dev/ic/vga_raster.c b/sys/dev/ic/vga_raster.c
index e7ab0017f379..2b3c7ee03f6b 100644
--- a/sys/dev/ic/vga_raster.c
+++ b/sys/dev/ic/vga_raster.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vga_raster.c,v 1.42 2014/08/21 13:52:22 macallan Exp $	*/
+/*	$NetBSD: vga_raster.c,v 1.43 2015/01/14 17:45:27 chs 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.42 2014/08/21 13:52:22 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.43 2015/01/14 17:45:27 chs Exp $");
 
 #include "opt_vga.h"
 #include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -402,14 +402,6 @@ vga_raster_init(struct vga_config *vc, bus_space_tag_t iot,
 	    &vh->vh_memh))
 		panic("vga_raster_init: mem subrange failed");
 
-#if 0
-	/* should only reserve the space (no need to map - save KVM) */
-	vc->vc_biostag = memt;
-	if (bus_space_map(vc->vc_biostag, 0xc0000, 0x8000, 0, &vc->vc_bioshdl))
-		vc->vc_biosmapped = 0;
-	else
-		vc->vc_biosmapped = 1;
-#endif
 	vc->nscreens = 0;
 	LIST_INIT(&vc->screens);
 	vc->active = NULL;
diff --git a/sys/dev/ic/vgavar.h b/sys/dev/ic/vgavar.h
index 4910e214ae1a..833021b0943d 100644
--- a/sys/dev/ic/vgavar.h
+++ b/sys/dev/ic/vgavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vgavar.h,v 1.32 2014/11/12 03:12:35 christos Exp $ */
+/* $NetBSD: vgavar.h,v 1.33 2015/01/14 17:45:27 chs Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -57,11 +57,6 @@ struct vga_config {
 	struct vgascreen *active; /* current display */
 	const struct wsscreen_descr *currenttype;
 
-#if 0
-	int vc_biosmapped;
-	bus_space_tag_t vc_biostag;
-	bus_space_handle_t vc_bioshdl;
-#endif
 	struct vgascreen *wantedscreen;
 	void (*switchcb)(void *, int, int);
 	void *switchcbarg;