Module Name: src
Committed By: dyoung
Date: Mon Mar 22 22:30:58 UTC 2010
Modified Files:
src/sys/dev/isa: isadma.c pcdisplay.c
Log Message:
isadma.c: #if 0 some diagnostic code that compares two bus_space_tag_t's.
pcdisplay.c: #if 0 some code that compares two bus_space_tag_t's
in order to see if pcdisplay0 is console. It does not seem to
be helpful to compare the tags; maybe the author intended to
compare some other bus property?
MI code should not compare an opaque type such as bus_space_tag_t!
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/isa/isadma.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/isa/pcdisplay.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/isa/isadma.c
diff -u src/sys/dev/isa/isadma.c:1.62 src/sys/dev/isa/isadma.c:1.63
--- src/sys/dev/isa/isadma.c:1.62 Tue Aug 18 16:52:42 2009
+++ src/sys/dev/isa/isadma.c Mon Mar 22 22:30:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma.c,v 1.62 2009/08/18 16:52:42 dyoung Exp $ */
+/* $NetBSD: isadma.c,v 1.63 2010/03/22 22:30:58 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.62 2009/08/18 16:52:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.63 2010/03/22 22:30:58 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,8 +155,10 @@
* configuration mechanisms, the space and dma tags
* must be the same!
*/
+#if 0 /* XXX Comparing bus_space_tag_t is a no-no! */
if (ids->ids_bst != bst || ids->ids_dmat != dmat)
panic("_isa_dmainit: inconsistent ISA tags");
+#endif
} else {
ids->ids_bst = bst;
ids->ids_dmat = dmat;
Index: src/sys/dev/isa/pcdisplay.c
diff -u src/sys/dev/isa/pcdisplay.c:1.38 src/sys/dev/isa/pcdisplay.c:1.39
--- src/sys/dev/isa/pcdisplay.c:1.38 Tue May 12 09:10:15 2009
+++ src/sys/dev/isa/pcdisplay.c Mon Mar 22 22:30:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay.c,v 1.38 2009/05/12 09:10:15 cegger Exp $ */
+/* $NetBSD: pcdisplay.c,v 1.39 2010/03/22 22:30:58 dyoung Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.38 2009/05/12 09:10:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.39 2010/03/22 22:30:58 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -360,8 +360,11 @@
pcdisplay_is_console(bus_space_tag_t iot)
{
if (pcdisplayconsole &&
- !pcdisplay_console_attached &&
- iot == pcdisplay_console_dc.dc_ph.ph_iot)
+ !pcdisplay_console_attached
+#if 0 /* XXX Comparing bus_space_tag_t is a no-no! */
+ && iot == pcdisplay_console_dc.dc_ph.ph_iot
+#endif
+ )
return (1);
return (0);
}
