diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-10-06 17:44:36 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-10-06 17:44:36 +0000 |
commit | 75bac1f2fc8a4186dcc37f2066b2a455fa049769 (patch) | |
tree | 23ffd498f9d17a9e3f44a39e5093c85a63da6adc /sys/arch | |
parent | a1c7b0e5c2b8baf24424cbd1b9721ab3d0e36926 (diff) |
make it compile w/o pcibios; aaron@ ok
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/i386/i386/rbus_machdep.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/rbus_machdep.c b/sys/arch/i386/i386/rbus_machdep.c index 107455fa1be..2f5d2ab68f1 100644 --- a/sys/arch/i386/i386/rbus_machdep.c +++ b/sys/arch/i386/i386/rbus_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.c,v 1.2 2000/09/05 17:55:54 nate Exp $ */ +/* $OpenBSD: rbus_machdep.c,v 1.3 2000/10/06 17:44:35 mickey Exp $ */ /* $NetBSD: rbus_machdep.c,v 1.2 1999/10/15 06:43:06 haya Exp $ */ /* @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: rbus_machdep.c,v 1.2 2000/09/05 17:55:54 nate Exp $ */ +#include "pcibios.h" #include <sys/param.h> #include <sys/systm.h> @@ -143,6 +143,7 @@ rbus_pccbb_parent_mem(pa) bus_size_t size; struct extent *ex; +#if NPCIBIOS > 0 if (!(pcibios_flags & PCIBIOS_ADDR_FIXUP)) { struct extent_region *rp; ex = pciaddr.extent_mem; @@ -169,8 +170,9 @@ rbus_pccbb_parent_mem(pa) rp = rp->er_link.le_next; } - } - else { + } else +#endif + { extern struct extent *iomem_ex; ex = iomem_ex; start = ex->ex_start; @@ -212,6 +214,7 @@ rbus_pccbb_parent_io(pa) bus_addr_t start; bus_size_t size; +#if NPCIBIOS > 0 if (!(pcibios_flags & PCIBIOS_ADDR_FIXUP)) { struct extent_region *rp; ex = pciaddr.extent_port; @@ -235,8 +238,9 @@ rbus_pccbb_parent_io(pa) rp = rp->er_link.le_next; } - } - else { + } else +#endif + { extern struct extent *ioport_ex; ex = ioport_ex; start = RBUS_IO_START; |