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

5 files changed, 21 insertions, 45 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)
 {
diff --git a/sys/pci/bt848_i2c.c b/sys/pci/bt848_i2c.c
index eec0642..a3a1fdd 100644
--- a/sys/pci/bt848_i2c.c
+++ b/sys/pci/bt848_i2c.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt848_i2c.c,v 1.4 1999/05/10 10:08:05 roger Exp $
+ *	$Id: bt848_i2c.c,v 1.5 1999/07/03 20:17:01 peter Exp $
  *
  */
 
@@ -91,7 +91,6 @@ struct bt_data btdata[NBKTR];
 
 static int bti2c_probe(device_t);
 static int bti2c_attach(device_t);
-static void bti2c_print_child(device_t, device_t);
 
 static int bti2c_iic_callback(device_t, int, caddr_t *);
 static void bti2c_iic_setlines(device_t, int, int);
@@ -111,7 +110,7 @@ static device_method_t bti2c_methods[] = {
 	DEVMETHOD(device_attach,	bti2c_attach),
 
 	/* bus interface */
-	DEVMETHOD(bus_print_child,	bti2c_print_child),
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
 	/* iicbb interface */
 	DEVMETHOD(iicbb_callback,	bti2c_iic_callback),
@@ -193,14 +192,6 @@ bti2c_attach(device_t dev)
 	return (0);
 }
 
-static void
-bti2c_print_child(device_t bus, device_t dev)
-{
-	printf(" on %s%d", device_get_name(bus), device_get_unit(bus));
-
-	return;
-}
-
 static int
 bti2c_smb_callback(device_t dev, int index, caddr_t *data)
 {
diff --git a/sys/pci/ida_pci.c b/sys/pci/ida_pci.c
index 23446f1..6f5e260 100644
--- a/sys/pci/ida_pci.c
+++ b/sys/pci/ida_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ida_pci.c,v 1.1 1999/06/24 03:32:07 jlemon Exp $
+ *	$Id: ida_pci.c,v 1.2 1999/07/03 20:17:02 peter Exp $
  */
 
 #include <sys/param.h>
@@ -69,13 +69,12 @@ static struct {
 
 static int ida_pci_probe(device_t dev);
 static int ida_pci_attach(device_t dev);
-static void ida_pci_print_child(device_t bus, device_t dev);
 
 static device_method_t ida_pci_methods[] = {
 	DEVMETHOD(device_probe,		ida_pci_probe),
 	DEVMETHOD(device_attach,	ida_pci_attach),
 
-	DEVMETHOD(bus_print_child,	ida_pci_print_child),
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
 	{ 0, 0 }
 };
@@ -185,10 +184,4 @@ ida_pci_attach(device_t dev)
 	return (0);
 }
 
-static void
-ida_pci_print_child(device_t bus, device_t dev)
-{
-	printf(" on %s%d", device_get_name(bus), device_get_unit(bus));
-}
-
 DRIVER_MODULE(ida, pci, ida_pci_driver, ida_devclass, 0, 0);
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 2bac535..7163d37 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intpm.c,v 1.11 1999/07/03 20:17:06 peter Exp $
+ *	$Id: intpm.c,v 1.12 1999/07/24 19:13:54 nsouch Exp $
  */
 
 #include <sys/param.h>
@@ -67,7 +67,6 @@ static struct _pcsid
 };
 static int intsmb_probe(device_t);
 static int intsmb_attach(device_t);
-static void intsmb_print_child(device_t, device_t);
 
 static int intsmb_intr(device_t dev);
 static int intsmb_slvintr(device_t dev);
@@ -95,7 +94,7 @@ static device_method_t intpm_methods[]={
         DEVMETHOD(device_probe,intsmb_probe),
         DEVMETHOD(device_attach,intsmb_attach),
 
-        DEVMETHOD(bus_print_child, intsmb_print_child),
+        DEVMETHOD(bus_print_child, bus_generic_print_child),
         
         DEVMETHOD(smbus_callback,intsmb_callback),
         DEVMETHOD(smbus_quick,intsmb_quick),
@@ -176,12 +175,6 @@ intsmb_attach(device_t dev)
         return (0);
 }
 
-static void
-intsmb_print_child(device_t bus, device_t dev)
-{
-	printf(" on %s%d", device_get_name(bus), device_get_unit(bus));
-	return;
-}
 static int 
 intsmb_callback(device_t dev, int index, caddr_t data)
 {
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index c6184da..78b0cda 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,7 +23,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: pci.c,v 1.112 1999/07/27 05:08:36 mdodd Exp $
+ * $Id: pci.c,v 1.113 1999/07/28 07:57:47 dfr Exp $
  *
  */
 
@@ -1116,18 +1116,26 @@ pci_new_probe(device_t dev)
 	return 0;
 }
 
-static void
+static int
 pci_print_child(device_t dev, device_t child)
 {
 	struct pci_devinfo *dinfo;
 	pcicfgregs *cfg;
+	int retval = 0;
 
 	dinfo = device_get_ivars(child);
 	cfg = &dinfo->cfg;
+
+	retval += bus_print_child_header(dev, child);
+
 	if (cfg->intpin > 0 && cfg->intline != 255)
-		printf(" irq %d", cfg->intline);
-	printf(" at device %d.%d", pci_get_slot(child), pci_get_function(child));
-	printf(" on %s%d", device_get_name(dev), device_get_unit(dev));
+		retval += printf(" irq %d", cfg->intline);
+	retval += printf(" at device %d.%d", pci_get_slot(child),
+			 pci_get_function(child));
+
+	retval += bus_print_child_footer(dev, child);
+
+	return (retval);
 }
 
 static void