 @@ -1,14 +1,14 @@
-/* $NetBSD: ttycons.c,v 1.9 2011/12/12 16:06:15 jmcneill Exp $ */
+/* $NetBSD: ttycons.c,v 1.10 2011/12/12 16:39:16 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,27 +17,27 @@
  * ``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.9 2011/12/12 16:06:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttycons.c,v 1.10 2011/12/12 16:39:16 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>
 @@ -126,26 +126,28 @@ ttycons_attach(device_t parent, device_t
 	sc->sc_tty->t_oproc = ttycons_start;
 	sc->sc_tty->t_param = ttycons_param;
 	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 softint handler\n");
 	thunk_signal(SIGIO, ttycons_intr);
 	if (thunk_set_stdin_sigio(true) != 0)
 		panic("couldn't enable stdin async mode");
+}
 void
 ttycons_consinit(void)
+{
 	struct thunk_termios t;
 	thunk_tcgetattr(0, &t);
 	t.c_lflag &= ~(ECHO|ICANON);
 	t.c_cc[VTIME] = 0;
 	t.c_cc[VMIN] = 1;
 	thunk_tcsetattr(0, TCSANOW, &t);

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.h,v 1.36 2011/12/11 22:33:49 jmcneill Exp $ */
+/* $NetBSD: thunk.h,v 1.37 2011/12/12 16:39:16 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 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.
 @@ -82,26 +82,27 @@ void	thunk_abort(void);
 int	thunk_geterrno(void);
 void	thunk_seterrno(int err);
 int	thunk_getcontext(ucontext_t *);
 int	thunk_setcontext(const ucontext_t *);
 void	thunk_makecontext(ucontext_t *ucp, void (*func)(void),
 		int nargs, void *arg1, void *arg2, void *arg3);
 int	thunk_swapcontext(ucontext_t *, ucontext_t *);
 int	thunk_tcgetattr(int, struct thunk_termios *);
 int	thunk_tcsetattr(int, int, const struct thunk_termios *);
 int	thunk_set_stdin_sigio(int);
 int	thunk_pollchar(void);
 int	thunk_getchar(void);
 void	thunk_putchar(int);
 int	thunk_execv(const char *, char * const []);
 int	thunk_open(const char *, int, mode_t);
 int	thunk_fstat_getsize(int, ssize_t *, ssize_t *);
 ssize_t	thunk_pread(int, void *, size_t, off_t);
 ssize_t	thunk_pwrite(int, const void *, size_t, off_t);
 int	thunk_fsync(int);
 int	thunk_mkstemp(char *);
 int	thunk_unlink(const char *);

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.c,v 1.41 2011/12/11 22:33:49 jmcneill Exp $ */
+/* $NetBSD: thunk.c,v 1.42 2011/12/12 16:39:16 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 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.
 @@ -18,27 +18,27 @@
  * 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>
 #ifdef __NetBSD__
-__RCSID("$NetBSD: thunk.c,v 1.41 2011/12/11 22:33:49 jmcneill Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.42 2011/12/12 16:39:16 jmcneill Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/reboot.h>
 #include <sys/poll.h>
 #include <machine/vmparam.h>
 #include <aio.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 @@ -311,26 +311,41 @@ thunk_tcgetattr(int fd, struct thunk_ter
 	return 0;
+}
 int
 thunk_tcsetattr(int fd, int action, const struct thunk_termios *tt)
+{
 	struct termios t;
 	thunk_to_termios(tt, &t);
 	return tcsetattr(fd, action, &t);
+}
 int
 thunk_set_stdin_sigio(int onoff)
+{
 	int flags;
 	flags = fcntl(STDIN_FILENO, F_GETFL, 0);
 	if (onoff)
 		flags |= O_ASYNC;
 	else
 		flags &= ~O_ASYNC;
 	return fcntl(STDIN_FILENO, F_SETFL, flags);
+}
 int
 thunk_pollchar(void)
+{
 	struct pollfd fds[1];
 	fds[0].fd = STDIN_FILENO;
 	fds[0].events = POLLIN;
 	fds[0].revents = 0;
 	if (poll(fds, __arraycount(fds), 0) > 0) {
 		if (fds[0].revents & POLLIN) {
 			return getchar();
+		}
+	}