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/amd64 | |
| 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/amd64')
| -rw-r--r-- | sys/amd64/amd64/legacy.c | 13 | ||||
| -rw-r--r-- | sys/amd64/amd64/nexus.c | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c index b0bd756..9675ba9 100644 --- a/sys/amd64/amd64/legacy.c +++ b/sys/amd64/amd64/legacy.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: nexus.c,v 1.11 1999/05/30 10:50:57 dfr Exp $ + * $Id: nexus.c,v 1.12 1999/07/16 01:00:24 msmith Exp $ */ /* @@ -74,7 +74,7 @@ static struct rman irq_rman, drq_rman, port_rman, mem_rman; static int nexus_probe(device_t); -static void nexus_print_child(device_t, device_t); +static int nexus_print_child(device_t, device_t); static device_t nexus_add_child(device_t bus, int order, const char *name, int unit); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, @@ -213,10 +213,15 @@ nexus_probe(device_t dev) return 0; } -static void +static int nexus_print_child(device_t bus, device_t child) { - printf(" on motherboard"); + int retval = 0; + + retval += bus_print_child_header(bus, child); + retval += printf(" on motherboard\n"); + + return (retval); } static device_t diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c index b0bd756..9675ba9 100644 --- a/sys/amd64/amd64/nexus.c +++ b/sys/amd64/amd64/nexus.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: nexus.c,v 1.11 1999/05/30 10:50:57 dfr Exp $ + * $Id: nexus.c,v 1.12 1999/07/16 01:00:24 msmith Exp $ */ /* @@ -74,7 +74,7 @@ static struct rman irq_rman, drq_rman, port_rman, mem_rman; static int nexus_probe(device_t); -static void nexus_print_child(device_t, device_t); +static int nexus_print_child(device_t, device_t); static device_t nexus_add_child(device_t bus, int order, const char *name, int unit); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, @@ -213,10 +213,15 @@ nexus_probe(device_t dev) return 0; } -static void +static int nexus_print_child(device_t bus, device_t child) { - printf(" on motherboard"); + int retval = 0; + + retval += bus_print_child_header(bus, child); + retval += printf(" on motherboard\n"); + + return (retval); } static device_t |
