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/dev/pcf | |
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/dev/pcf')
-rw-r--r-- | sys/dev/pcf/pcf.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c index 94d685b..e5498b4 100644 --- a/sys/dev/pcf/pcf.c +++ b/sys/dev/pcf/pcf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pcf.c,v 1.8 1999/05/06 18:54:18 peter Exp $ + * $Id: pcf.c,v 1.9 1999/05/08 21:59:27 dfr Exp $ * */ #include <sys/param.h> @@ -103,7 +103,7 @@ struct isa_driver pcfdriver = { static int pcf_probe(device_t); static int pcf_attach(device_t); -static void pcf_print_child(device_t, device_t); +static int pcf_print_child(device_t, device_t); static int pcf_repeated_start(device_t, u_char, int); static int pcf_start(device_t, u_char, int); @@ -219,15 +219,17 @@ pcf_attach(device_t pcfdev) return (0); } -static void +static int pcf_print_child(device_t bus, device_t dev) { struct pcf_softc *pcf = (struct pcf_softc *)device_get_softc(bus); + int retval = 0; - printf(" on %s%d addr 0x%x", device_get_name(bus), - device_get_unit(bus), (int)pcf->pcf_addr); + retval += bus_print_child_header(bus, dev); + retval += printf(" on %s addr 0x%x\n", device_get_nameunit(bus), + (int)pcf->pcf_addr); - return; + return (retval); } /* |