Alter the behavior of sys/kern/subr_bus.c:device_print_child()

	- device_print_child() either lets the BUS_PRINT_CHILD
	  method produce the entire device announcement message or
	  it prints "foo0: not found\n"

Alter sys/kern/subr_bus.c:bus_generic_print_child() to take on
the previous behavior of device_print_child() (printing the
"foo0: <FooDevice 1.1>" bit of the announce message.)

Provide bus_print_child_header() and bus_print_child_footer()
to actually print the output for bus_generic_print_child().
These functions should be used whenever possible (unless you can
just use bus_generic_print_child())

The BUS_PRINT_CHILD method now returns int instead of void.

Modify everything else that defines or uses a BUS_PRINT_CHILD
method to comply with the above changes.

	- Devices are 'on' a bus, not 'at' it.
	- If a custom BUS_PRINT_CHILD method does the same thing
	  as bus_generic_print_child(), use bus_generic_print_child()
	- Use device_get_nameunit() instead of both
	  device_get_name() and device_get_unit()
	- All BUS_PRINT_CHILD methods return the number of
	  characters output.

Reviewed by: dfr, peter

1 files changed, 2 insertions, 12 deletions

diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index cd16f3c..2f2632e 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbus.c,v 1.8 1999/02/13 17:57:19 nsouch Exp $
+ *	$Id: smbus.c,v 1.9 1999/05/08 21:59:08 dfr Exp $
  *
  */
 #include <sys/param.h>
@@ -64,7 +64,6 @@ static devclass_t smbus_devclass;
  */
 static int smbus_probe(device_t);
 static int smbus_attach(device_t);
-static void smbus_print_child(device_t, device_t);
 
 #if 0
 static int smbus_read_ivar(device_t , device_t, int, u_long *);
@@ -78,7 +77,7 @@ static device_method_t smbus_methods[] = {
         DEVMETHOD(device_shutdown,      bus_generic_shutdown),
 
         /* bus interface */
-        DEVMETHOD(bus_print_child,      smbus_print_child),
+        DEVMETHOD(bus_print_child,	bus_generic_print_child),
         DEVMETHOD(bus_read_ivar,        bus_generic_read_ivar),
         DEVMETHOD(bus_write_ivar,       bus_generic_write_ivar),
 
@@ -132,15 +131,6 @@ smbus_generic_intr(device_t dev, u_char devaddr, char low, char high)
 	return;
 }
 
-static void
-smbus_print_child(device_t bus, device_t dev)
-{
-
-	printf(" on %s%d", device_get_name(bus), device_get_unit(bus));
-
-	return;
-}
-
 #if 0
 static int
 smbus_read_ivar(device_t bus, device_t dev, int index, u_long* result)