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

2 files changed, 26 insertions, 8 deletions

diff --git a/share/man/man9/BUS_PRINT_CHILD.9 b/share/man/man9/BUS_PRINT_CHILD.9
index 03a5f3d..fb9fd97 100644
--- a/share/man/man9/BUS_PRINT_CHILD.9
+++ b/share/man/man9/BUS_PRINT_CHILD.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: BUS_PRINT_CHILD.9,v 1.1 1998/09/03 21:52:04 dfr Exp $
+.\" $Id: BUS_PRINT_CHILD.9,v 1.2 1999/03/06 17:25:49 bde Exp $
 .\"
 .Dd June 16, 1998
 .Os
@@ -38,7 +38,7 @@
 .Sh SYNOPSIS
 .Fd #include <sys/param.h>
 .Fd #include <sys/bus.h>
-.Ft void
+.Ft int
 .Fn BUS_PRINT_CHILD "device_t dev" "device_t child"
 .Sh DESCRIPTION
 .Pp
@@ -46,9 +46,14 @@ This is called from system code which prints out a description of a
 device.  It should describe the attachment that the child has with
 the parent.  For instance the TurboLaser bus prints which node the
 device is attached to.
+Please see bus_generic_print_child.9 for more information regarding
+the proper formatting of the messages printed by BUS_PRINT_CHILD.
 .Sh SEE ALSO
 .Xr device 9 ,
-.Xr driver 9
+.Xr driver 9 , 
+.Xr BUS_PRINT_CHILD 9
+.Sh RETURN VALUES
+The number of characters output.
 .Sh AUTHORS
 This man page was written by
 .An Doug Rabson .
diff --git a/share/man/man9/bus_generic_print_child.9 b/share/man/man9/bus_generic_print_child.9
index 15d50a0..39a459c 100644
--- a/share/man/man9/bus_generic_print_child.9
+++ b/share/man/man9/bus_generic_print_child.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: bus_generic_print_child.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $Id: bus_generic_print_child.9,v 1.2 1999/03/06 17:25:49 bde Exp $
 .\"
 .Dd June 16, 1998
 .Os
@@ -40,15 +40,28 @@ for busses
 .Sh SYNOPSIS
 .Fd #include <sys/param.h>
 .Fd #include <sys/bus.h>
-.Ft void
+.Ft int
 .Fn bus_generic_print_child "device_t dev" "device_t child"
 .Sh DESCRIPTION
 .Pp
-This implementation prints nothing at all.
+This implementation prints out the default device announcement message.
+Given device 'foo0' on bus 'bar0' where foo0 has the name "FooCard 1234" the
+following would be printed:
+.Pp
+foo0: <FooCard 1234> on bar0
+.Pp
+bus_generic_print_child itself calls two functions
+.Fn bus_print_child_header
+and
+.Fn bus_print_child_footer
+The former prints "foo0: <FooCard 1234>" and the latter "on bar0".
+These routines should be used if possible in your own code if 
+.Fn bus_generic_print_child
+does not completely suit your needs.
 .Sh SEE ALSO
 .Xr device 9
-.Sh BUGS
-Not terribly useful.
+.Sh RETURN VALUES
+The number of characters output.
 .Sh AUTHORS
 This man page was written by
 .An Doug Rabson .