summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorgene <gene@cvs.openbsd.org>1998-04-27 02:04:36 +0000
committergene <gene@cvs.openbsd.org>1998-04-27 02:04:36 +0000
commit5ecbdb4ab5d8453a2a3599c15c7fdebee9cb4159 (patch)
tree1c59128b276787542e8839c7f15048507b2a7020 /sys
parent8754c92e3dae4b5f687f408c908b66ac254d4aa2 (diff)
Adapt to new bus_space functions after fixing namespace issues.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mac68k/dev/asc.c4
-rw-r--r--sys/arch/mac68k/dev/grf_iv.c4
-rw-r--r--sys/arch/mac68k/dev/if_sn_obio.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c
index 349165904dc..e28c325f1d7 100644
--- a/sys/arch/mac68k/dev/asc.c
+++ b/sys/arch/mac68k/dev/asc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asc.c,v 1.6 1997/03/08 16:16:48 briggs Exp $ */
+/* $OpenBSD: asc.c,v 1.7 1998/04/27 02:04:32 gene Exp $ */
/* $NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $ */
/*
@@ -123,7 +123,7 @@ ascmatch(parent, vcf, aux)
if (bus_space_map(oa->oa_tag, addr, MAC68K_ASC_LEN, 0, &bsh))
return (0);
- if (bus_probe(oa->oa_tag, bsh, 0, 1))
+ if (mac68k_bus_space_probe(oa->oa_tag, bsh, 0, 1))
rval = 1;
else
rval = 0;
diff --git a/sys/arch/mac68k/dev/grf_iv.c b/sys/arch/mac68k/dev/grf_iv.c
index 8082cf0113c..1ae35952f6b 100644
--- a/sys/arch/mac68k/dev/grf_iv.c
+++ b/sys/arch/mac68k/dev/grf_iv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_iv.c,v 1.15 1997/04/21 00:58:14 briggs Exp $ */
+/* $OpenBSD: grf_iv.c,v 1.16 1998/04/27 02:04:34 gene Exp $ */
/* $NetBSD: grf_iv.c,v 1.17 1997/02/20 00:23:27 scottr Exp $ */
/*
@@ -102,7 +102,7 @@ grfiv_match(parent, vcf, aux)
panic("failed to map space for DAFB regs.\n");
}
- if (bus_probe(oa->oa_tag, bsh, 0x1C, 4) == 0) {
+ if (mac68k_bus_space_probe(oa->oa_tag, bsh, 0x1C, 4) == 0) {
bus_space_unmap(oa->oa_tag, bsh, 0x1000);
found = 0;
goto nodafb;
diff --git a/sys/arch/mac68k/dev/if_sn_obio.c b/sys/arch/mac68k/dev/if_sn_obio.c
index 14da748eda5..7b012bfa5fa 100644
--- a/sys/arch/mac68k/dev/if_sn_obio.c
+++ b/sys/arch/mac68k/dev/if_sn_obio.c
@@ -157,7 +157,7 @@ sn_obio_getaddr(sc, lladdr)
return (-1);
}
- if (!bus_probe(sc->sc_regt, bsh, 0, 1)) {
+ if (!mac68k_bus_space_probe(sc->sc_regt, bsh, 0, 1)) {
bus_space_unmap(sc->sc_regt, bsh, NBPG);
return (-1);
}