Deleted Added
full compact
ofw_pcib.c (154079) ofw_pcib.c (163260)
1/*-
2 * Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
3 * Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
4 * Copyright (c) 2000 BSDi
5 * Copyright (c) 2001 - 2003 Thomas Moestl <tmm@FreeBSD.org>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 *
31 * from: FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.3 2000/12/13
32 */
33
34#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
3 * Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
4 * Copyright (c) 2000 BSDi
5 * Copyright (c) 2001 - 2003 Thomas Moestl <tmm@FreeBSD.org>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 *
31 * from: FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.3 2000/12/13
32 */
33
34#include <sys/cdefs.h>
35__FBSDID("$FreeBSD: head/sys/sparc64/pci/ofw_pcib.c 154079 2006-01-06 19:22:19Z jhb $");
35__FBSDID("$FreeBSD: head/sys/sparc64/pci/ofw_pcib.c 163260 2006-10-12 04:44:01Z kmacy $");
36
37#include "opt_ofw_pci.h"
36
37#include "opt_ofw_pci.h"
38#include "opt_global.h"
38
39#include <sys/param.h>
40#include <sys/kernel.h>
41#include <sys/bus.h>
42#include <sys/module.h>
43
44#include <dev/ofw/ofw_bus.h>
45#include <dev/ofw/openfirm.h>

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

114static int
115ofw_pcib_attach(device_t dev)
116{
117 struct ofw_pcib_gen_softc *sc;
118
119 sc = device_get_softc(dev);
120 ofw_pcib_gen_setup(dev);
121 pcib_attach_common(dev);
39
40#include <sys/param.h>
41#include <sys/kernel.h>
42#include <sys/bus.h>
43#include <sys/module.h>
44
45#include <dev/ofw/ofw_bus.h>
46#include <dev/ofw/openfirm.h>

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

115static int
116ofw_pcib_attach(device_t dev)
117{
118 struct ofw_pcib_gen_softc *sc;
119
120 sc = device_get_softc(dev);
121 ofw_pcib_gen_setup(dev);
122 pcib_attach_common(dev);
123#ifdef SUN4V
124 device_add_child(dev, "pci", -1);
125#else
122 device_add_child(dev, "pci", sc->ops_pcib_sc.secbus);
126 device_add_child(dev, "pci", sc->ops_pcib_sc.secbus);
127#endif
128
123 return (bus_generic_attach(dev));
124}
129 return (bus_generic_attach(dev));
130}