Deleted Added
full compact
ofwbus.c (209852) ofwbus.c (212239)
1/*-
2 * Copyright 1998 Massachusetts Institute of Technology
3 *
4 * Permission to use, copy, modify, and distribute this software and
5 * its documentation for any purpose and without fee is hereby
6 * granted, provided that both the above copyright notice and this
7 * permission notice appear in all copies, that both the above
8 * copyright notice and this permission notice appear in all

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

47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
54 *
1/*-
2 * Copyright 1998 Massachusetts Institute of Technology
3 *
4 * Permission to use, copy, modify, and distribute this software and
5 * its documentation for any purpose and without fee is hereby
6 * granted, provided that both the above copyright notice and this
7 * permission notice appear in all copies, that both the above
8 * copyright notice and this permission notice appear in all

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

47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
54 *
55 * $FreeBSD: head/sys/powerpc/aim/nexus.c 209852 2010-07-09 14:02:57Z nwhitehorn $
55 * $FreeBSD: head/sys/powerpc/aim/nexus.c 212239 2010-09-05 19:57:24Z mav $
56 */
57
58#include <sys/param.h>
59#include <sys/systm.h>
60#include <sys/module.h>
61#include <sys/bus.h>
62#include <sys/cons.h>
63#include <sys/kernel.h>
64#include <sys/malloc.h>
65
56 */
57
58#include <sys/param.h>
59#include <sys/systm.h>
60#include <sys/module.h>
61#include <sys/bus.h>
62#include <sys/cons.h>
63#include <sys/kernel.h>
64#include <sys/malloc.h>
65
66#include <dev/ofw/ofw_bus_subr.h>
66#include <dev/ofw/openfirm.h>
67
68#include <machine/bus.h>
69#include <machine/frame.h>
70#include <machine/intr_machdep.h>
71#include <machine/resource.h>
72
73#include <sys/rman.h>

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

157 DEVMETHOD(device_detach, bus_generic_detach),
158 DEVMETHOD(device_shutdown, bus_generic_shutdown),
159 DEVMETHOD(device_suspend, bus_generic_suspend),
160 DEVMETHOD(device_resume, bus_generic_resume),
161
162 /* Bus interface. Resource management is business of the children... */
163 DEVMETHOD(bus_add_child, nexus_add_child),
164 DEVMETHOD(bus_print_child, bus_generic_print_child),
67#include <dev/ofw/openfirm.h>
68
69#include <machine/bus.h>
70#include <machine/frame.h>
71#include <machine/intr_machdep.h>
72#include <machine/resource.h>
73
74#include <sys/rman.h>

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

158 DEVMETHOD(device_detach, bus_generic_detach),
159 DEVMETHOD(device_shutdown, bus_generic_shutdown),
160 DEVMETHOD(device_suspend, bus_generic_suspend),
161 DEVMETHOD(device_resume, bus_generic_resume),
162
163 /* Bus interface. Resource management is business of the children... */
164 DEVMETHOD(bus_add_child, nexus_add_child),
165 DEVMETHOD(bus_print_child, bus_generic_print_child),
166 DEVMETHOD(bus_child_pnpinfo_str, ofw_bus_gen_child_pnpinfo_str),
165 DEVMETHOD(bus_probe_nomatch, nexus_probe_nomatch),
166 DEVMETHOD(bus_read_ivar, nexus_read_ivar),
167 DEVMETHOD(bus_write_ivar, nexus_write_ivar),
168 DEVMETHOD(bus_setup_intr, nexus_setup_intr),
169 DEVMETHOD(bus_teardown_intr, nexus_teardown_intr),
170#ifdef SMP
171 DEVMETHOD(bus_bind_intr, nexus_bind_intr),
172#endif

--- 355 unchanged lines hidden ---
167 DEVMETHOD(bus_probe_nomatch, nexus_probe_nomatch),
168 DEVMETHOD(bus_read_ivar, nexus_read_ivar),
169 DEVMETHOD(bus_write_ivar, nexus_write_ivar),
170 DEVMETHOD(bus_setup_intr, nexus_setup_intr),
171 DEVMETHOD(bus_teardown_intr, nexus_teardown_intr),
172#ifdef SMP
173 DEVMETHOD(bus_bind_intr, nexus_bind_intr),
174#endif

--- 355 unchanged lines hidden ---