 @@ -1,14 +1,14 @@
-/* $NetBSD: ttycons.c,v 1.14 2011/12/21 10:02:45 reinoud Exp $ */
+/* $NetBSD: ttycons.c,v 1.15 2011/12/21 11:53:07 jmcneill Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,52 +17,53 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttycons.c,v 1.14 2011/12/21 10:02:45 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttycons.c,v 1.15 2011/12/21 11:53:07 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kauth.h>
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <dev/cons.h>
 #include <machine/mainbus.h>
 #include <machine/thunk.h>
 static int	ttycons_match(device_t, cfdata_t, void *);
 static void	ttycons_attach(device_t, device_t, void *);
 void		ttycons_consinit(void);
 struct ttycons_softc {
 	device_t	sc_dev;
 	struct tty	*sc_tty;
 	void		*sc_rd_sih;
 	void		*sc_ctrlc_sih;
 	u_char		sc_buf[1024];
 };
 dev_type_cngetc(ttycons_cngetc);
 dev_type_cnputc(ttycons_cnputc);
 dev_type_cnpollc(ttycons_cnpollc);
 static struct cnm_state ttycons_cnm_state;
 struct consdev ttycons_consdev = {
 	.cn_getc = ttycons_cngetc,
 	.cn_putc = ttycons_cnputc,
 	.cn_pollc = ttycons_cnpollc,
 	.cn_dev = NODEV,
 	.cn_pri = CN_NORMAL,
 @@ -119,26 +120,27 @@ static void
 ttycons_attach(device_t parent, device_t self, void *opaque)
+{
 	struct ttycons_softc *sc = device_private(self);
 	int maj;
 	aprint_naive("\n");
 	aprint_normal(": console\n");
 	sc->sc_dev = self;
 	sc->sc_tty = tty_alloc();
 	tty_attach(sc->sc_tty);
 	sc->sc_tty->t_oproc = ttycons_start;
 	sc->sc_tty->t_param = ttycons_param;
 	sc->sc_tty->t_sc = sc;
 	maj = cdevsw_lookup_major(&ttycons_cdevsw);
 	cn_tab->cn_dev = makedev(maj, device_unit(self));
 	sc->sc_tty->t_dev = cn_tab->cn_dev;
 	sc->sc_rd_sih = softint_establish(SOFTINT_SERIAL,
 	    ttycons_softintr, sc);
 	if (sc->sc_rd_sih == NULL)
 		panic("couldn't establish ttycons intr handler\n");
 	sc->sc_ctrlc_sih = softint_establish(SOFTINT_SERIAL,
 	    ttycons_softctrlc, sc);
 	if (sc->sc_ctrlc_sih == NULL)
 @@ -291,39 +293,39 @@ ttycons_ioctl(dev_t dev, u_long cmd, voi
 	if (error != EPASSTHROUGH)
 		return error;
 	error = ttioctl(t, cmd, data, flag, l);
 	if (error != EPASSTHROUGH)
 		return error;
 	return EPASSTHROUGH;
+}
 static void
 ttycons_start(struct tty *t)
+{
-	u_char buf[1024+1];
+	struct ttycons_softc *sc = t->t_sc;
-	u_char *p = buf;
+	u_char *p = sc->sc_buf;
 	int s, len, brem;
 	s = spltty();
 	if (t->t_state & (TS_TIMEOUT|TS_BUSY|TS_TTSTOP)) {
 		splx(s);
 		return;
+	}
 	t->t_state |= TS_BUSY;
 	splx(s);
-	brem = q_to_b(&t->t_outq, buf, sizeof(buf) - 1);
+	brem = q_to_b(&t->t_outq, sc->sc_buf, sizeof(sc->sc_buf));
 	while (brem > 0) {
 		len = thunk_write(1, p, brem);
 		if (len > 0) {
 			p += len;
 			brem -= len;
+		}
+	}
 	s = spltty();
 	t->t_state &= ~TS_BUSY;
 	if (ttypull(t)) {
 		t->t_state |= TS_TIMEOUT;