summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorpk <pk@NetBSD.org>1998-09-15 20:26:25 +0000
committerpk <pk@NetBSD.org>1998-09-15 20:26:25 +0000
commitcf10308f5f07a134375aa2db1155ca64c7b97c2c (patch)
treea597e6aa624ac304d3ae982b0b2df4a4c6d68072 /sys/dev
parent543070847ceaf290f8e0de7bc5237215cecab4b2 (diff)
bootpath check needs to keep checking for two formats.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sbus/esp_sbus.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
index 7dde263de47..5ed82c8000b 100644
--- a/sys/dev/sbus/esp_sbus.c
+++ b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_sbus.c,v 1.2 1998/08/29 21:43:00 pk Exp $ */
+/* $NetBSD: esp_sbus.c,v 1.3 1998/09/15 20:26:25 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,8 +75,15 @@ struct esp_softc {
int sc_pri; /* SBUS priority */
};
+/*
+ * Is this esp on the bootpath?
+ * We may get two forms of the bootpath:
+ * (1) ../sbus@.../esp@<offset>,<slot>/sd@.. (PROM v3 style)
+ * (2) /sbus0/esp0/sd@.. (PROM v2 style)
+ */
#define SAME_ESP(sc, bp, sa) \
- (bp->val[0] == sa->sa_slot && bp->val[1] == sa->sa_offset)
+ ((bp->val[0] == sa->sa_slot && bp->val[1] == sa->sa_offset) || \
+ (bp->val[0] == -1 && bp->val[1] == sc->sc_dev.dv_unit))
void espattach_sbus __P((struct device *, struct device *, void *));
void espattach_dma __P((struct device *, struct device *, void *));