summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2004-01-26 19:12:53 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2004-01-26 19:12:53 +0000
commit1fe9de4043c69ef25906993eb4f57d0a519e3479 (patch)
tree1f16cc0b661f305d3db5c0d1d87a1bbe6946d454 /sys
parent0c962462271adac07f187872d8a90d46158dc2ad (diff)
print cis information on configured cards as pcmcia(4) does; mentioned by
Ed White <ed at overminder dot com>. deraadt@ ok.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/cardbus/cardbus.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 7bca20c2955..123ff3b5fc3 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardbus.c,v 1.8 2003/10/21 10:07:33 jmc Exp $ */
+/* $OpenBSD: cardbus.c,v 1.9 2004/01/26 19:12:52 fgsch Exp $ */
/* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */
/*
@@ -590,6 +590,13 @@ cardbusprint(aux, pnp)
}
printf(" dev %d function %d", ca->ca_device, ca->ca_function);
+ if (!pnp) {
+ pci_devinfo(ca->ca_id, ca->ca_class, 1, devinfo, sizeof devinfo);
+ for (i = 0; i < 3 && ca->ca_cis.cis1_info[i]; i++)
+ printf("%s%s", i ? ", " : " \"", ca->ca_cis.cis1_info[i]);
+ printf("\"");
+ }
+
return UNCONF;
}