diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2008-12-15 15:31:10 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2008-12-15 15:31:10 +0000 |
| commit | f0e837432d62958c713c7e6ebbb2adc52c8fd696 (patch) | |
| tree | ca68e24ea5167314369eefd8755cc6038f9ec07e /sys/sparc64/ebus | |
| parent | 907438a3fe46be01afa5020f515481b240da1a08 (diff) | |
| download | FreeBSD-src-f0e837432d62958c713c7e6ebbb2adc52c8fd696.zip FreeBSD-src-f0e837432d62958c713c7e6ebbb2adc52c8fd696.tar.gz | |
Adapt parts of the sparc64 Open Firmware bus enumeration code (in particular,
the code for parsing interrupt maps) to PowerPC and reflect their new MI
status by moving them to the shared dev/ofw directory.
This commit also modifies the OFW PCI enumeration procedure on PowerPC to
allow the bus to find non-firmware-enumerated devices that Apple likes to add,
and adds some useful Open Firmware properties (compat and name) to the pnpinfo
string of children on OFW SBus, EBus, PCI, and MacIO links. Because of the
change to PCI enumeration on PowerPC, X has started working again on PPC
machines with Grackle hostbridges.
Reviewed by: marius
Obtained from: sparc64
Diffstat (limited to 'sys/sparc64/ebus')
| -rw-r--r-- | sys/sparc64/ebus/ebus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c index bcc92a2..9baa7a8 100644 --- a/sys/sparc64/ebus/ebus.c +++ b/sys/sparc64/ebus/ebus.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/openfirm.h> -#include <machine/ofw_bus.h> #include <machine/resource.h> #include <dev/pci/pcireg.h> @@ -118,6 +117,7 @@ static device_method_t ebus_methods[] = { DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_release_resource, ebus_release_resource), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), + DEVMETHOD(bus_child_pnpinfo_str, ofw_bus_gen_child_pnpinfo_str), /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_devinfo, ebus_get_devinfo), |
