summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>1999-07-30 17:13:51 +0000
committerderaadt <deraadt@openbsd.org>1999-07-30 17:13:51 +0000
commiteae3edba63c073caf1a5b52e115aa107c03cbf3d (patch)
tree8e866ebc7d91cca87d4b4983abbd7d36fa9a551a
parentprint ports as 0x%x/%d start/len instead of start-end (diff)
downloadwireguard-openbsd-eae3edba63c073caf1a5b52e115aa107c03cbf3d.tar.xz
wireguard-openbsd-eae3edba63c073caf1a5b52e115aa107c03cbf3d.zip
pretty print manufacturer and product for unknown devices
-rw-r--r--sys/dev/pcmcia/pcmcia.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index d877536b4ad..b621fa07b0d 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcmcia.c,v 1.17 1999/07/01 13:48:07 niklas Exp $ */
+/* $OpenBSD: pcmcia.c,v 1.18 1999/07/30 17:13:51 deraadt Exp $ */
/* $NetBSD: pcmcia.c,v 1.9 1998/08/13 02:10:55 eeh Exp $ */
/*
@@ -248,8 +248,17 @@ pcmcia_print(arg, pnp)
printf("\"");
if (i)
printf(" ");
- printf("(manufacturer 0x%x, product 0x%x)", card->manufacturer,
- card->product);
+ if (card->manufacturer != -1 && card->product != -1) {
+ printf("(");
+ if (card->manufacturer != -1)
+ printf("manufacturer 0x%lx%s",
+ card->manufacturer,
+ card->product == -1 ? "" : ", ");
+ if (card->product != -1)
+ printf("product 0x%lx%s",
+ card->product);
+ printf(")");
+ }
}
printf(" function %d", pa->pf->number);