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, 11 deletions

diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index 5027c20..4f98d1a 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpm.c,v 1.4 1999/05/09 17:06:38 peter Exp $
+ *	$Id: alpm.c,v 1.5 1999/07/03 20:17:00 peter Exp $
  *
  */
 
@@ -147,7 +147,6 @@ struct alsmb_softc {
 
 static int alsmb_probe(device_t);
 static int alsmb_attach(device_t);
-static void alsmb_print_child(device_t, device_t);
 static int alsmb_smb_callback(device_t, int, caddr_t *);
 static int alsmb_smb_quick(device_t dev, u_char slave, int how);
 static int alsmb_smb_sendb(device_t dev, u_char slave, char byte);
@@ -167,7 +166,7 @@ static device_method_t alsmb_methods[] = {
 	DEVMETHOD(device_attach,	alsmb_attach),
 
 	/* bus interface */
-	DEVMETHOD(bus_print_child,	alsmb_print_child),
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	
 	/* smbus interface */
 	DEVMETHOD(smbus_callback,	alsmb_smb_callback),
@@ -317,14 +316,6 @@ alsmb_attach(device_t dev)
 	return (0);
 }
 
-static void
-alsmb_print_child(device_t bus, device_t dev)
-{
-	printf(" on %s%d", device_get_name(bus), device_get_unit(bus));
-
-	return;
-}
-
 static int
 alsmb_smb_callback(device_t dev, int index, caddr_t *data)
 {