diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-01-05 20:07:04 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-01-05 20:07:04 +0000 |
| commit | 0f9007bdf8052135f73f8435f523cc9d17c25c7e (patch) | |
| tree | 848d16d39c3849ffa1ff2996ffcf3c6db97c24e3 /sys/arch/mvme88k/dev | |
| parent | 58305188ee7cc98831887ace149141a9ebde3b53 (diff) | |
Stop masquerading the M8120 (no-slot MVME187) as a real MVME187, and keep
its value in brdtyp.
Compensate by checking for BRD_8120 everywhere BRD_187 was checked.
Diffstat (limited to 'sys/arch/mvme88k/dev')
| -rw-r--r-- | sys/arch/mvme88k/dev/pcctwo.c | 7 | ||||
| -rw-r--r-- | sys/arch/mvme88k/dev/sram.c | 5 | ||||
| -rw-r--r-- | sys/arch/mvme88k/dev/ssh.c | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/sys/arch/mvme88k/dev/pcctwo.c b/sys/arch/mvme88k/dev/pcctwo.c index 39eb2d53b12..fe61f985b77 100644 --- a/sys/arch/mvme88k/dev/pcctwo.c +++ b/sys/arch/mvme88k/dev/pcctwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcctwo.c,v 1.18 2003/10/05 20:27:48 miod Exp $ */ +/* $OpenBSD: pcctwo.c,v 1.19 2004/01/05 20:06:59 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt * All rights reserved. @@ -77,8 +77,8 @@ int pcctwo_scan(struct device *parent, void *child, void *args); int pcctwomatch(parent, vcf, args) -struct device *parent; -void *vcf, *args; + struct device *parent; + void *vcf, *args; { struct confargs *ca = args; struct pcctworeg *pcc2; @@ -86,6 +86,7 @@ void *vcf, *args; /* Bomb if wrong cpu */ switch (brdtyp) { case BRD_187: + case BRD_8120: pcc2 = (struct pcctworeg *)(IIOV(ca->ca_paddr) + PCC2_PCC2CHIP_OFF); break; case BRD_197: /* pcctwo is a child of buswitch XXX smurph */ diff --git a/sys/arch/mvme88k/dev/sram.c b/sys/arch/mvme88k/dev/sram.c index c56d894e4a7..485327593d1 100644 --- a/sys/arch/mvme88k/dev/sram.c +++ b/sys/arch/mvme88k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.13 2004/01/01 19:59:22 miod Exp $ */ +/* $OpenBSD: sram.c,v 1.14 2004/01/05 20:06:59 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -67,7 +67,7 @@ srammatch(parent, vcf, args) { struct confargs *ca = args; - if (brdtyp != BRD_187) /* The only one... */ + if (brdtyp != BRD_187 && brdtyp != BRD_8120) /* The only one... */ return (0); ca->ca_paddr = (void *)0xffe00000; @@ -87,6 +87,7 @@ sramattach(parent, self, args) switch (brdtyp) { #ifdef MVME187 case BRD_187: + case BRD_8120: sc->sc_len = 128*1024; /* always 128K */ break; #endif diff --git a/sys/arch/mvme88k/dev/ssh.c b/sys/arch/mvme88k/dev/ssh.c index 1a2bd72f0d5..9347dcc4483 100644 --- a/sys/arch/mvme88k/dev/ssh.c +++ b/sys/arch/mvme88k/dev/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.22 2004/01/04 01:14:04 miod Exp $ */ +/* $OpenBSD: ssh.c,v 1.23 2004/01/05 20:06:59 miod Exp $ */ /* * Copyright (c) 1994 Michael L. Hitch @@ -221,7 +221,7 @@ sshmatch(pdp, vcf, args) * Since the BUG will do the right thing, we'll defer a dummy read * from the controller and retry. */ - if (brdtyp == BRD_187 || brdtyp == BRD_197) { + if (brdtyp == BRD_187 || brdtyp == BRD_8120 || brdtyp == BRD_197) { struct mvmeprom_dskio dio; char buf[MVMEPROM_BLOCK_SIZE]; |