Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic remove BIOS-mapping code that was #if-0'd in the ...



details:   https://anonhg.NetBSD.org/src/rev/a3b4a4d2348d
branches:  trunk
changeset: 335561:a3b4a4d2348d
user:      chs <chs%NetBSD.org@localhost>
date:      Wed Jan 14 17:45:27 2015 +0000

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

diffstat:

 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(-)

diffs (87 lines):

diff -r d451e606a5d8 -r a3b4a4d2348d sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Wed Jan 14 15:28:18 2015 +0000
+++ b/sys/dev/ic/vga.c  Wed Jan 14 17:45:27 2015 +0000
@@ -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 @@
            (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 -r d451e606a5d8 -r a3b4a4d2348d sys/dev/ic/vga_raster.c
--- a/sys/dev/ic/vga_raster.c   Wed Jan 14 15:28:18 2015 +0000
+++ b/sys/dev/ic/vga_raster.c   Wed Jan 14 17:45:27 2015 +0000
@@ -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 @@
            &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 -r d451e606a5d8 -r a3b4a4d2348d sys/dev/ic/vgavar.h
--- a/sys/dev/ic/vgavar.h       Wed Jan 14 15:28:18 2015 +0000
+++ b/sys/dev/ic/vgavar.h       Wed Jan 14 17:45:27 2015 +0000
@@ -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 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;



Home | Main Index | Thread Index | Old Index