From 705f77b3651f661d8a1f30a838cd08a2bd35d430 Mon Sep 17 00:00:00 2001 From: "Dale S. Rahn" Date: Sat, 22 Jan 2000 03:51:57 +0000 Subject: 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. --- sys/arch/powerpc/powerpc/machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/arch') 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)))) { -- cgit v1.2.3