From 1b3328c30076a4872fb76549719ee41c4f633e6a Mon Sep 17 00:00:00 2001 From: mdodd Date: Thu, 29 Jul 1999 01:03:04 +0000 Subject: 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: " 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 --- sys/dev/ida/ida_pci.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'sys/dev/ida') diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c index 23446f1..6f5e260 100644 --- a/sys/dev/ida/ida_pci.c +++ b/sys/dev/ida/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 @@ -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); -- cgit v1.1