diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-05-28 19:46:08 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-05-28 19:46:08 +0000 |
| commit | 6ea2209de89de8e576afd16b0e4166d5e6a41ee0 (patch) | |
| tree | 24c7e8256135f333eff06a94085c1743bc3ae533 | |
| parent | 9c706dfa8e8575a89abcb0d1b6483d7b200454d6 (diff) | |
Don't display vid/pid from CIS if vid is 0.
Makes more sense than displaying the PCI values which is
already covered by the PCI code.
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 17fd4790ca2..f63b86a2e30 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.19 2005/05/28 02:35:48 jsg Exp $ */ +/* $OpenBSD: cardbus.c,v 1.20 2005/05/28 19:46:07 jsg Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -588,7 +588,6 @@ cardbusprint(aux, pnp) const char *pnp; { struct cardbus_attach_args *ca = aux; - struct cardbus_matchid cm; char devinfo[256]; int i; if (pnp) { @@ -602,15 +601,11 @@ cardbusprint(aux, pnp) } if (i) printf(" "); - if (ca->ca_cis.manufacturer) { - cm.cm_vid = ca->ca_cis.manufacturer; - cm.cm_pid = ca->ca_cis.product; - } else { - cm.cm_vid = CARDBUS_VENDOR(ca->ca_id); - cm.cm_pid = CARDBUS_PRODUCT(ca->ca_id); - } - printf("(manufacturer 0x%x, product 0x%x)", cm.cm_vid, cm.cm_pid); - printf(" %s at %s", devinfo, pnp); + if (ca->ca_cis.manufacturer) + printf("(manufacturer 0x%x, product 0x%x) ", + ca->ca_cis.manufacturer, + ca->ca_cis.product); + printf("%s at %s", devinfo, pnp); } printf(" dev %d function %d", ca->ca_device, ca->ca_function); |