diff options
| author | Dale S. Rahn <rahnds@cvs.openbsd.org> | 2000-01-22 03:51:57 +0000 |
|---|---|---|
| committer | Dale S. Rahn <rahnds@cvs.openbsd.org> | 2000-01-22 03:51:57 +0000 |
| commit | 705f77b3651f661d8a1f30a838cd08a2bd35d430 (patch) | |
| tree | 42c9c9dc7587174fbfd6f03ac9a366822d5ff184 /sys/arch/powerpc | |
| parent | 8914feb9090d8c25fd3dc7656731c22d456ced27 (diff) | |
Allow the address specified in the bus_space_map to either be
the absolute address requested, or the offset address, this is
done by oring the requested address with the bus base address.
Devices on the mac-io bus are bus base relative, but the pci devices
are absolute addresses.
Diffstat (limited to 'sys/arch/powerpc')
| -rw-r--r-- | sys/arch/powerpc/powerpc/machdep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c index 3cb8cd1e7e2..482c40c6265 100644 --- a/sys/arch/powerpc/powerpc/machdep.c +++ b/sys/arch/powerpc/powerpc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.31 2000/01/14 05:42:17 rahnds Exp $ */ +/* $OpenBSD: machdep.c,v 1.32 2000/01/22 03:51:56 rahnds Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -1059,7 +1059,7 @@ bus_space_map(t, bpa, size, cacheable, bshp) /* if bus has base of 0 fail. */ return 1; } - bpa += POWERPC_BUS_TAG_BASE(t); + bpa |= POWERPC_BUS_TAG_BASE(t); if ((error = extent_alloc_region(devio_ex, bpa, size, EX_NOWAIT | (ppc_malloc_ok ? EX_MALLOCOK : 0)))) { |