diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2012-04-15 20:38:11 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2012-04-15 20:38:11 +0000 |
| commit | 56335d3b7641d2a700e95c1fb1e256c7af867e35 (patch) | |
| tree | e50619ae9762f1812ae1b25b957247b8db7d684d /sys/arch/sgi/hpc/hpc.c | |
| parent | c0f5c12e6d3270377008c0cc39c9bbbe3c85eed4 (diff) | |
Tell Indy and Challenge S apart.
Diffstat (limited to 'sys/arch/sgi/hpc/hpc.c')
| -rw-r--r-- | sys/arch/sgi/hpc/hpc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sgi/hpc/hpc.c b/sys/arch/sgi/hpc/hpc.c index 6014fa33ce8..9af8b30cc9c 100644 --- a/sys/arch/sgi/hpc/hpc.c +++ b/sys/arch/sgi/hpc/hpc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpc.c,v 1.5 2012/04/08 22:08:25 miod Exp $ */ +/* $OpenBSD: hpc.c,v 1.6 2012/04/15 20:38:10 miod Exp $ */ /* $NetBSD: hpc.c,v 1.66 2011/07/01 18:53:46 dyoung Exp $ */ /* $NetBSD: ioc.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $ */ @@ -475,8 +475,8 @@ hpc_attach(struct device *parent, struct device *self, void *aux) */ isonboard = (sc->sc_base == HPC_BASE_ADDRESS_0); isioplus = (sc->sc_base == HPC_BASE_ADDRESS_1 && hpctype == 3 && - sysmask == HPCDEV_IP24); - + (sysmask & HPCDEV_IP24) != 0); + printf(": SGI HPC%d%s (%s)\n", (hpctype == 3) ? 3 : 1, (hpctype == 15) ? ".5" : "", (isonboard) ? "onboard" : (isioplus) ? "IOPLUS mezzanine" : "GIO slot"); @@ -501,7 +501,7 @@ hpc_attach(struct device *parent, struct device *self, void *aux) /* XXX: the firmware should have taken care of this already */ #if 0 - if (sys_config.system_subtype == IP22_INDY) { + if (sys_config.system_subtype != IP22_INDIGO) { bus_space_write_4(sc->sc_ct, sc->sc_ch, IOC_BASE + IOC_GCSEL, 0xff); bus_space_write_4(sc->sc_ct, sc->sc_ch, |