Module Name: src
Committed By: dyoung
Date: Mon Mar 22 23:08:34 UTC 2010
Modified Files:
src/sys/dev/ic: pckbc.c tcic2.c vga.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/ic/pckbc.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/tcic2.c
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/ic/vga.c
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/pckbc.c
diff -u src/sys/dev/ic/pckbc.c:1.48 src/sys/dev/ic/pckbc.c:1.49
--- src/sys/dev/ic/pckbc.c:1.48 Wed Feb 24 22:37:58 2010
+++ src/sys/dev/ic/pckbc.c Mon Mar 22 23:08:34 2010
@@ -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);
Index: src/sys/dev/ic/tcic2.c
diff -u src/sys/dev/ic/tcic2.c:1.33 src/sys/dev/ic/tcic2.c:1.34
--- src/sys/dev/ic/tcic2.c:1.33 Sat Mar 14 21:04:20 2009
+++ src/sys/dev/ic/tcic2.c Mon Mar 22 23:08:34 2010
@@ -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));
Index: src/sys/dev/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.102 src/sys/dev/ic/vga.c:1.103
--- src/sys/dev/ic/vga.c:1.102 Thu Feb 25 11:20:10 2010
+++ src/sys/dev/ic/vga.c Mon Mar 22 23:08:34 2010
@@ -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);
