diff options
| author | ragge <ragge@NetBSD.org> | 1996-07-11 19:33:50 +0000 |
|---|---|---|
| committer | ragge <ragge@NetBSD.org> | 1996-07-11 19:33:50 +0000 |
| commit | a5b04afcd8b67f9ffd6df09ba4a89e583ca5773a (patch) | |
| tree | 0925cd0ef520337129b3b1535bfe2e00f7c648b5 /sys/dev/dec | |
| parent | 38821d257d54f8d7b4c30da38c9996f9f2eddfb7 (diff) | |
Automatic changing of root device after boot now works.
Diffstat (limited to 'sys/dev/dec')
| -rw-r--r-- | sys/dev/dec/qbus/uba.c | 17 | ||||
| -rw-r--r-- | sys/dev/dec/qbus/ubavar.h | 3 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/dec/qbus/uba.c b/sys/dev/dec/qbus/uba.c index 3bdbea4eb5e..51483639f7a 100644 --- a/sys/dev/dec/qbus/uba.c +++ b/sys/dev/dec/qbus/uba.c @@ -1,4 +1,4 @@ -/* $NetBSD: uba.c,v 1.23 1996/07/01 20:17:56 ragge Exp $ */ +/* $NetBSD: uba.c,v 1.24 1996/07/11 19:33:56 ragge Exp $ */ /* * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -584,22 +584,16 @@ ubainit(uhp) int qbgetpri() { -#ifdef notyet int pri; - extern int cvec; - panic("qbgetpri"); for (pri = 0x17; pri > 0x14; ) { - if (cvec && cvec != 0x200) /* interrupted at pri */ + if (rcvec && rcvec != 0x200) /* interrupted at pri */ break; pri--; splx(pri - 1); } - (void) spl0(); + spl0(); return (pri); -#else - return 0x17; -#endif } #endif @@ -903,6 +897,11 @@ uba_attach(parent, self, aux) sc->uh_iopage = (void *)min + (sc->uh_memsize * NBPG); sc->uh_iarea = (void *)scb + NBPG + sa->nexinfo * NBPG; sc->uh_resno = 0; +#if VAX780 || VAX8600 || VAX750 + if ((cpunumber == VAX_780) || (cpunumber == VAX_8600) || + (cpunumber == VAX_750)) + sc->uh_nr = sa->nexnum * (parent->dv_unit + 1); +#endif /* * Create interrupt dispatchers for this uba. */ diff --git a/sys/dev/dec/qbus/ubavar.h b/sys/dev/dec/qbus/ubavar.h index a50194dc622..56f1ea34932 100644 --- a/sys/dev/dec/qbus/ubavar.h +++ b/sys/dev/dec/qbus/ubavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ubavar.h,v 1.16 1996/07/01 21:31:36 ragge Exp $ */ +/* $NetBSD: ubavar.h,v 1.17 1996/07/11 19:34:00 ragge Exp $ */ /* * Copyright (c) 1982, 1986 Regents of the University of California. @@ -100,6 +100,7 @@ struct uba_softc { #define UAMSIZ 100 struct map *uh_map; /* register free map */ struct ivec_dsp uh_dw780; /* Interrupt handles for DW780 */ + int uh_nr; /* Unibus sequential number */ }; /* given a pointer to uba_regs, find DWBUA registers */ |
