diff options
| author | mdodd <mdodd@FreeBSD.org> | 1999-07-29 01:03:04 +0000 |
|---|---|---|
| committer | mdodd <mdodd@FreeBSD.org> | 1999-07-29 01:03:04 +0000 |
| commit | 1b3328c30076a4872fb76549719ee41c4f633e6a (patch) | |
| tree | 08fbd565ea1bf201e2bfcfcd2a4119c82ef665a7 /sys/pc98 | |
| parent | 0d84c8efb0a2e4b063d0c818f89eb17ee4bc6e47 (diff) | |
| download | FreeBSD-src-1b3328c30076a4872fb76549719ee41c4f633e6a.zip FreeBSD-src-1b3328c30076a4872fb76549719ee41c4f633e6a.tar.gz | |
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
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/fdc.c | 13 | ||||
| -rw-r--r-- | sys/pc98/pc98/fd.c | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index 6b523cd..b06b7d5 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.65 1999/06/28 14:01:03 kato Exp $ + * $Id: fd.c,v 1.66 1999/07/04 14:58:44 phk Exp $ * */ @@ -937,11 +937,16 @@ fdc_attach(device_t dev) return (bus_generic_attach(dev)); } -static void +static int fdc_print_child(device_t me, device_t child) { - printf(" at %s%d drive %d", device_get_name(me), device_get_unit(me), - *(int *)device_get_ivars(child)); + int retval = 0; + + retval += bus_print_child_header(me, child); + retval += printf(" on %s drive %d\n", device_get_nameunit(me), + *(int *)device_get_ivars(child)); + + return (retval); } static int diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c index 6b523cd..b06b7d5 100644 --- a/sys/pc98/pc98/fd.c +++ b/sys/pc98/pc98/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.65 1999/06/28 14:01:03 kato Exp $ + * $Id: fd.c,v 1.66 1999/07/04 14:58:44 phk Exp $ * */ @@ -937,11 +937,16 @@ fdc_attach(device_t dev) return (bus_generic_attach(dev)); } -static void +static int fdc_print_child(device_t me, device_t child) { - printf(" at %s%d drive %d", device_get_name(me), device_get_unit(me), - *(int *)device_get_ivars(child)); + int retval = 0; + + retval += bus_print_child_header(me, child); + retval += printf(" on %s drive %d\n", device_get_nameunit(me), + *(int *)device_get_ivars(child)); + + return (retval); } static int |
