diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-08 19:10:54 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-08 19:10:54 +0000 |
| commit | a9f071c00776df9c39891a14bf4c2573f7ba5df9 (patch) | |
| tree | d6054566b57f091328dae6963d0a5c94dca1dca4 | |
| parent | 6aeaf9f8180b63242e0efdc9aee27bd44578647d (diff) | |
PIC actually comes with two sets of widget registers, with different IDs,
but we only care about the first for matching, so don't bother listing the
second one in xbowdevs, and fix the description.
| -rw-r--r-- | sys/arch/sgi/xbow/xbowdevs | 14 | ||||
| -rw-r--r-- | sys/arch/sgi/xbow/xbridge.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/sgi/xbow/xbowdevs b/sys/arch/sgi/xbow/xbowdevs index ee7f0a0855c..51b0c5e7622 100644 --- a/sys/arch/sgi/xbow/xbowdevs +++ b/sys/arch/sgi/xbow/xbowdevs @@ -1,4 +1,4 @@ -$OpenBSD: xbowdevs,v 1.2 2009/04/25 20:36:18 miod Exp $ +$OpenBSD: xbowdevs,v 1.3 2009/10/08 19:10:53 miod Exp $ /* * Copyright (c) 2008 Miodrag Vallat. * @@ -32,12 +32,14 @@ product SGI2 ODYSSEY 0xc013 Odyssey product SGI3 TPU 0xc202 TPU product SGI3 XBRIDGE 0xd002 XBridge -/* PIC is really a single chip but two widgets, with 4 PCI-X slots per widget */ -product SGI3 PIC0 0xd102 PIC (bus 0) -product SGI3 PIC1 0xd112 PIC (bus 1) +/* + * PIC is really a single chip but with two widgets headers, and 4 PCI-X + * slots per widget. + * The second widget register set uses 0xd112 as the product id. + */ +product SGI3 PIC 0xd102 PIC /* Supposedly a PIC-compatible chip, maybe a different revision */ -/* product SGI3 ? 0xe000 ? (bus 0) */ -/* product SGI3 ? 0xe010 ? (bus 1) */ +/* product SGI3 ? 0xe000 ? (0xe010 for the 2nd widget) */ product SGI3 TIOCA 0xe020 TIO:CA product SGI4 HEART 0xc001 Heart diff --git a/sys/arch/sgi/xbow/xbridge.c b/sys/arch/sgi/xbow/xbridge.c index c3341f677df..e9b41d316f0 100644 --- a/sys/arch/sgi/xbow/xbridge.c +++ b/sys/arch/sgi/xbow/xbridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xbridge.c,v 1.48 2009/10/07 20:39:14 miod Exp $ */ +/* $OpenBSD: xbridge.c,v 1.49 2009/10/08 19:10:53 miod Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -309,10 +309,8 @@ static const struct { { XBOW_VENDOR_SGI4, XBOW_PRODUCT_SGI4_BRIDGE, 0 }, /* XBridge */ { XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_XBRIDGE, XF_XBRIDGE }, - /* PIC first half */ - { XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_PIC0, XF_PIC }, - /* PIC second half */ - { XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_PIC1, XF_PIC } + /* PIC */ + { XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_PIC, XF_PIC } }; int |