Module Name: src
Committed By: macallan
Date: Thu Aug 21 13:52:22 UTC 2014
Modified Files:
src/sys/dev/ic: vga.c vga_raster.c vgavar.h
Log Message:
#if 0 code to map the VGA BIOS
I've been unable to find any code that actually uses the mapping and we may
want to read the ROM from drm2.
If no users show up within a week or so I'll delete it.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ic/vga_raster.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/vgavar.h
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.112 src/sys/dev/ic/vga.c:1.113
--- src/sys/dev/ic/vga.c:1.112 Sat Jul 12 05:30:33 2014
+++ src/sys/dev/ic/vga.c Thu Aug 21 13:52:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.112 2014/07/12 05:30:33 mlelstv Exp $ */
+/* $NetBSD: vga.c,v 1.113 2014/08/21 13:52:22 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.112 2014/07/12 05:30:33 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.113 2014/08/21 13:52:22 macallan Exp $");
#include "opt_vga.h"
/* for WSCONS_SUPPORT_PCVTFONTS */
@@ -555,13 +555,14 @@ vga_init(struct vga_config *vc, bus_spac
(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;
Index: src/sys/dev/ic/vga_raster.c
diff -u src/sys/dev/ic/vga_raster.c:1.41 src/sys/dev/ic/vga_raster.c:1.42
--- src/sys/dev/ic/vga_raster.c:1.41 Sat Jul 12 05:30:33 2014
+++ src/sys/dev/ic/vga_raster.c Thu Aug 21 13:52:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.41 2014/07/12 05:30:33 mlelstv Exp $ */
+/* $NetBSD: vga_raster.c,v 1.42 2014/08/21 13:52:22 macallan 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.41 2014/07/12 05:30:33 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.42 2014/08/21 13:52:22 macallan Exp $");
#include "opt_vga.h"
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -402,13 +402,14 @@ vga_raster_init(struct vga_config *vc, b
&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;
Index: src/sys/dev/ic/vgavar.h
diff -u src/sys/dev/ic/vgavar.h:1.30 src/sys/dev/ic/vgavar.h:1.31
--- src/sys/dev/ic/vgavar.h:1.30 Mon Jan 21 19:49:15 2013
+++ src/sys/dev/ic/vgavar.h Thu Aug 21 13:52:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vgavar.h,v 1.30 2013/01/21 19:49:15 mlelstv Exp $ */
+/* $NetBSD: vgavar.h,v 1.31 2014/08/21 13:52:22 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -55,10 +55,11 @@ 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;
