 @@ -1,14 +1,14 @@
-/*	$NetBSD: ser.c,v 1.42 2009/03/14 21:04:06 dsl Exp $	*/
+/*	$NetBSD: ser.c,v 1.43 2009/07/03 17:05:54 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -83,27 +83,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *      @(#)com.c       7.5 (Berkeley) 5/16/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.42 2009/03/14 21:04:06 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.43 2009/07/03 17:05:54 tsutsui Exp $");
 #include "opt_ddb.h"
 #include "opt_mbtype.h"
 #include "opt_serconsole.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/conf.h>
 @@ -190,26 +190,28 @@ struct ser_softc {
 	volatile u_char	 sc_rx_blocked;
 	volatile u_char	 sc_rx_ready;
 	volatile u_char	 sc_tx_busy;
 	volatile u_char	 sc_tx_done;
 	volatile u_char	 sc_tx_stopped;
 	volatile u_char	 sc_st_check;
  	u_char		*sc_tba;
  	int		 sc_tbc;
 	int		 sc_heldtbc;
 	volatile u_char	 sc_heldchange;
 	void		*sc_sicookie;
 };
 /*
  * For sc_hwflags:
  */
 #define	SER_HW_CONSOLE	0x01
 void	ser_break(struct ser_softc *, int);
 void	ser_hwiflow(struct ser_softc *, int);
 void	ser_iflush(struct ser_softc *);
 void	ser_loadchannelregs(struct ser_softc *);
 void	ser_modem(struct ser_softc *, int);
 void	serdiag(void *);
 @@ -225,28 +227,26 @@ struct consdev;
 void	sercnprobe(struct consdev *);
 void	sercninit(struct consdev *);
 int	sercngetc(dev_t);
 void	sercnputc(dev_t, int);
 void	sercnpollc(dev_t, int);
 static void sermsrint(struct ser_softc *, struct tty*);
 static void serrxint(struct ser_softc *, struct tty*);
 static void ser_shutdown(struct ser_softc *);
 static int serspeed(long);
 static void sersoft(void *);
 static void sertxint(struct ser_softc *, struct tty*);
 static volatile int ser_softintr_scheduled = 0;
 /*
  * Autoconfig stuff
  */
 static void serattach(struct device *, struct device *, void *);
 static int  sermatch(struct device *, struct cfdata *, void *);
 CFATTACH_DECL(ser, sizeof(struct ser_softc),
     sermatch, serattach, NULL, NULL);
 extern struct cfdriver ser_cd;
 dev_type_open(seropen);
 dev_type_close(serclose);
 @@ -287,26 +287,28 @@ serattach(struct device *pdp, struct dev
 	if (intr_establish(2, USER_VEC, 0, (hw_ifun_t)sermintr, sc) == NULL)
 		printf("serattach: Can't establish interrupt (2)\n");
 	if (intr_establish(14, USER_VEC, 0, (hw_ifun_t)sermintr, sc) == NULL)
 		printf("serattach: Can't establish interrupt (14)\n");
 	if (intr_establish(9, USER_VEC, 0, (hw_ifun_t)sertrintr, sc) == NULL)
 		printf("serattach: Can't establish interrupt (9)\n");
 	if (intr_establish(10, USER_VEC, 0, (hw_ifun_t)sertrintr, sc) == NULL)
 		printf("serattach: Can't establish interrupt (10)\n");
 	if (intr_establish(11, USER_VEC, 0, (hw_ifun_t)sertrintr, sc) == NULL)
 		printf("serattach: Can't establish interrupt (11)\n");
 	if (intr_establish(12, USER_VEC, 0, (hw_ifun_t)sertrintr, sc) == NULL)
 		printf("serattach: Can't establish interrupt (12)\n");
 	sc->sc_sicookie = softint_establish(SOFTINT_SERIAL, sersoft, sc);
 	ym2149_rts(1);
 	ym2149_dtr(1);
 	/*
 	 * Enable but mask interrupts...
 	 * XXX: Look at edge-sensitivity for DCD/CTS interrupts.
 	 */
 	MFP->mf_ierb |= IB_SCTS|IB_SDCD;
 	MFP->mf_iera |= IA_RRDY|IA_RERR|IA_TRDY|IA_TERR;
 	MFP->mf_imrb &= ~(IB_SCTS|IB_SDCD);
 	MFP->mf_imra &= ~(IA_RRDY|IA_RERR|IA_TRDY|IA_TERR);
 	callout_init(&sc->sc_diag_ch, 0);
 @@ -1142,28 +1144,26 @@ sermsrint(struct ser_softc *sc, struct t
+	}
 #ifdef SER_DEBUG
 	serstatus(sc, "sermsrint");
 #endif
+}
 void
 sersoft(void *arg)
+{
 	struct ser_softc *sc = arg;
 	struct tty	*tp;
 	ser_softintr_scheduled = 0;
 	tp = sc->sc_tty;
 	if (tp == NULL)
 		return;
 	if (!ISSET(tp->t_state, TS_ISOPEN) && (tp->t_wopen == 0))
 		return;
 	if (sc->sc_rx_ready) {
 		sc->sc_rx_ready = 0;
 		serrxint(sc, tp);
+	}
 	if (sc->sc_st_check) {
 @@ -1195,28 +1195,27 @@ sermintr(void *arg)
 		 * Stop output immediately if we lose the output
 		 * flow control signal or carrier detect.
 		 */
 		if (ISSET(~msr, sc->sc_msr_mask)) {
 			sc->sc_tbc = 0;
 			sc->sc_heldtbc = 0;
 #ifdef SER_DEBUG
 			serstatus(sc, "sermintr  ");
 #endif
+		}
 		sc->sc_st_check = 1;
+	}
-	if (!ser_softintr_scheduled)
+	softint_schedule(sc->sc_sicookie);
 		add_sicallback((si_farg)sersoft, sc, 0);
 	return 1;
+}
 int
 sertrintr(void *arg)
+{
 	struct ser_softc *sc = arg;
 	u_int	put, cc;
 	u_char	rsr, tsr;
 	put = sc->sc_rbput;
 	cc = sc->sc_rbavail;
 @@ -1276,29 +1275,27 @@ sertrintr(void *arg)
 			sc->sc_tbc = sc->sc_heldtbc;
 			sc->sc_heldtbc = 0;
+		}
 		/* Output the next character, if any. */
 		if (sc->sc_tbc > 0) {
 			MFP->mf_udr = *sc->sc_tba;
 			sc->sc_tbc--;
 			sc->sc_tba++;
 		} else if (sc->sc_tx_busy) {
 			sc->sc_tx_busy = 0;
 			sc->sc_tx_done = 1;
+		}
+	}
 	softint_schedule(sc->sc_sicookie);
 	if (!ser_softintr_scheduled)
 		add_sicallback((si_farg)sersoft, sc, 0);
 	return 1;
+}
 static int
 serspeed(long speed)
+{
 #define	divrnd(n, q)	(((n)*2/(q)+1)/2)	/* divide and round off */
 	int div, x, err;
 	if (speed <= 0)
 		return (-1);