Deleted Added
full compact
i81342_pci.c (172394) i81342_pci.c (179745)
1/*-
2 * Copyright (c) 2006 Olivier Houchard
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
21 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
22 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
23 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
24 * POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2006 Olivier Houchard
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
21 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
22 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
23 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
24 * POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/arm/xscale/i8134x/i81342_pci.c 172394 2007-09-30 11:05:18Z marius $");
28__FBSDID("$FreeBSD: head/sys/arm/xscale/i8134x/i81342_pci.c 179745 2008-06-12 01:46:06Z kevlo $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33#include <sys/kernel.h>
34#include <sys/module.h>
35#include <sys/types.h>
36#include <sys/rman.h>

--- 143 unchanged lines hidden (view full) ---

180 sc->sc_io_rman.rm_type = RMAN_ARRAY;
181 sc->sc_io_rman.rm_descr = "I81342 PCI I/O Ports";
182 if (rman_init(&sc->sc_io_rman) != 0 ||
183 rman_manage_region(&sc->sc_io_rman,
184 sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR :
185 IOP34X_PCIE_OIOBAR_VADDR,
186 (sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR :
187 IOP34X_PCIE_OIOBAR_VADDR) + IOP34X_OIOBAR_SIZE) != 0) {
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33#include <sys/kernel.h>
34#include <sys/module.h>
35#include <sys/types.h>
36#include <sys/rman.h>

--- 143 unchanged lines hidden (view full) ---

180 sc->sc_io_rman.rm_type = RMAN_ARRAY;
181 sc->sc_io_rman.rm_descr = "I81342 PCI I/O Ports";
182 if (rman_init(&sc->sc_io_rman) != 0 ||
183 rman_manage_region(&sc->sc_io_rman,
184 sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR :
185 IOP34X_PCIE_OIOBAR_VADDR,
186 (sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR :
187 IOP34X_PCIE_OIOBAR_VADDR) + IOP34X_OIOBAR_SIZE) != 0) {
188 panic("i80321_pci_probe: failed to set up I/O rman");
188 panic("i81342_pci_probe: failed to set up I/O rman");
189 }
190 sc->sc_mem_rman.rm_type = RMAN_ARRAY;
191 sc->sc_mem_rman.rm_descr = "I81342 PCI Memory";
192 if (rman_init(&sc->sc_mem_rman) != 0 ||
193 rman_manage_region(&sc->sc_mem_rman,
194 0, 0xffffffff) != 0) {
195 panic("i81342_pci_attach: failed to set up memory rman");
196 }

--- 350 unchanged lines hidden ---
189 }
190 sc->sc_mem_rman.rm_type = RMAN_ARRAY;
191 sc->sc_mem_rman.rm_descr = "I81342 PCI Memory";
192 if (rman_init(&sc->sc_mem_rman) != 0 ||
193 rman_manage_region(&sc->sc_mem_rman,
194 0, 0xffffffff) != 0) {
195 panic("i81342_pci_attach: failed to set up memory rman");
196 }

--- 350 unchanged lines hidden ---