diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-08 19:13:01 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-08 19:13:01 +0000 |
| commit | c0e6ddd519d7b8c4b84e1b0d78c5f4ce6cc21a10 (patch) | |
| tree | dabdaf84586fcc64ba460b15d5b99c64c49dc784 | |
| parent | c9732c9f957f19039e7391a044b07a53bb8b22b0 (diff) | |
Recognize the Bedrock as an XBow instead of reporting it as ``unknown
xbow''; while there report vendor and product id of unknow xbow chips.
| -rw-r--r-- | sys/arch/sgi/xbow/xbow.c | 10 | ||||
| -rw-r--r-- | sys/arch/sgi/xbow/xbowdevs | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/arch/sgi/xbow/xbow.c b/sys/arch/sgi/xbow/xbow.c index 86b179693a1..9d62c838b8e 100644 --- a/sys/arch/sgi/xbow/xbow.c +++ b/sys/arch/sgi/xbow/xbow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xbow.c,v 1.18 2009/10/08 19:11:59 miod Exp $ */ +/* $OpenBSD: xbow.c,v 1.19 2009/10/08 19:13:00 miod Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -285,8 +285,12 @@ xbowattach(struct device *parent, struct device *self, void *aux) vendor = (wid & WIDGET_ID_VENDOR_MASK) >> WIDGET_ID_VENDOR_SHIFT; product = (wid & WIDGET_ID_PRODUCT_MASK) >> WIDGET_ID_PRODUCT_SHIFT; p = xbow_identify(vendor, product); - printf(": %s revision %d\n", - p != NULL ? p->productname : "unknown xbow", + if (p == NULL) + printf(": unknown xbow (vendor %x product %x)", + vendor, product); + else + printf(": %s", p->productname); + printf(" revision %d\n", (wid & WIDGET_ID_REV_MASK) >> WIDGET_ID_REV_SHIFT); memset(&cfg, 0, sizeof cfg); diff --git a/sys/arch/sgi/xbow/xbowdevs b/sys/arch/sgi/xbow/xbowdevs index 51b0c5e7622..598fcb84176 100644 --- a/sys/arch/sgi/xbow/xbowdevs +++ b/sys/arch/sgi/xbow/xbowdevs @@ -1,4 +1,4 @@ -$OpenBSD: xbowdevs,v 1.3 2009/10/08 19:10:53 miod Exp $ +$OpenBSD: xbowdevs,v 1.4 2009/10/08 19:13:00 miod Exp $ /* * Copyright (c) 2008 Miodrag Vallat. * @@ -27,6 +27,7 @@ vendor SGI5 0x02aa product SGI XBOW 0x0000 XBow product SGI XXBOW 0xd000 XXBow +product SGI BEDROCK 0xd100 Bedrock product SGI2 ODYSSEY 0xc013 Odyssey |