[src/trunk]: src/sys/dev/ic pckbc.c, vga.c: It doesn't appear to be helpful t...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/037cec385ea2
branches:  trunk
changeset: 753330:037cec385ea2
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Mon Mar 22 23:08:34 2010 +0000

description:
pckbc.c, vga.c: It doesn't appear to be helpful to compare two
    bus_space_tag_t's in pckbc_is_console() and vga_is_console(), and MI
    code should never do such a thing, so don't do it.

tcic2.c: #if 0 some diagnostic code that compares two bus_space_tag_t's.

diffstat:

 sys/dev/ic/pckbc.c |  6 ++++--
 sys/dev/ic/tcic2.c |  8 ++++++--
 sys/dev/ic/vga.c   |  6 ++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (96 lines):

diff -r 6fb16b6cbe0a -r 037cec385ea2 sys/dev/ic/pckbc.c
--- a/sys/dev/ic/pckbc.c        Mon Mar 22 23:03:30 2010 +0000
+++ b/sys/dev/ic/pckbc.c        Mon Mar 22 23:08:34 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc.c,v 1.48 2010/02/24 22:37:58 dyoung Exp $ */
+/* $NetBSD: pckbc.c,v 1.49 2010/03/22 23:08:34 dyoung Exp $ */
 
 /*
  * Copyright (c) 2004 Ben Harris.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.48 2010/02/24 22:37:58 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.49 2010/03/22 23:08:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -238,7 +238,9 @@
 pckbc_is_console(bus_space_tag_t iot, bus_addr_t addr)
 {
        if (pckbc_console && !pckbc_console_attached &&
+#if 0  /* XXX Comparing bus_space_tag_t is a no-no! */
            pckbc_consdata.t_iot == iot &&
+#endif
            pckbc_consdata.t_addr == addr)
                return (1);
        return (0);
diff -r 6fb16b6cbe0a -r 037cec385ea2 sys/dev/ic/tcic2.c
--- a/sys/dev/ic/tcic2.c        Mon Mar 22 23:03:30 2010 +0000
+++ b/sys/dev/ic/tcic2.c        Mon Mar 22 23:08:34 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcic2.c,v 1.33 2009/03/14 21:04:20 dsl Exp $   */
+/*     $NetBSD: tcic2.c,v 1.34 2010/03/22 23:08:34 dyoung Exp $        */
 
 /*
  * Copyright (c) 1998, 1999 Christoph Badura.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.33 2009/03/14 21:04:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.34 2010/03/22 23:08:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -883,8 +883,10 @@
 
        /* XXX this is pretty gross */
 
+#if 0  /* XXX Comparing bus_space_tag_t is a no-no! */
        if (h->sc->memt != pcmhp->memt)
                panic("tcic_chip_mem_map memt is bogus");
+#endif
 
        busaddr = pcmhp->addr;
 
@@ -1102,8 +1104,10 @@
 
        /* XXX this is pretty gross */
 
+#if 0  /* XXX Comparing bus_space_tag_t is a no-no! */
        if (h->sc->iot != pcihp->iot)
                panic("tcic_chip_io_map iot is bogus");
+#endif
 
        DPRINTF(("tcic_chip_io_map window %d %s port %lx+%lx\n",
                 win, width_names[width], (u_long) ioaddr, (u_long) size));
diff -r 6fb16b6cbe0a -r 037cec385ea2 sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c  Mon Mar 22 23:03:30 2010 +0000
+++ b/sys/dev/ic/vga.c  Mon Mar 22 23:08:34 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.102 2010/02/25 11:20:10 drochner Exp $ */
+/* $NetBSD: vga.c,v 1.103 2010/03/22 23:08:34 dyoung Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.102 2010/02/25 11:20:10 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.103 2010/03/22 23:08:34 dyoung Exp $");
 
 /* for WSCONS_SUPPORT_PCVTFONTS */
 #include "opt_wsdisplay_compat.h"
@@ -736,7 +736,9 @@
 {
        if (vgaconsole &&
            !vga_console_attached &&
+#if 0  /* XXX Comparing bus_space_tag_t is a no-no! */
            iot == vga_console_vc.hdl.vh_iot &&
+#endif
            (vga_console_type == -1 || (type == vga_console_type)))
                return (1);
        return (0);