diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-11-09 17:32:28 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-11-09 17:32:28 +0000 |
| commit | 5b7265cc919c67ef59625027826fb5ed597a57d4 (patch) | |
| tree | eec509ec955c24704c93af95e8afe7cb70355f70 | |
| parent | c4819adfb371c4b8ea161ad8d6188da1738027cd (diff) | |
Get rid of IPL_TTYNOBUF, it was handled exactly like IPL_TTY for years.
| -rw-r--r-- | sys/arch/hp300/dev/apci.c | 5 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/dca.c | 5 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/intr.c | 3 | ||||
| -rw-r--r-- | sys/arch/hp300/include/intr.h | 3 |
4 files changed, 6 insertions, 10 deletions
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c index 86bbb2e4b8f..2eabbf09cf9 100644 --- a/sys/arch/hp300/dev/apci.c +++ b/sys/arch/hp300/dev/apci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apci.c,v 1.29 2007/01/06 20:09:12 miod Exp $ */ +/* $OpenBSD: apci.c,v 1.30 2007/11/09 17:32:25 miod Exp $ */ /* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */ /*- @@ -237,8 +237,7 @@ apciattach(parent, self, aux) /* Establish our interrupt handler. */ sc->sc_isr.isr_func = apciintr; sc->sc_isr.isr_arg = sc; - sc->sc_isr.isr_priority = - (sc->sc_flags & APCI_HASFIFO) ? IPL_TTY : IPL_TTYNOBUF; + sc->sc_isr.isr_priority = IPL_TTY; frodo_intr_establish(parent, fa->fa_line, &sc->sc_isr, self->dv_xname); /* Set soft carrier if requested by operator. */ diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c index a9c976b5297..2ff36491370 100644 --- a/sys/arch/hp300/dev/dca.c +++ b/sys/arch/hp300/dev/dca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dca.c,v 1.31 2006/01/01 11:59:37 miod Exp $ */ +/* $OpenBSD: dca.c,v 1.32 2007/11/09 17:32:25 miod Exp $ */ /* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */ /* @@ -235,8 +235,7 @@ dcaattach(parent, self, aux) sc->sc_isr.isr_func = dcaintr; sc->sc_isr.isr_arg = sc; sc->sc_isr.isr_ipl = ipl; - sc->sc_isr.isr_priority = - (sc->sc_flags & DCA_HASFIFO) ? IPL_TTY : IPL_TTYNOBUF; + sc->sc_isr.isr_priority = IPL_TTY; dio_intr_establish(&sc->sc_isr, self->dv_xname); sc->sc_flags |= DCA_ACTIVE; diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c index 84c560d8677..05efee7f737 100644 --- a/sys/arch/hp300/hp300/intr.c +++ b/sys/arch/hp300/hp300/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.18 2007/11/09 17:30:53 miod Exp $ */ +/* $OpenBSD: intr.c,v 1.19 2007/11/09 17:32:27 miod Exp $ */ /* $NetBSD: intr.c,v 1.5 1998/02/16 20:58:30 thorpej Exp $ */ /*- @@ -118,7 +118,6 @@ intr_computeipl() break; case IPL_TTY: - case IPL_TTYNOBUF: if (ipl > PSLTOIPL(hp300_ttyipl)) hp300_ttyipl = IPLTOPSL(ipl); break; diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h index db07ae7d614..9676a0f3c01 100644 --- a/sys/arch/hp300/include/intr.h +++ b/sys/arch/hp300/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.20 2007/05/25 21:27:15 krw Exp $ */ +/* $OpenBSD: intr.h,v 1.21 2007/11/09 17:32:27 miod Exp $ */ /* $NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $ */ /*- @@ -77,7 +77,6 @@ extern unsigned short hp300_vmipl; #define IPL_BIO 1 #define IPL_NET 2 #define IPL_TTY 3 -#define IPL_TTYNOBUF 4 /* XXX */ #define IPL_CLOCK 6 #define IPL_STATCLOCK 6 #define IPL_HIGH 7 |