summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2008-03-08 16:33:42 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2008-03-08 16:33:42 +0000
commite5e8755ac2589d53ecbb9e21aae919a35cb5dbba (patch)
treeb0437483a1a84d6135213cbb820081194c2660f3
parentf1576fd441a0b29d4fee63e459cfe2df1053e1a4 (diff)
Check "status" property. Since the PROM marks the floppy controller device
as "disabled" if no floppy drive is connected, this will get rid of the "unconfigured" message for the floppy controller on machines that don't have a floppy drive.
-rw-r--r--sys/arch/sparc64/dev/ebus.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/arch/sparc64/dev/ebus.c b/sys/arch/sparc64/dev/ebus.c
index 00b4af78a0d..b479de0b6c7 100644
--- a/sys/arch/sparc64/dev/ebus.c
+++ b/sys/arch/sparc64/dev/ebus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ebus.c,v 1.20 2008/02/17 22:01:27 kettenis Exp $ */
+/* $OpenBSD: ebus.c,v 1.21 2008/03/08 16:33:41 kettenis Exp $ */
/* $NetBSD: ebus.c,v 1.24 2001/07/25 03:49:54 eeh Exp $ */
/*
@@ -201,6 +201,9 @@ ebus_attach(struct device *parent, struct device *self, void *aux)
*/
DPRINTF(EDB_CHILD, ("ebus node %08x, searching children...\n", node));
for (node = firstchild(node); node; node = nextsibling(node)) {
+ if (!checkstatus(node))
+ continue;
+
if (ebus_setup_attach_args(sc, node, &eba) != 0) {
DPRINTF(EDB_CHILD,
("ebus_attach: %s: incomplete\n",