Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove BIOS-mapping code that was #if-0'd in the previous commit.

This commit is contained in:
chs 2015-01-14 17:45:27 +00:00
parent 3d12c324ea
commit b4b3a81a2a
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/ic/vga.c
View File

@ -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;

12
sys/dev/ic/vga_raster.c
View File

@ -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;

7
sys/dev/ic/vgavar.h
View File

@ -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;