diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-08 19:12:00 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-08 19:12:00 +0000 |
| commit | c9732c9f957f19039e7391a044b07a53bb8b22b0 (patch) | |
| tree | b6031b63dc911b1da5f176442ef4e1a82ce677da | |
| parent | a9f071c00776df9c39891a14bf4c2573f7ba5df9 (diff) | |
Recognize more brick types and probe fooX bricks in the same order as
foo bricks (they differ by having PCI-X bridges instead of PCI bridges
but are otherwise built the same)
| -rw-r--r-- | sys/arch/sgi/include/mnode.h | 7 | ||||
| -rw-r--r-- | sys/arch/sgi/xbow/xbow.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sys/arch/sgi/include/mnode.h b/sys/arch/sgi/include/mnode.h index d0bbd0a72e9..fc4499816c2 100644 --- a/sys/arch/sgi/include/mnode.h +++ b/sys/arch/sgi/include/mnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mnode.h,v 1.9 2009/07/11 19:56:02 miod Exp $ */ +/* $OpenBSD: mnode.h,v 1.10 2009/10/08 19:11:57 miod Exp $ */ /* * Copyright (c) 2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -195,6 +195,11 @@ typedef struct lboard_s { #define IP27_BRD_IBRICK (IP27_BC_BRICK | 0x01) #define IP27_BRD_PBRICK (IP27_BC_BRICK | 0x02) #define IP27_BRD_XBRICK (IP27_BC_BRICK | 0x03) +#define IP27_BRD_NBRICK (IP27_BC_BRICK | 0x04) +#define IP27_BRD_PEBRICK (IP27_BC_BRICK | 0x05) +#define IP27_BRD_PXBRICK (IP27_BC_BRICK | 0x06) +#define IP27_BRD_IXBRICK (IP27_BC_BRICK | 0x07) +#define IP27_BRD_CGBRICK (IP27_BC_BRICK | 0x08) /* Component info. Common info about a component. */ diff --git a/sys/arch/sgi/xbow/xbow.c b/sys/arch/sgi/xbow/xbow.c index 89b6d439abb..86b179693a1 100644 --- a/sys/arch/sgi/xbow/xbow.c +++ b/sys/arch/sgi/xbow/xbow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xbow.c,v 1.17 2009/07/26 19:57:12 miod Exp $ */ +/* $OpenBSD: xbow.c,v 1.18 2009/10/08 19:11:59 miod Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -425,16 +425,18 @@ xbow_kl_search_brd(lboard_t *brd, void *arg) if (cfg->probe_order == NULL) switch (brd->brd_type) { case IP27_BRD_IBRICK: + case IP27_BRD_IXBRICK: cfg->probe_order = xbow_probe_ibrick; break; case IP27_BRD_PBRICK: + case IP27_BRD_PXBRICK: cfg->probe_order = xbow_probe_pbrick; break; case IP27_BRD_XBRICK: cfg->probe_order = xbow_probe_xbrick; break; default: - /* unknown brick */ + /* other brick */ break; } break; |