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/alpha/tc/tc.c b/sys/alpha/tc/tc.c
index 14703a3..b6b51db 100644
--- a/sys/alpha/tc/tc.c
+++ b/sys/alpha/tc/tc.c
@@ -1,4 +1,4 @@
-/* $Id: tc.c,v 1.4 1999/05/10 15:53:33 peter Exp $ */
+/* $Id: tc.c,v 1.5 1999/07/01 22:49:03 peter Exp $ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
@@ -72,7 +72,6 @@ static tc_offset_t tc_slot_romoffs[NTC_ROMOFFS] = {
 
 static int tc_probe(device_t dev);
 static int tc_attach(device_t dev);
-static void tc_print_child(device_t bus, device_t dev);
 int    tc_checkslot(        tc_addr_t slotbase, char *namep);
 
 static device_method_t tc_methods[] = {
@@ -80,7 +79,7 @@ static device_method_t tc_methods[] = {
 	DEVMETHOD(device_probe,		tc_probe),
 	DEVMETHOD(device_attach,	tc_attach),
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,   tc_print_child),
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	{ 0, 0 },
 };
 
@@ -684,14 +683,5 @@ tc_intr_disestablish(dev, cookie)
         (*sc->sc_intr_disestablish)(device_get_parent(dev), cookie);
 }
 
-
-
-static void
-tc_print_child(device_t bus, device_t dev)
-{
-        printf(" at %s%d",
-               device_get_name(bus), device_get_unit(bus));
-}
-
 DRIVER_MODULE(tc, tcasic, tc_driver, tc_devclass, 0, 0);