diff options
Diffstat (limited to 'sys')
| -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 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/locore_c_routines.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/m8820x.c | 3 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/machdep.c | 12 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/pmap_table.c | 3 |
8 files changed, 23 insertions, 19 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]; diff --git a/sys/arch/mvme88k/mvme88k/locore_c_routines.c b/sys/arch/mvme88k/mvme88k/locore_c_routines.c index 0152ec2588f..79e15d5d706 100644 --- a/sys/arch/mvme88k/mvme88k/locore_c_routines.c +++ b/sys/arch/mvme88k/mvme88k/locore_c_routines.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore_c_routines.c,v 1.37 2003/10/11 22:07:47 miod Exp $ */ +/* $OpenBSD: locore_c_routines.c,v 1.38 2004/01/05 20:07:03 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -457,6 +457,7 @@ getipl(void) #endif /* MVME188 */ #if defined(MVME187) || defined(MVME197) case BRD_187: + case BRD_8120: case BRD_197: curspl = *md.intr_mask & 0x07; break; @@ -491,6 +492,7 @@ setipl(unsigned level) #endif /* MVME188 */ #if defined(MVME187) || defined(MVME197) case BRD_187: + case BRD_8120: case BRD_197: curspl = *md.intr_mask & 0x07; *md.intr_mask = level; diff --git a/sys/arch/mvme88k/mvme88k/m8820x.c b/sys/arch/mvme88k/mvme88k/m8820x.c index 75a92234f25..8ab72ad6582 100644 --- a/sys/arch/mvme88k/mvme88k/m8820x.c +++ b/sys/arch/mvme88k/mvme88k/m8820x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m8820x.c,v 1.26 2004/01/02 17:08:57 miod Exp $ */ +/* $OpenBSD: m8820x.c,v 1.27 2004/01/05 20:07:03 miod Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -370,6 +370,7 @@ m8820x_setup_board_config() switch (brdtyp) { #ifdef MVME187 case BRD_187: + case BRD_8120: /* There is no WHOAMI reg on MVME187 - fake it... */ vme188_config = 10; m8820x_cmmu[0].cmmu_regs = (void *)SBC_CMMU_I; diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index a65ea338769..1689024f4b6 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.126 2004/01/04 01:43:16 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.127 2004/01/05 20:07:03 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -519,6 +519,7 @@ cpu_startup() switch (brdtyp) { #ifdef MVME187 case BRD_187: + case BRD_8120: /* * Grab the SRAM space that we hardwired in pmap_bootstrap */ @@ -1374,6 +1375,7 @@ setupiackvectors() switch (brdtyp) { #ifdef MVME187 case BRD_187: + case BRD_8120: #ifdef MAP_VEC /* do for MVME188 too */ vaddr = (u_char *)iomap_mapin(M187_IACK, NBPG, 1); #else @@ -2318,12 +2320,6 @@ mvme_bootstrap() bugbrdid(&brdid); brdtyp = brdid.model; - /* to support the M8120. It's based off of MVME187 */ - if (brdtyp == BRD_8120) { - brdtyp = BRD_187; - /* XXX Need to flag the 8120 has a second cl(4) device on-board */ - } - /* * set up interrupt and fp exception handlers * based on the machine. @@ -2345,6 +2341,7 @@ mvme_bootstrap() #endif /* MVME188 */ #ifdef MVME187 case BRD_187: + case BRD_8120: cmmu = &cmmu8820x; md.interrupt_func = &m187_ext_int; md.intr_mask = (u_char *)M187_IMASK; @@ -2376,6 +2373,7 @@ mvme_bootstrap() switch (brdtyp) { #ifdef MVME187 case BRD_187: + case BRD_8120: last_addr = memsize187(); break; #endif diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c index 86c3db4602d..fee273b8f19 100644 --- a/sys/arch/mvme88k/mvme88k/pmap.c +++ b/sys/arch/mvme88k/mvme88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.104 2004/01/04 22:51:55 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.105 2004/01/05 20:07:03 miod Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Miodrag Vallat * Copyright (c) 1998-2001 Steve Murphree, Jr. @@ -888,7 +888,7 @@ pmap_bootstrap(vaddr_t load_start, paddr_t *phys_start, paddr_t *phys_end, * used by the 1x7 ethernet driver. Remove this when that is fixed. * XXX -nivas */ - if (brdtyp == BRD_187 || brdtyp == BRD_197) { + if (brdtyp == BRD_187 || brdtyp == BRD_8120 || brdtyp == BRD_197) { *phys_start = vaddr; etherlen = ETHERPAGES * PAGE_SIZE; etherbuf = (void *)vaddr; diff --git a/sys/arch/mvme88k/mvme88k/pmap_table.c b/sys/arch/mvme88k/mvme88k/pmap_table.c index 890fcdbb836..45431e32026 100644 --- a/sys/arch/mvme88k/mvme88k/pmap_table.c +++ b/sys/arch/mvme88k/mvme88k/pmap_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_table.c,v 1.16 2003/10/11 22:08:57 miod Exp $ */ +/* $OpenBSD: pmap_table.c,v 1.17 2004/01/05 20:07:03 miod Exp $ */ /* * Mach Operating System @@ -76,6 +76,7 @@ pmap_table_build(void) switch (brdtyp) { #ifdef MVME187 case BRD_187: + case BRD_8120: return m187_board_table; #endif #ifdef MVME188 |