diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-07-14 20:27:38 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-07-14 20:27:38 +0000 |
| commit | d1092316eb307ee35f180ddb8b03d3eb1e2be5af (patch) | |
| tree | e07a71e1fe8f175f4e0b4549ff12971924e8ba2a /sys/arch/sparc/dev | |
| parent | 25b6d4816538fab7a162fadc84b1161a3ac95b2b (diff) | |
on a SparcStation Voyager, the 2nd zs device does not exist.
Diffstat (limited to 'sys/arch/sparc/dev')
| -rw-r--r-- | sys/arch/sparc/dev/zs.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c index 716897bc326..697fdf45305 100644 --- a/sys/arch/sparc/dev/zs.c +++ b/sys/arch/sparc/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.25 2000/07/11 15:00:12 deraadt Exp $ */ +/* $OpenBSD: zs.c,v 1.26 2000/07/14 20:27:37 deraadt Exp $ */ /* $NetBSD: zs.c,v 1.49 1997/08/31 21:26:37 pk Exp $ */ /* @@ -252,8 +252,12 @@ zsmatch(parent, vcf, aux) if (strcmp(cf->cf_driver->cd_name, ra->ra_name)) return (0); if ((ca->ca_bustype == BUS_MAIN && !CPU_ISSUN4) || - (ca->ca_bustype == BUS_OBIO && CPU_ISSUN4M)) - return (getpropint(ra->ra_node, "slave", -2) == cf->cf_unit); + (ca->ca_bustype == BUS_OBIO && CPU_ISSUN4M)) { + if (getpropint(ra->ra_node, "slave", -2) == cf->cf_unit && + findzs(cf->cf_unit)) + return (1); + return (0); + } ra->ra_len = NBPG; return (probeget(ra->ra_vaddr, 1) != -1); } |