Module Name: src
Committed By: tsutsui
Date: Sat Nov 26 04:40:51 UTC 2011
Modified Files:
src/sys/arch/luna68k/dev: siotty.c
src/sys/arch/luna68k/include: intr.h
src/sys/arch/luna68k/luna68k: isr.c
Log Message:
Reorganize IPL for devices.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/luna68k/dev/siotty.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/luna68k/include/intr.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/luna68k/luna68k/isr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/dev/siotty.c
diff -u src/sys/arch/luna68k/dev/siotty.c:1.32 src/sys/arch/luna68k/dev/siotty.c:1.33
--- src/sys/arch/luna68k/dev/siotty.c:1.32 Wed Jul 27 14:17:54 2011
+++ src/sys/arch/luna68k/dev/siotty.c Sat Nov 26 04:40:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.32 2011/07/27 14:17:54 tsutsui Exp $ */
+/* $NetBSD: siotty.c,v 1.33 2011/11/26 04:40:50 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.32 2011/07/27 14:17:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.33 2011/11/26 04:40:50 tsutsui Exp $");
#include "opt_ddb.h"
@@ -202,7 +202,7 @@ siostart(struct tty *tp)
int s, c;
sc = device_lookup_private(&siotty_cd, minor(tp->t_dev));
- s = spltty();
+ s = splserial();
if (tp->t_state & (TS_BUSY|TS_TIMEOUT|TS_TTSTOP))
goto out;
if (!ttypull(tp))
@@ -222,7 +222,7 @@ siostop(struct tty *tp, int flag)
{
int s;
- s = spltty();
+ s = splserial();
if (TS_BUSY == (tp->t_state & (TS_BUSY|TS_TTSTOP))) {
/*
* Device is transmitting; must stop it.
@@ -282,7 +282,7 @@ sioparam(struct tty *tp, struct termios
wr4 |= (tp->t_cflag & CSTOPB) ? WR4_STOP2 : WR4_STOP1;
sc->sc_wr[WR4] = wr4;
- s = spltty();
+ s = splserial();
setsioreg(sc->sc_ctl, WR4, sc->sc_wr[WR4]);
setsioreg(sc->sc_ctl, WR3, sc->sc_wr[WR3]);
setsioreg(sc->sc_ctl, WR5, sc->sc_wr[WR5]);
@@ -303,7 +303,7 @@ siomctl(struct siotty_softc *sc, int con
val |= WR5_DTR;
if (control & TIOCM_RTS)
val |= WR5_RTS;
- s = spltty();
+ s = splserial();
wr5 = sc->sc_wr[WR5];
switch (op) {
case DMSET:
@@ -401,7 +401,7 @@ sioclose(dev_t dev, int flag, int mode,
(*tp->t_linesw->l_close)(tp, flag);
- s = spltty();
+ s = splserial();
siomctl(sc, TIOCM_BREAK, DMBIC);
#if 0 /* because unable to feed DTR signal */
if ((tp->t_cflag & HUPCL)
Index: src/sys/arch/luna68k/include/intr.h
diff -u src/sys/arch/luna68k/include/intr.h:1.13 src/sys/arch/luna68k/include/intr.h:1.14
--- src/sys/arch/luna68k/include/intr.h:1.13 Thu Jul 10 16:14:16 2008
+++ src/sys/arch/luna68k/include/intr.h Sat Nov 26 04:40:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.13 2008/07/10 16:14:16 tsutsui Exp $ */
+/* $NetBSD: intr.h,v 1.14 2011/11/26 04:40:51 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -44,8 +44,8 @@
#define splsoftbio() splraise1()
#define splsoftnet() splraise1()
#define splsoftserial() splraise1()
-#define splvm() spl7()
-#define splsched() spl7()
+#define splvm() splraise4()
+#define splsched() splraise5()
#define splhigh() spl7()
/* watch out for side effects */
Index: src/sys/arch/luna68k/luna68k/isr.c
diff -u src/sys/arch/luna68k/luna68k/isr.c:1.20 src/sys/arch/luna68k/luna68k/isr.c:1.21
--- src/sys/arch/luna68k/luna68k/isr.c:1.20 Mon Dec 20 00:25:36 2010
+++ src/sys/arch/luna68k/luna68k/isr.c Sat Nov 26 04:40:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.20 2010/12/20 00:25:36 matt Exp $ */
+/* $NetBSD: isr.c,v 1.21 2011/11/26 04:40:51 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.20 2010/12/20 00:25:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.21 2011/11/26 04:40:51 tsutsui Exp $");
/*
* Link and dispatch interrupts.
@@ -279,7 +279,7 @@ const uint16_t ipl2psl_table[NIPL] = {
[IPL_SOFTBIO] = PSL_S|PSL_IPL1,
[IPL_SOFTNET] = PSL_S|PSL_IPL1,
[IPL_SOFTSERIAL] = PSL_S|PSL_IPL1,
- [IPL_VM] = PSL_S|PSL_IPL7,
- [IPL_SCHED] = PSL_S|PSL_IPL7,
+ [IPL_VM] = PSL_S|PSL_IPL4,
+ [IPL_SCHED] = PSL_S|PSL_IPL5,
[IPL_HIGH] = PSL_S|PSL_IPL7,
};
