diff options
Diffstat (limited to 'sys/arch/macppc/pci')
| -rw-r--r-- | sys/arch/macppc/pci/mpcpcibus.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/pci/pci_addr_fixup.c | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c index 4677bb82b5c..d7e3d994f17 100644 --- a/sys/arch/macppc/pci/mpcpcibus.c +++ b/sys/arch/macppc/pci/mpcpcibus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpcpcibus.c,v 1.14 2002/09/15 09:01:59 deraadt Exp $ */ +/* $OpenBSD: mpcpcibus.c,v 1.15 2002/10/07 05:39:48 drahn Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -367,8 +367,10 @@ mpcpcibrattach(parent, self, aux) sc->sc_membus_space.bus_base = 0; sc->sc_membus_space.bus_reverse = 1; + sc->sc_membus_space.bus_io = 0; sc->sc_iobus_space.bus_base = 0; sc->sc_iobus_space.bus_reverse = 1; + sc->sc_iobus_space.bus_io = 1; /* find io(config) base, flag == 0x01000000 */ found = 0; diff --git a/sys/arch/macppc/pci/pci_addr_fixup.c b/sys/arch/macppc/pci/pci_addr_fixup.c index 7604bcedde5..9ac4a74fe3d 100644 --- a/sys/arch/macppc/pci/pci_addr_fixup.c +++ b/sys/arch/macppc/pci/pci_addr_fixup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_addr_fixup.c,v 1.4 2002/09/23 04:24:58 drahn Exp $ */ +/* $OpenBSD: pci_addr_fixup.c,v 1.5 2002/10/07 05:39:48 drahn Exp $ */ /* $NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $ */ /*- @@ -99,12 +99,7 @@ pci_addr_fixup(sc, pc, maxbus) M_DEVBUF, 0, 0, EX_NOWAIT); KASSERT(sc->extent_mem); sc->extent_port = extent_create("PCI I/O port space", -#if 1 - sc->sc_iobus_space.bus_base, - sc->sc_iobus_space.bus_base + sc->sc_iobus_space.bus_size, -#else PCIADDR_PORT_START, PCIADDR_PORT_END, -#endif M_DEVBUF, 0, 0, EX_NOWAIT); KASSERT(sc->extent_port); @@ -228,9 +223,7 @@ pciaddr_resource_manage(sc, pc, tag, func) ex = sc->extent_mem; } else { /* XXX some devices give 32bit value */ - addr = (PCI_MAPREG_IO_ADDR(val) & PCIADDR_PORT_END) | - sc->sc_iobus_space.bus_base, - + addr = PCI_MAPREG_IO_ADDR(val) & PCIADDR_PORT_END; size = PCI_MAPREG_IO_SIZE(mask); ex = sc->extent_port; } |