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

diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 53f1b0d..5439dc5 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1224,30 +1224,34 @@ usbd_get_endpoint_descriptor(iface, address)
 }
 
 #if defined(__FreeBSD__)
-void
+int
 usbd_print_child(device_t parent, device_t child)
 {
 	/*
 	struct usb_softc *sc = device_get_softc(child);
 	*/
+	int retval = 0;
 
-	printf(" at %s%d", device_get_name(parent), device_get_unit(parent));
+	retval += bus_print_child_header(parent, child);
+	retval += bus_print_child_footer(parent, child);
 
 	/* XXX How do we get to the usbd_device_handle???
 	usbd_device_handle dev = invalidadosch;
 
-	printf(" addr %d", dev->addr);
+	retval += printf(" addr %d\n", dev->addr);
 
 	if (bootverbose) {
 		if (dev->lowspeed)
-			printf(", lowspeed");
+			retval += printf(", lowspeed");
 		if (dev->self_powered)
-			printf(", self powered");
+			retval += printf(", self powered");
 		else
-			printf(", %dmA", dev->power);
-		printf(", config %d", dev->config);
+			retval += printf(", %dmA", dev->power);
+		retval += printf(", config %d", dev->config);
 	}
 	 */
+
+	return (retval);
 }
 
 /* Reconfigure all the USB busses in the system. */