2 files changed, 98 insertions, 106 deletions

diff --git a/sys/arch/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c
index dc47ddf252e..57b2baeeb36 100644
--- a/sys/arch/mvme68k/dev/cl.c
+++ b/sys/arch/mvme68k/dev/cl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cl.c,v 1.45 2009/03/01 21:37:41 miod Exp $ */
+/*	$OpenBSD: cl.c,v 1.46 2009/03/15 20:40:25 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -128,7 +128,7 @@ struct clsoftc {
 	char			sc_rxintrname[16 + 3];
 	char			sc_txintrname[16 + 3];
 	int			sc_flags;
-	u_int8_t		ssir;
+	void			*sc_softih;
 };
 
 const struct {
@@ -315,7 +315,7 @@ clattach(parent, self, aux)
 		sc->sc_cl[i].psupply = sc->sc_cl[i].buffer;
 		sc->sc_cl[i].nchar = 0;
 	}
-	sc->ssir = allocate_sir(cl_softint, (void *)sc);
+	sc->sc_softih = softintr_establish(IPL_SOFTTTY, cl_softint, sc);
 #endif
 	for (i = 0; i < CLCD_PORTS_PER_CHIP; i++) {
 #if 0
@@ -1973,7 +1973,7 @@ cl_appendbuf(sc, channel, c)
 		sc->sc_cl[channel].psupply = sc->sc_cl[channel].buffer;
 	}
 	sc->sc_cl[channel].nchar ++;
-	setsoftint(sc->ssir);
+	softintr_schedule(sc->sc_softih);
 	/* splx (s); */
 	
 }
@@ -2004,7 +2004,7 @@ cl_appendbufn(sc, channel, buf, cnt)
 		}
 		sc->sc_cl[channel].nchar ++;
 	}
-	setsoftint(sc->ssir);
+	softintr_schedule(sc->sc_softih);
 	/* splx (s); */
 }
 
diff --git a/sys/arch/mvme68k/dev/zs.c b/sys/arch/mvme68k/dev/zs.c
index c033c859a90..ac3e2a4fae8 100644
--- a/sys/arch/mvme68k/dev/zs.c
+++ b/sys/arch/mvme68k/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.26 2008/01/23 16:37:57 jsing Exp $ */
+/*	$OpenBSD: zs.c,v 1.27 2009/03/15 20:40:25 miod Exp $ */
 
 /*
  * Copyright (c) 2000 Steve Murphree, Jr.
@@ -109,10 +109,11 @@ struct zs {
 #define ZH_RXOVF	8	/* receiver buffer overflow */
 
 struct zssoftc {
-	struct device  sc_dev;
-	struct zs   sc_zs[2];
-	struct intrhand   sc_ih;
-	int      sc_flags;
+	struct device	 sc_dev;
+	struct zs	 sc_zs[2];
+	struct intrhand	 sc_ih;
+	void		*sc_softih;
+	int      	 sc_flags;
 };
 #define ZSSF_85230	1
 
@@ -129,7 +130,6 @@ int   zsirq(void *);
 int   zsregs(vaddr_t, int, volatile u_char **, volatile u_char **);
 int   zspclk(void);
 
-u_int8_t sir_zs;
 void  zs_softint(void *);
 
 #define zsunit(dev)	(minor(dev) >> 1)
@@ -159,9 +159,9 @@ void	zscc_mset(struct sccregs *, int);
 void	zscc_mclr(struct sccregs *, int);
 void	zs_drain(struct zs *);
 void	zs_unblock(struct tty *);
-void	zs_txint(struct zs *);
-void	zs_rxint(struct zs *);
-void	zs_extint(struct zs *);
+void	zs_txint(struct zssoftc *, struct zs *);
+void	zs_rxint(struct zssoftc *, struct zs *);
+void	zs_extint(struct zssoftc *, struct zs *);
 cons_decl(zs);
 
 int
@@ -263,8 +263,7 @@ zsattach(parent, self, args)
 	zp->scc.s_dr = scc_dr;
 	zp->flags |= ZS_RESET;
 
-	if (sir_zs == 0)
-		sir_zs = allocate_sir(zs_softint, 0);
+	sc->sc_softih = softintr_establish(IPL_SOFTTTY, zs_softint, sc);
 
 	printf("\n");
 
@@ -535,7 +534,7 @@ zsstart(tp)
 			zp->send_ptr = tp->t_outq.c_cf;
 			zp->send_count = n;
 			zp->sent_count = 0;
-			zs_txint(zp);
+			zs_txint(sc, zp);
 			spltty();
 		}
 	}
@@ -759,26 +758,25 @@ zsirq(arg)
 	if (ipend == 0)
 		return (0);
 	if ((ipend & 0x20) != 0)
-		zs_rxint(zp);
+		zs_rxint(sc, zp);
 	if ((ipend & 0x10) != 0)
-		zs_txint(zp);
+		zs_txint(sc, zp);
 	if ((ipend & 0x8) != 0)
-		zs_extint(zp);
+		zs_extint(sc, zp);
 	++zp;				/* now look for B side ints */
 	if ((ipend & 0x4) != 0)
-		zs_rxint(zp);
+		zs_rxint(sc, zp);
 	if ((ipend & 0x2) != 0)
-		zs_txint(zp);
+		zs_txint(sc, zp);
 	if ((ipend & 0x1) != 0)
-		zs_extint(zp);
+		zs_extint(sc, zp);
 	ZWRITE0(&zp->scc, 0x38);	/* reset highest IUS */
 
 	return (1);
 }
 
 void
-zs_txint(zp)
-	register struct zs *zp;
+zs_txint(struct zssoftc *sc, struct zs *zp)
 {
 	struct sccregs *scc;
 	int     c;
@@ -798,14 +796,13 @@ zs_txint(zp)
 		if (zp->send_count == 0 && (zp->hflags & ZH_TXING) != 0) {
 			zp->hflags &= ~ZH_TXING;
 			zp->hflags |= ZH_SIRQ;
-			setsoftint(sir_zs);
+			softintr_schedule(sc->sc_softih);
 		}
 	}
 }
 
 void
-zs_rxint(zp)
-	register struct zs *zp;
+zs_rxint(struct zssoftc *sc, struct zs *zp)
 {
 	register int stat, c, n, extra;
 	u_char *put;
@@ -846,14 +843,13 @@ zs_rxint(zp)
 		zp->rcv_put = put;
 		zp->rcv_count = n;
 		zp->hflags |= ZH_SIRQ;
-		setsoftint(sir_zs);
+		softintr_schedule(sc->sc_softih);
 	}
 }
 
 /* Ext/status interrupt */
 void
-zs_extint(zp)
-	register struct zs *zp;
+zs_extint(struct zssoftc *sc, struct zs *zp)
 {
 	int     rr0;
 	struct tty *tp = zp->tty;
@@ -875,13 +871,13 @@ zs_extint(zp)
 		else {
 			zp->hflags &= ~ZH_OBLOCK;
 			if ((rr0 & SCC_TXRDY) != 0)
-				zs_txint(zp);
+				zs_txint(sc, zp);
 		}
 	}
 	zp->modem_change |= rr0 ^ zp->modem_state;
 	zp->modem_state = rr0;
 	zp->hflags |= ZH_SIRQ;
-	setsoftint(sir_zs);
+	softintr_schedule(sc->sc_softih);
 }
 
 /* ARGSUSED */
@@ -889,97 +885,93 @@ void
 zs_softint(arg)
 	void *arg;
 {
+	struct zssoftc *sc = (struct zssoftc *)arg;
 	int     s, c, stat, rr0;
 	struct zs *zp;
 	struct tty *tp;
 	u_char *get;
-	int     unit, side;
+	int     side;
 
 	s = splzs();
-	for (unit = 0; unit < zs_cd.cd_ndevs; ++unit) {
-		if (zs_cd.cd_devs[unit] == NULL)
+	zp = &sc->sc_zs[0];
+	for (side = 0; side < 2; ++side, ++zp) {
+		if ((zp->hflags & ZH_SIRQ) == 0)
 			continue;
-		zp = &((struct zssoftc *) zs_cd.cd_devs[unit])->sc_zs[0];
-		for (side = 0; side < 2; ++side, ++zp) {
-			if ((zp->hflags & ZH_SIRQ) == 0)
-				continue;
-			zp->hflags &= ~ZH_SIRQ;
-			tp = zp->tty;
+		zp->hflags &= ~ZH_SIRQ;
+		tp = zp->tty;
 
-			/* check for tx done */
-			spltty();
-			if (tp != NULL && zp->send_count == 0
-				 && (tp->t_state & TS_BUSY) != 0) {
-				tp->t_state &= ~(TS_BUSY | TS_FLUSH);
-				ndflush(&tp->t_outq, zp->sent_count);
-				if (tp->t_outq.c_cc <= tp->t_lowat) {
-					if (tp->t_state & TS_ASLEEP) {
-						tp->t_state &= ~TS_ASLEEP;
-						wakeup((caddr_t) & tp->t_outq);
-					}
-					selwakeup(&tp->t_wsel);
+		/* check for tx done */
+		spltty();
+		if (tp != NULL && zp->send_count == 0
+			 && (tp->t_state & TS_BUSY) != 0) {
+			tp->t_state &= ~(TS_BUSY | TS_FLUSH);
+			ndflush(&tp->t_outq, zp->sent_count);
+			if (tp->t_outq.c_cc <= tp->t_lowat) {
+				if (tp->t_state & TS_ASLEEP) {
+					tp->t_state &= ~TS_ASLEEP;
+					wakeup((caddr_t) & tp->t_outq);
 				}
-				if (tp->t_line != 0)
-					(*linesw[tp->t_line].l_start) (tp);
-				else
-					zsstart(tp);
+				selwakeup(&tp->t_wsel);
 			}
-			splzs();
+			if (tp->t_line != 0)
+				(*linesw[tp->t_line].l_start) (tp);
+			else
+				zsstart(tp);
+		}
+		splzs();
 
-			/* check for received characters */
-			get = zp->rcv_get;
-			while (zp->rcv_count > 0) {
+		/* check for received characters */
+		get = zp->rcv_get;
+		while (zp->rcv_count > 0) {
+			c = *get++;
+			if (get >= zp->rcv_end)
+				get = zp->rcv_buf;
+			if (c == ERROR_DET) {
+				stat = *get++;
+				if (get >= zp->rcv_end)
+					get = zp->rcv_buf;
 				c = *get++;
 				if (get >= zp->rcv_end)
 					get = zp->rcv_buf;
-				if (c == ERROR_DET) {
-					stat = *get++;
-					if (get >= zp->rcv_end)
-						get = zp->rcv_buf;
-					c = *get++;
-					if (get >= zp->rcv_end)
-						get = zp->rcv_buf;
-					zp->rcv_count -= 3;
-				} else {
-					stat = 0;
-					--zp->rcv_count;
+				zp->rcv_count -= 3;
+			} else {
+				stat = 0;
+				--zp->rcv_count;
+			}
+			spltty();
+			if (tp == NULL || (tp->t_state & TS_ISOPEN) == 0)
+				continue;
+			if (zp->nzs_open == 0) {
+			} else {
+				if ((stat & 0x10) != 0)
+					c |= TTY_PE;
+				if ((stat & 0x20) != 0) {
+					log(LOG_WARNING, "zs: fifo overflow\n");
+					c |= TTY_FE;	/* need some error for
+							 * slip stuff */
 				}
+				if ((stat & 0x40) != 0)
+					c |= TTY_FE;
+				(*linesw[tp->t_line].l_rint) (c, tp);
+			}
+			splzs();
+		}
+		zp->rcv_get = get;
+
+		/* check for modem lines changing */
+		while (zp->modem_change != 0 || zp->modem_state != zp->rr0) {
+			rr0 = zp->rr0 ^ zp->modem_change;
+			zp->modem_change = rr0 ^ zp->modem_state;
+
+			/* Check if DCD (carrier detect) has changed */
+			if (tp != NULL && (rr0 & 8) != (zp->rr0 & 8)) {
 				spltty();
-				if (tp == NULL || (tp->t_state & TS_ISOPEN) == 0)
-					continue;
-				if (zp->nzs_open == 0) {
-					
-				} else {
-					if ((stat & 0x10) != 0)
-						c |= TTY_PE;
-					if ((stat & 0x20) != 0) {
-						log(LOG_WARNING, "zs: fifo overflow\n");
-						c |= TTY_FE;	/* need some error for
-								 * slip stuff */
-					}
-					if ((stat & 0x40) != 0)
-						c |= TTY_FE;
-					(*linesw[tp->t_line].l_rint) (c, tp);
-				}
+				ttymodem(tp, rr0 & 8);
+				/* XXX possibly should disable line if
+				 * return value is 0 */
 				splzs();
 			}
-			zp->rcv_get = get;
-
-			/* check for modem lines changing */
-			while (zp->modem_change != 0 || zp->modem_state != zp->rr0) {
-				rr0 = zp->rr0 ^ zp->modem_change;
-				zp->modem_change = rr0 ^ zp->modem_state;
-
-				/* Check if DCD (carrier detect) has changed */
-				if (tp != NULL && (rr0 & 8) != (zp->rr0 & 8)) {
-					spltty();
-					ttymodem(tp, rr0 & 8);
-					/* XXX possibly should disable line if
-					 * return value is 0 */
-					splzs();
-				}
-				zp->rr0 = rr0;
-			}
+			zp->rr0 = rr0;
 		}
 	}
 	splx(s);