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, 10 insertions, 6 deletions

diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 55171a4..337706d 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zs_tlsb.c,v 1.13 1999/05/30 16:50:54 phk Exp $
+ *	$Id: zs_tlsb.c,v 1.14 1999/07/04 14:58:04 phk Exp $
  */
 /*
  * This driver is a hopeless hack to get the SimOS console working.  A real
@@ -405,7 +405,7 @@ struct zsc_softc {
 
 static int zsc_tlsb_probe(device_t dev);
 static int zsc_tlsb_attach(device_t dev);
-static void zsc_tlsb_print_child(device_t dev, device_t child);
+static int zsc_tlsb_print_child(device_t dev, device_t child);
 static driver_intr_t zsc_tlsb_intr;
 
 
@@ -485,12 +485,16 @@ zsc_tlsb_attach(device_t dev)
 	return 0;
 }
 
-static void
+static int
 zsc_tlsb_print_child(device_t bus, device_t dev)
 {
-	printf(" at %s%d channel %c",
-	       device_get_name(bus), device_get_unit(bus),
-	       'A' + (device_get_unit(dev) & 1));
+	int retval = 0;
+
+	retval += bus_print_child_header(bus, dev);
+	retval += printf(" on %s channel %c\n", device_get_nameunit(bus),
+			 'A' + (device_get_unit(dev) & 1));
+
+	return (retval);
 }
 
 static void