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/pci/intpm.c | |
| 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/pci/intpm.c')
| -rw-r--r-- | sys/pci/intpm.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c index 2bac535..7163d37 100644 --- a/sys/pci/intpm.c +++ b/sys/pci/intpm.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: intpm.c,v 1.11 1999/07/03 20:17:06 peter Exp $ + * $Id: intpm.c,v 1.12 1999/07/24 19:13:54 nsouch Exp $ */ #include <sys/param.h> @@ -67,7 +67,6 @@ static struct _pcsid }; static int intsmb_probe(device_t); static int intsmb_attach(device_t); -static void intsmb_print_child(device_t, device_t); static int intsmb_intr(device_t dev); static int intsmb_slvintr(device_t dev); @@ -95,7 +94,7 @@ static device_method_t intpm_methods[]={ DEVMETHOD(device_probe,intsmb_probe), DEVMETHOD(device_attach,intsmb_attach), - DEVMETHOD(bus_print_child, intsmb_print_child), + DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(smbus_callback,intsmb_callback), DEVMETHOD(smbus_quick,intsmb_quick), @@ -176,12 +175,6 @@ intsmb_attach(device_t dev) return (0); } -static void -intsmb_print_child(device_t bus, device_t dev) -{ - printf(" on %s%d", device_get_name(bus), device_get_unit(bus)); - return; -} static int intsmb_callback(device_t dev, int index, caddr_t data) { |
