Module Name: src
Committed By: martin
Date: Wed Jan 14 18:27:05 UTC 2015
Modified Files:
src/sys/dev/ic [netbsd-7]: vga.c vga_raster.c vgavar.h
Log Message:
Pull up following revision(s) (requested by chs in ticket #418):
sys/dev/ic/vga.c: revision 1.113
sys/dev/ic/vga.c: revision 1.114
sys/dev/ic/vga_raster.c: revision 1.42
sys/dev/ic/vga_raster.c: revision 1.43
sys/dev/ic/vgavar.h: revision 1.31
sys/dev/ic/vgavar.h: revision 1.33
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.
remove BIOS-mapping code that was #if-0'd in the previous commit.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.112.2.1 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/dev/ic/vga_raster.c
cvs rdiff -u -r1.30.12.1 -r1.30.12.2 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.112.2.1
--- src/sys/dev/ic/vga.c:1.112 Sat Jul 12 05:30:33 2014
+++ src/sys/dev/ic/vga.c Wed Jan 14 18:27:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.112 2014/07/12 05:30:33 mlelstv Exp $ */
+/* $NetBSD: vga.c,v 1.112.2.1 2015/01/14 18:27:05 martin 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.112.2.1 2015/01/14 18:27:05 martin Exp $");
#include "opt_vga.h"
/* for WSCONS_SUPPORT_PCVTFONTS */
@@ -555,13 +555,6 @@ vga_init(struct vga_config *vc, bus_spac
(vh->vh_mono ? 0x10000 : 0x18000), 0x8000, &vh->vh_memh))
panic("vga_init: mem subrange failed");
- /* 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;
-
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.41.2.1
--- src/sys/dev/ic/vga_raster.c:1.41 Sat Jul 12 05:30:33 2014
+++ src/sys/dev/ic/vga_raster.c Wed Jan 14 18:27:05 2015
@@ -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.41.2.1 2015/01/14 18:27:05 martin 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.41.2.1 2015/01/14 18:27:05 martin Exp $");
#include "opt_vga.h"
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -402,13 +402,6 @@ vga_raster_init(struct vga_config *vc, b
&vh->vh_memh))
panic("vga_raster_init: mem subrange failed");
- /* 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;
-
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.12.1 src/sys/dev/ic/vgavar.h:1.30.12.2
--- src/sys/dev/ic/vgavar.h:1.30.12.1 Sun Jan 11 05:59:16 2015
+++ src/sys/dev/ic/vgavar.h Wed Jan 14 18:27:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vgavar.h,v 1.30.12.1 2015/01/11 05:59:16 snj Exp $ */
+/* $NetBSD: vgavar.h,v 1.30.12.2 2015/01/14 18:27:05 martin Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -57,10 +57,6 @@ struct vga_config {
struct vgascreen *active; /* current display */
const struct wsscreen_descr *currenttype;
- int vc_biosmapped;
- bus_space_tag_t vc_biostag;
- bus_space_handle_t vc_bioshdl;
-
struct vgascreen *wantedscreen;
void (*switchcb)(void *, int, int);
void *switchcbarg;
