diff options
| author | ragge <ragge@NetBSD.org> | 1996-03-09 23:38:34 +0000 |
|---|---|---|
| committer | ragge <ragge@NetBSD.org> | 1996-03-09 23:38:34 +0000 |
| commit | 3a07f941baaef9a93cdcd2569d51d4a70bb54ade (patch) | |
| tree | 2e97fdb2382377f914bc83aaf0fe7bb93942e553 /sys/dev | |
| parent | 24b2b310ae3a4295b76cd5047413bde89fa1389d (diff) | |
Check on which SBI we are frobbing, not always 0.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/dec/qbus/uba.c | 11 | ||||
| -rw-r--r-- | sys/dev/dec/qbus/ubareg.h | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/sys/dev/dec/qbus/uba.c b/sys/dev/dec/qbus/uba.c index 2af09372d23..fb87c7c5c43 100644 --- a/sys/dev/dec/qbus/uba.c +++ b/sys/dev/dec/qbus/uba.c @@ -1,4 +1,4 @@ -/* $NetBSD: uba.c,v 1.18 1996/03/07 23:25:50 ragge Exp $ */ +/* $NetBSD: uba.c,v 1.19 1996/03/09 23:38:34 ragge Exp $ */ /* * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -1055,8 +1055,13 @@ uba_attach(parent, self, aux) sc->uh_mr = (void *)ubar->uba_map; sc->uh_type = DW780; sc->uh_physuba = (struct uba_regs *)kvtophys(sa->nexaddr); - ubaphys = UMEM780(sa->nexinfo); - ubaiophys = UMEM780(sa->nexinfo) + (UBAPAGES * NBPG); + if (parent->dv_unit == 0) { + ubaphys = UMEMA8600(sa->nexinfo); + ubaiophys = UMEMA8600(sa->nexinfo) + (UBAPAGES * NBPG); + } else { + ubaphys = UMEMB8600(sa->nexinfo); + ubaiophys = UMEMB8600(sa->nexinfo) + (UBAPAGES * NBPG); + } bcopy(&idsptch, &sc->uh_dw780, sizeof(struct ivec_dsp)); sc->uh_dw780.pushlarg = sc->uh_dev.dv_unit; sc->uh_dw780.hoppaddr = uba_dw780int; diff --git a/sys/dev/dec/qbus/ubareg.h b/sys/dev/dec/qbus/ubareg.h index bf435f78568..10671309281 100644 --- a/sys/dev/dec/qbus/ubareg.h +++ b/sys/dev/dec/qbus/ubareg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ubareg.h,v 1.5 1996/02/01 22:33:36 mycroft Exp $ */ +/* $NetBSD: ubareg.h,v 1.6 1996/03/09 23:38:36 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -317,7 +317,7 @@ struct uba_regs { #define UMEM8200(i) (0x20400000+(i)*0x40000) #endif -#if VAX8600 +#if VAX8600 || VAX780 #define UMEMA8600(i) (0x20100000+(i)*0x40000) #define UMEMB8600(i) (0x22100000+(i)*0x40000) #endif |
