aboutsummaryrefslogtreecommitdiff
path: root/sys/sparc64/fhc/fhc_central.c
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2004-08-12 17:41:33 +0000
committerMarius Strobl <marius@FreeBSD.org>2004-08-12 17:41:33 +0000
commit26280d88d76716790cf28f23fdb0bda56533e9b6 (patch)
treee750b2d26d6511903970a6a2a5d73da06845d58b /sys/sparc64/fhc/fhc_central.c
parent9f7f340a0f9eb8af47d81687feb963fa612242e9 (diff)
downloadsrc-26280d88d76716790cf28f23fdb0bda56533e9b6.tar.gz
src-26280d88d76716790cf28f23fdb0bda56533e9b6.zip
- Introduce an ofw_bus kobj-interface for retrieving the OFW node and a
subset ("compatible", "device_type", "model" and "name") of the standard properties in drivers for devices on Open Firmware supported busses. The standard properties "reg", "interrupts" und "address" are not covered by this interface because they are only of interest in the respective bridge code. There's a remaining standard property "status" which is unclear how to support properly but which also isn't used in FreeBSD at present. This ofw_bus kobj-interface allows to replace the various (ebus_get_node(), ofw_pci_get_node(), etc.) and partially inconsistent (central_get_type() vs. sbus_get_device_type(), etc.) existing IVAR ones with a common one. This in turn allows to simplify and remove code-duplication in drivers for devices that can hang off of more than one OFW supported bus. - Convert the sparc64 Central, EBus, FHC, PCI and SBus bus drivers and the drivers for their children to use the ofw_bus kobj-interface. The IVAR- interfaces of the Central, EBus and FHC are entirely replaced by this. The PCI bus driver used its own kobj-interface and now also uses the ofw_bus one. The IVARs special to the SBus, e.g. for retrieving the burst size, remain. Beware: this causes an ABI-breakage for modules of drivers which used the IVAR-interfaces, i.e. esp(4), hme(4), isp(4) and uart(4), which need to be recompiled. The style-inconsistencies introduced in some of the bus drivers will be fixed by tmm@ in a generic clean-up of the respective drivers later (he requested to add the changes in the "new" style). - Convert the powerpc MacIO bus driver and the drivers for its children to use the ofw_bus kobj-interface. This invloves removing the IVARs related to the "reg" property which were unused and a leftover from the NetBSD origini of the code. There's no ABI-breakage caused by this because none of these driver are currently built as modules. There are other powerpc bus drivers which can be converted to the ofw_bus kobj-interface, e.g. the PCI bus driver, which should be done together with converting powerpc to use the OFW PCI code from sparc64. - Make the SBus and FHC front-end of zs(4) and the sparc64 eeprom(4) take advantage of the ofw_bus kobj-interface and simplify them a bit. Reviewed by: grehan, tmm Approved by: re (scottl) Discussed with: tmm Tested with: Sun AX1105, AXe, Ultra 2, Ultra 60; PPC cross-build on i386
Notes
Notes: svn path=/head/; revision=133589
Diffstat (limited to 'sys/sparc64/fhc/fhc_central.c')
-rw-r--r--sys/sparc64/fhc/fhc_central.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/sparc64/fhc/fhc_central.c b/sys/sparc64/fhc/fhc_central.c
index ce35c0d75c87..50dc6696791b 100644
--- a/sys/sparc64/fhc/fhc_central.c
+++ b/sys/sparc64/fhc/fhc_central.c
@@ -33,6 +33,7 @@
#include <sys/malloc.h>
#include <sys/module.h>
+#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/openfirm.h>
#include <machine/bus.h>
@@ -40,7 +41,6 @@
#include <sys/rman.h>
-#include <sparc64/central/centralvar.h>
#include <sparc64/fhc/fhcreg.h>
#include <sparc64/fhc/fhcvar.h>
#include <sparc64/sbus/ofw_sbus.h>
@@ -56,8 +56,6 @@ static device_method_t fhc_central_methods[] = {
/* Bus interface. */
DEVMETHOD(bus_print_child, fhc_print_child),
DEVMETHOD(bus_probe_nomatch, fhc_probe_nomatch),
- DEVMETHOD(bus_read_ivar, fhc_read_ivar),
- DEVMETHOD(bus_write_ivar, fhc_write_ivar),
DEVMETHOD(bus_setup_intr, fhc_setup_intr),
DEVMETHOD(bus_teardown_intr, fhc_teardown_intr),
DEVMETHOD(bus_alloc_resource, fhc_alloc_resource),
@@ -65,6 +63,13 @@ static device_method_t fhc_central_methods[] = {
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+ /* ofw_bus interface */
+ DEVMETHOD(ofw_bus_get_compat, fhc_get_compat),
+ DEVMETHOD(ofw_bus_get_model, fhc_get_model),
+ DEVMETHOD(ofw_bus_get_name, fhc_get_name),
+ DEVMETHOD(ofw_bus_get_node, fhc_get_node),
+ DEVMETHOD(ofw_bus_get_type, fhc_get_type),
+
{ NULL, NULL }
};
@@ -82,7 +87,7 @@ static int
fhc_central_probe(device_t dev)
{
- if (strcmp(central_get_name(dev), "fhc") == 0) {
+ if (strcmp(ofw_bus_get_name(dev), "fhc") == 0) {
device_set_desc(dev, "fhc");
return (fhc_probe(dev));
}
@@ -103,7 +108,7 @@ fhc_central_attach(device_t dev)
int i;
sc = device_get_softc(dev);
- node = central_get_node(dev);
+ node = ofw_bus_get_node(dev);
sc->sc_node = node;
sc->sc_flags |= FHC_CENTRAL;