- 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

2 files changed, 10 insertions, 13 deletions

diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c
index 74d87c7..7b5f064 100644
--- a/sys/dev/pcf/envctrl.c
+++ b/sys/dev/pcf/envctrl.c
@@ -46,15 +46,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/resource.h>
 #include <sys/uio.h>
 
+#include <dev/ofw/ofw_bus.h>
+
 #include <machine/bus.h>
 #include <machine/resource.h>
 
 #include <sys/rman.h>
 
-#include <dev/ofw/openfirm.h>
-
-#include <sparc64/ebus/ebusvar.h>
-
 #include <dev/iicbus/iiconf.h>
 #include <dev/pcf/pcfvar.h>
 #include "iicbus_if.h"
@@ -95,7 +93,7 @@ static int
 envctrl_probe(device_t dev)
 {
 
-	if (strcmp("SUNW,envctrl", ebus_get_name(dev)) == 0) {
+	if (strcmp("SUNW,envctrl", ofw_bus_get_name(dev)) == 0) {
 		device_set_desc(dev, "EBus SUNW,envctrl");
 		return (0);
 	}
diff --git a/sys/dev/pcf/pcf_ebus.c b/sys/dev/pcf/pcf_ebus.c
index 13b8110..b23c8dd 100644
--- a/sys/dev/pcf/pcf_ebus.c
+++ b/sys/dev/pcf/pcf_ebus.c
@@ -70,15 +70,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/resource.h>
 
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/openfirm.h>
+
 #include <machine/bus.h>
 #include <machine/resource.h>
 
 #include <sys/rman.h>
 
-#include <dev/ofw/openfirm.h>
-
-#include <sparc64/ebus/ebusvar.h>
-
 #include <dev/iicbus/iiconf.h>
 #include <dev/pcf/pcfvar.h>
 #include "iicbus_if.h"
@@ -117,15 +116,15 @@ static driver_t pcf_ebus_driver = {
 static int
 pcf_ebus_probe(device_t dev)
 {
-	char *compat;
+	const char *compat;
 
 	/*
 	 * We must not attach to this i2c device if this is a system with
 	 * a boot-bus controller. Additionally testing the compatibility
 	 * property will hopefully take care of this.
 	 */
-	if (strcmp("i2c", ebus_get_name(dev)) == 0) {
-		compat = ebus_get_compat(dev);
+	if (strcmp("i2c", ofw_bus_get_name(dev)) == 0) {
+		compat = ofw_bus_get_compat(dev);
 		if (compat != NULL && strcmp("i2cpcf,8584", compat) == 0) {
 			device_set_desc(dev, "PCF8584 I2C bus controller");
 			return (0);
@@ -146,7 +145,7 @@ pcf_ebus_attach(device_t dev)
 	bzero(sc, sizeof(struct pcf_softc));
 
 	/* get OFW node of the pcf */
-	if ((node = ebus_get_node(dev)) <= 0) {
+	if ((node = ofw_bus_get_node(dev)) <= 0) {
 		device_printf(dev, "cannot get OFW node\n");
 		goto error;
 	}