diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2008-07-25 21:11:16 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2008-07-25 21:11:16 +0000 |
| commit | 18e3f6d8614d82a9fa490919bfe47dc48a923144 (patch) | |
| tree | 11a936c03982608c697c3247246fc72fcef85fd1 /sys/arch/alpha/eisa/eisa_machdep.h | |
| parent | cfae2dcc921f030c2ddf09b415864f2ce46ad633 (diff) | |
Improve eisa bus probe by deciding the number of logical eisa slots from
the motherboard eisa id, instead of using a ``one size fits all'' value which
is too large on more than half the eisa-capable alpha designs.
The id -> slot # logic is based on the alpha ECU configuration files, so we
should not perform worse than ECU itself (and see all slots ECU sees too).
Diffstat (limited to 'sys/arch/alpha/eisa/eisa_machdep.h')
| -rw-r--r-- | sys/arch/alpha/eisa/eisa_machdep.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/alpha/eisa/eisa_machdep.h b/sys/arch/alpha/eisa/eisa_machdep.h index 7b904063e5d..bdbc10b7012 100644 --- a/sys/arch/alpha/eisa/eisa_machdep.h +++ b/sys/arch/alpha/eisa/eisa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa_machdep.h,v 1.6 2008/07/19 18:13:06 miod Exp $ */ +/* $OpenBSD: eisa_machdep.h,v 1.7 2008/07/25 21:11:14 miod Exp $ */ /* $NetBSD: eisa_machdep.h,v 1.1 1996/04/12 05:39:51 cgd Exp $ */ /* @@ -36,10 +36,10 @@ typedef int eisa_intr_handle_t; struct alpha_eisa_chipset { void *ec_v; + int ec_maxslots; void (*ec_attach_hook)(struct device *, struct device *, struct eisabus_attach_args *); - int (*ec_maxslots)(void *); int (*ec_intr_map)(void *, u_int, eisa_intr_handle_t *); const char *(*ec_intr_string)(void *, eisa_intr_handle_t); @@ -54,7 +54,7 @@ struct alpha_eisa_chipset { #define eisa_attach_hook(p, s, a) \ (*(a)->eba_ec->ec_attach_hook)((p), (s), (a)) #define eisa_maxslots(c) \ - (*(c)->ec_maxslots)((c)->ec_v) + ((c)->ec_maxslots) #define eisa_intr_map(c, i, hp) \ (*(c)->ec_intr_map)((c)->ec_v, (i), (hp)) #define eisa_intr_string(c, h) \ |