diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-08-22 06:13:11 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-08-22 06:13:11 +0000 |
| commit | d79aa618196d0a490565275773070c84d4c90d94 (patch) | |
| tree | 7497ae0620b315f6267795411a1e82da6a771fc6 /sys/dev/isa | |
| parent | da49063ef71996e8977d49ec07350d0d4d3d39cc (diff) | |
make isapnp_print() use canonical format
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/isapnp.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c index b238840a204..8a12e37d06a 100644 --- a/sys/dev/isa/isapnp.c +++ b/sys/dev/isa/isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isapnp.c,v 1.27 1999/08/11 17:18:47 deraadt Exp $ */ +/* $OpenBSD: isapnp.c,v 1.28 1999/08/22 06:13:10 deraadt Exp $ */ /* $NetBSD: isapnp.c,v 1.9.4.3 1997/10/29 00:40:43 thorpej Exp $ */ /* @@ -542,7 +542,6 @@ isapnp_print_pin(str, p, n) } } - /* isapnp_print(): * Print the configuration line for an ISA PnP card. */ @@ -553,11 +552,14 @@ isapnp_print(aux, str) { struct isa_attach_args *ipa = aux; - if (str != NULL) - printf("%s:", str); - printf(" <%s, %s, %s, %s>", ipa->ipa_devident, + if (!str) + printf(" "); + printf("\"%s, %s, %s, %s\"", ipa->ipa_devident, ipa->ipa_devlogic, ipa->ipa_devcompat, ipa->ipa_devclass); + if (str) + printf(" at %s", str); + isapnp_print_region("port", ipa->ipa_io, ipa->ipa_nio); isapnp_print_region("mem", ipa->ipa_mem, ipa->ipa_nmem); isapnp_print_region("mem32", ipa->ipa_mem32, ipa->ipa_nmem32); @@ -930,7 +932,7 @@ isapnp_attach(parent, self, aux) lpa->ipa_devcompat, lpa->ipa_devclass)); if (lpa->ipa_pref == ISAPNP_DEP_CONFLICTING) { isapnp_print(lpa, self->dv_xname); - printf(" resouce conflict\n"); + printf(" resource conflict\n"); ISAPNP_FREE(lpa); continue; } |