Replace select backends with poll backends. selscan() and pollscan()

now call the poll backend.  With this change we implement greater
poll(2) functionality instead of emulating it via the select backend.
Adapted from NetBSD and including some changes from FreeBSD.
Tested by many, deraadt@ OK

16 files changed, 123 insertions, 131 deletions

diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index ea3f3018abf..05a07bba0df 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio.c,v 1.41 2003/01/26 23:16:14 jason Exp $	*/
+/*	$OpenBSD: audio.c,v 1.42 2003/09/23 16:51:12 millert Exp $	*/
 /*	$NetBSD: audio.c,v 1.105 1998/09/27 16:43:56 christos Exp $	*/
 
 /*
@@ -110,7 +110,7 @@ int	audio_close(dev_t, int, int, struct proc *);
 int	audio_read(dev_t, struct uio *, int);
 int	audio_write(dev_t, struct uio *, int);
 int	audio_ioctl(dev_t, u_long, caddr_t, int, struct proc *);
-int	audio_select(dev_t, int, struct proc *);
+int	audio_poll(dev_t, int, struct proc *);
 paddr_t	audio_mmap(dev_t, off_t, int);
 
 int	mixer_open(dev_t, struct audio_softc *, int, int, struct proc *);
@@ -762,7 +762,7 @@ audioioctl(dev, cmd, addr, flag, p)
 }
 
 int
-audioselect(dev, events, p)
+audiopoll(dev, events, p)
 	dev_t dev;
 	int events;
 	struct proc *p;
@@ -782,7 +782,7 @@ audioselect(dev, events, p)
 	switch (AUDIODEV(dev)) {
 	case SOUND_DEVICE:
 	case AUDIO_DEVICE:
-		error = audio_select(dev, events, p);
+		error = audio_poll(dev, events, p);
 		break;
 	case AUDIOCTL_DEVICE:
 	case MIXER_DEVICE:
@@ -1813,37 +1813,33 @@ audio_selwakeup(struct audio_softc *sc, int play)
     (sc->sc_mode & AUMODE_RECORD || sc->sc_pr.used <= sc->sc_pr.usedlow)
 
 int
-audio_select(dev, rw, p)
+audio_poll(dev, events, p)
 	dev_t dev;
-	int rw;
+	int events;
 	struct proc *p;
 {
 	int unit = AUDIOUNIT(dev);
 	struct audio_softc *sc = audio_cd.cd_devs[unit];
-	int rv, s = splaudio();
-
-	DPRINTF(("audio_select: rw=0x%x mode=%d\n", rw, sc->sc_mode));
-
-	switch (rw) {
+	int revents = 0, s = splaudio();
 
-	case FREAD:
-		rv = AUDIO_FILTREAD(sc);
-		splx(s);
-		if (rv)
-			return (1);
-		selrecord(p, &sc->sc_rsel);
-		break;
+	DPRINTF(("audio_poll: events=0x%x mode=%d\n", events, sc->sc_mode));
 
-	case FWRITE:
-		rv = AUDIO_FILTWRITE(sc);
-		splx(s);
-		if (rv)
-			return (1);
-		selrecord(p, &sc->sc_wsel);
-		break;
+	if (events & (POLLIN | POLLRDNORM)) {
+		if (AUDIO_FILTREAD(sc))
+			revents |= events & (POLLIN | POLLRDNORM);
+	}
+	if (events & (POLLOUT | POLLWRNORM)) {
+		if (AUDIO_FILTWRITE(sc))
+			revents |= events & (POLLOUT | POLLWRNORM);
+	}
+	if (revents == 0) {
+		if (events & (POLLIN | POLLRDNORM))
+			selrecord(p, &sc->sc_rsel);
+		if (events & (POLLOUT | POLLWRNORM))
+			selrecord(p, &sc->sc_wsel);
 	}
 	splx(s);
-	return (0);
+	return (revents);
 }
 
 paddr_t
diff --git a/sys/dev/cons.c b/sys/dev/cons.c
index 7d4f72dffea..acd5ffd5909 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cons.c,v 1.13 2003/08/15 20:32:16 tedu Exp $	*/
+/*	$OpenBSD: cons.c,v 1.14 2003/09/23 16:51:12 millert Exp $	*/
 /*	$NetBSD: cons.c,v 1.30 1996/04/08 19:57:30 jonathan Exp $	*/
 
 /*
@@ -203,14 +203,14 @@ cnioctl(dev, cmd, data, flag, p)
 
 /*ARGSUSED*/
 int
-cnselect(dev, rw, p)
+cnpoll(dev, rw, p)
 	dev_t dev;
 	int rw;
 	struct proc *p;
 {
 
 	/*
-	 * Redirect the select, if that's appropriate.
+	 * Redirect the poll, if that's appropriate.
 	 * I don't want to think of the possible side effects
 	 * of console redirection here.
 	 */
@@ -220,7 +220,7 @@ cnselect(dev, rw, p)
 		return ENXIO;
 	else
 		dev = cn_tab->cn_dev;
-	return (ttselect(cn_tab->cn_dev, rw, p));
+	return (ttpoll(cn_tab->cn_dev, rw, p));
 }
 
 
diff --git a/sys/dev/cons.h b/sys/dev/cons.h
index d35db22a99d..c19f27b88fc 100644
--- a/sys/dev/cons.h
+++ b/sys/dev/cons.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cons.h,v 1.12 2003/06/02 23:28:01 millert Exp $	*/
+/*	$OpenBSD: cons.h,v 1.13 2003/09/23 16:51:12 millert Exp $	*/
 /*	$NetBSD: cons.h,v 1.14 1996/03/14 19:08:35 christos Exp $	*/
 
 /*
@@ -79,7 +79,7 @@ int	cnclose(dev_t, int, int, struct proc *);
 int	cnread(dev_t, struct uio *, int);
 int	cnwrite(dev_t, struct uio *, int);
 int	cnioctl(dev_t, u_long, caddr_t, int, struct proc *);
-int	cnselect(dev_t, int, struct proc *);
+int	cnpoll(dev_t, int, struct proc *);
 int	cnkqfilter(dev_t, struct knote *);
 int	cngetc(void);
 void	cnputc(int);
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index c451bb6db23..1d76f57cdfa 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.92 2003/08/15 20:32:16 tedu Exp $	*/
+/*	$OpenBSD: com.c,v 1.93 2003/09/23 16:51:12 millert Exp $	*/
 /*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
 
 /*
@@ -344,11 +344,11 @@ com_attach_subr(sc)
 	timeout_set(&sc->sc_diag_tmo, comdiag, sc);
 	timeout_set(&sc->sc_dtr_tmo, com_raisedtr, sc);
 #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
-	sc->sc_si = softintr_establish(IPL_TTY, compoll, sc);
+	sc->sc_si = softintr_establish(IPL_TTY, comsoft, sc);
 	if (sc->sc_si == NULL)
 		panic("%s: can't establish soft interrupt.", sc->sc_dev.dv_xname);
 #else
-	timeout_set(&sc->sc_poll_tmo, compoll, sc);
+	timeout_set(&sc->sc_comsoft_tmo, comsoft, sc);
 #endif
 
 	/*
@@ -412,7 +412,7 @@ com_detach(self, flags)
 #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
 	softintr_disestablish(sc->sc_si);
 #else
-	timeout_del(&sc->sc_poll_tmo);
+	timeout_del(&sc->sc_comsoft_tmo);
 #endif
 
 	return (0);
@@ -516,7 +516,7 @@ comopen(dev, flag, mode, p)
 		ttsetwater(tp);
 
 #ifndef __HAVE_GENERIC_SOFT_INTERRUPTS
-		timeout_add(&sc->sc_poll_tmo, 1);
+		timeout_add(&sc->sc_comsoft_tmo, 1);
 #endif
 
 		sc->sc_ibufp = sc->sc_ibuf = sc->sc_ibufs[0];
@@ -677,7 +677,7 @@ comclose(dev, flag, mode, p)
 	}
 	CLR(tp->t_state, TS_BUSY | TS_FLUSH);
 #ifndef __HAVE_GENERIC_SOFT_INTERRUPTS
-	timeout_del(&sc->sc_poll_tmo);
+	timeout_del(&sc->sc_comsoft_tmo);
 #endif
 	sc->sc_cua = 0;
 	splx(s);
@@ -1148,7 +1148,7 @@ comdiag(arg)
 }
 
 void
-compoll(arg)
+comsoft(arg)
 	void *arg;
 {
 	struct com_softc *sc = (struct com_softc *)arg;
@@ -1213,7 +1213,7 @@ compoll(arg)
 
 out:
 #ifndef __HAVE_GENERIC_SOFT_INTERRUPTS
-	timeout_add(&sc->sc_poll_tmo, 1);
+	timeout_add(&sc->sc_comsoft_tmo, 1);
 #else
 	;
 #endif
diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h
index e70a88dc68c..fa1e2e34b19 100644
--- a/sys/dev/ic/comvar.h
+++ b/sys/dev/ic/comvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: comvar.h,v 1.33 2003/07/15 03:15:58 jason Exp $	*/
+/*	$OpenBSD: comvar.h,v 1.34 2003/09/23 16:51:12 millert Exp $	*/
 /*	$NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $	*/
 
 /*
@@ -79,7 +79,7 @@ struct com_softc {
 #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
 	void *sc_si;
 #else
-	struct timeout sc_poll_tmo;
+	struct timeout sc_comsoft_tmo;
 #endif
 
 	int sc_overflows;
@@ -144,7 +144,7 @@ int	comspeed(long, long);
 u_char	com_cflag2lcr(tcflag_t);
 int	comparam(struct tty *, struct termios *);
 void	comstart(struct tty *);
-void	compoll(void *);
+void	comsoft(void *);
 
 struct consdev;
 int	comcnattach(bus_space_tag_t, int, int, int, tcflag_t);
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index 0f66c382e8b..710f59d1456 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midi.c,v 1.8 2002/03/14 01:26:52 millert Exp $	*/
+/*	$OpenBSD: midi.c,v 1.9 2003/09/23 16:51:12 millert Exp $	*/
 /*	$NetBSD: midi.c,v 1.10 1998/12/20 14:26:44 drochner Exp $	*/
 
 /*
@@ -695,37 +695,34 @@ midiioctl(dev, cmd, addr, flag, p)
 }
 
 int
-midiselect(dev, rw, p)
+midipoll(dev, events, p)
 	dev_t dev;
-	int rw;
+	int events;
 	struct proc *p;
 {
 	int unit = MIDIUNIT(dev);
 	struct midi_softc *sc = midi_cd.cd_devs[unit];
-	int s = splaudio();
+	int revents = 0, s = splaudio();
 
-	DPRINTF(("midiselect: %p rw=0x%x\n", sc, rw));
+	DPRINTF(("midipoll: %p events=0x%x\n", sc, events));
 
-	switch (rw) {
-	case FREAD:
-		if (sc->inbuf.used > 0) {
-			splx(s);
-			return (1);
-		}
-		selrecord(p, &sc->rsel);
-		break;
-
-	case FWRITE:
-		if (sc->outbuf.used < sc->outbuf.usedhigh) {
-			splx(s);
-			return (1);
-		}
-		selrecord(p, &sc->wsel);
-		break;
+	if (events & (POLLIN | POLLRDNORM)) {
+		if (sc->inbuf.used > 0)
+			revents |= events & (POLLIN | POLLRDNORM);
+	}
+	if (events & (POLLOUT | POLLWRNORM)) {
+		if (sc->outbuf.used < sc->outbuf.usedhigh)
+			revents |= events & (POLLOUT | POLLWRNORM);
+	}
+	if (revents == 0) {
+		if (events & (POLLIN | POLLRDNORM))
+			selrecord(p, &sc->rsel);
+		if (events & (POLLOUT | POLLWRNORM))
+			selrecord(p, &sc->wsel);
 	}
 
 	splx(s);
-	return (0);
+	return (revents);
 }
 
 void
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index a90b8ebfde3..54b692e47a8 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rnd.c,v 1.63 2003/08/15 20:32:16 tedu Exp $	*/
+/*	$OpenBSD: rnd.c,v 1.64 2003/09/23 16:51:12 millert Exp $	*/
 
 /*
  * rnd.c -- A strong random number generator
@@ -246,6 +246,7 @@
 #include <sys/md5k.h>
 #include <sys/sysctl.h>
 #include <sys/timeout.h>
+#include <sys/poll.h>
 
 #include <dev/rndvar.h>
 #include <dev/rndioctl.h>
@@ -1021,22 +1022,23 @@ randomread(dev, uio, ioflag)
 }
 
 int
-randomselect(dev, rw, p)
+randompoll(dev, events, p)
 	dev_t	dev;
-	int	rw;
+	int	events;
 	struct proc *p;
 {
-	switch (rw) {
-	case FREAD:
+	int revents = 0;
+
+	if (events & (POLLIN | POLLRDNORM)) {
 		if (random_state.entropy_count > 0)
-			return (1);
+			revents |= events & (POLLIN | POLLRDNORM);
 		else
 			selrecord(p, &rnd_rsel);
-		break;
-	case FWRITE:
-		return 1;
 	}
-	return 0;
+	if (events & (POLLOUT | POLLWRNORM))
+		revents = events & (POLLOUT | POLLWRNORM); /* always writable */
+
+	return (revents);
 }
 
 int
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index 1faaf4f937c..222d1860015 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magma.c,v 1.11 2003/08/15 20:32:17 tedu Exp $	*/
+/*	$OpenBSD: magma.c,v 1.12 2003/09/23 16:51:12 millert Exp $	*/
 /*
  * magma.c
  *
@@ -1357,7 +1357,7 @@ mtty_param(struct tty *tp, struct termios *t)
  *	mbppread	read from mbpp
  *	mbppwrite	write to mbpp
  *	mbppioctl	do ioctl on mbpp
- *	mbppselect	do select on mbpp
+ *	mbpppoll	do poll on mbpp
  *	mbpp_rw		general rw routine
  *	mbpp_timeout	rw timeout
  *	mbpp_start	rw start after delay
@@ -1525,12 +1525,12 @@ mbppioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 }
 
 /*
- * select routine
+ * poll routine
  */
 int
-mbppselect(dev_t dev, int rw, struct proc *p)
+mbpppoll(dev_t dev, int events, struct proc *p)
 {
-	return (ENODEV);
+	return (seltrue(dev, events, p));
 }
 
 int
diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c
index c559c31517d..1bcbd07e547 100644
--- a/sys/dev/sbus/spif.c
+++ b/sys/dev/sbus/spif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spif.c,v 1.10 2003/08/15 20:32:17 tedu Exp $	*/
+/*	$OpenBSD: spif.c,v 1.11 2003/09/23 16:51:12 millert Exp $	*/
 
 /*
  * Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net)
@@ -97,7 +97,7 @@ int	sbppread(dev_t, struct uio *, int);
 int	sbppwrite(dev_t, struct uio *, int);
 int	sbpp_rw(dev_t, struct uio *);
 int	spifppcintr(void *);
-int	sbppselect(dev_t, int, struct proc *);
+int	sbpppoll(dev_t, int, struct proc *);
 int	sbppioctl(dev_t, u_long, caddr_t, int, struct proc *);
 
 struct cfattach spif_ca = {
@@ -1127,12 +1127,12 @@ sbpp_rw(dev, uio)
 }
 
 int
-sbppselect(dev, rw, p)
+sbpppoll(dev, events, p)
 	dev_t dev;
-	int rw;
+	int events;
 	struct proc *p;
 {
-	return (ENODEV);
+	return (seltrue(dev, events, p));
 }
 
 int
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index 75c56f9ded0..517a3fdc523 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sequencer.c,v 1.8 2002/07/27 08:01:47 nordin Exp $	*/
+/*	$OpenBSD: sequencer.c,v 1.9 2003/09/23 16:51:12 millert Exp $	*/
 /*	$NetBSD: sequencer.c,v 1.13 1998/11/25 22:17:07 augustss Exp $	*/
 
 /*
@@ -632,30 +632,31 @@ sequencerioctl(dev, cmd, addr, flag, p)
 }
 
 int
-sequencerselect(dev, rw, p)
+sequencerpoll(dev, events, p)
 	dev_t dev;
-	int rw;
+	int events;
 	struct proc *p;
 {
 	struct sequencer_softc *sc = &seqdevs[SEQUENCERUNIT(dev)];
+	int revents = 0;
 
-	DPRINTF(("sequencerselect: %p rw=0x%x\n", sc, rw));
+	DPRINTF(("sequencerpoll: %p rw=0x%x\n", sc, events));
 
-	switch (rw) {
-	case FREAD:
+	if (events & (POLLIN | POLLRDNORM)) {
 		if (!SEQ_QEMPTY(&sc->inq))
-			return (1);
-		selrecord(p, &sc->rsel);
-		break;
-
-	case FWRITE:
+			revents |= events & (POLLIN | POLLRDNORM);
+	}
+	if (events & (POLLOUT | POLLWRNORM)) {
 		if (SEQ_QLEN(&sc->outq) < sc->lowat)
-			return (1);
-		selrecord(p, &sc->wsel);
-		break;
+			revents |= events & (POLLOUT | POLLWRNORM);
 	}
-
-	return (0);
+	if (revents == 0) {
+		if (events & (POLLIN | POLLRDNORM))
+			selrecord(p, &sc->rsel);
+		if (events & (POLLOUT | POLLWRNORM))
+			selrecord(p, &sc->wsel);
+	}
+	return (revents);
 }
 
 void
diff --git a/sys/dev/systrace.c b/sys/dev/systrace.c
index d7c8972207d..0dfbbe5ff44 100644
--- a/sys/dev/systrace.c
+++ b/sys/dev/systrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systrace.c,v 1.31 2003/08/15 20:32:16 tedu Exp $	*/
+/*	$OpenBSD: systrace.c,v 1.32 2003/09/23 16:51:12 millert Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -45,6 +45,7 @@
 #include <sys/lock.h>
 #include <sys/pool.h>
 #include <sys/mount.h>
+#include <sys/poll.h>
 
 #include <compat/common/compat_util.h>
 
@@ -59,14 +60,14 @@ int	systraceclose(dev_t, int, int, struct proc *);
 int	systraceread(dev_t, struct uio *, int);
 int	systracewrite(dev_t, struct uio *, int);
 int	systraceioctl(dev_t, u_long, caddr_t, int, struct proc *);
-int	systraceselect(dev_t, int, struct proc *);
+int	systracepoll(dev_t, int, struct proc *);
 
 uid_t	systrace_seteuid(struct proc *,  uid_t);
 gid_t	systrace_setegid(struct proc *,  gid_t);
 int	systracef_read(struct file *, off_t *, struct uio *, struct ucred *);
 int	systracef_write(struct file *, off_t *, struct uio *, struct ucred *);
 int	systracef_ioctl(struct file *, u_long, caddr_t, struct proc *p);
-int	systracef_select(struct file *, int, struct proc *);
+int	systracef_poll(struct file *, int, struct proc *);
 int	systracef_kqfilter(struct file *, struct knote *);
 int	systracef_stat(struct file *, struct stat *, struct proc *);
 int	systracef_close(struct file *, struct proc *);
@@ -152,7 +153,7 @@ static struct fileops systracefops = {
 	systracef_read,
 	systracef_write,
 	systracef_ioctl,
-	systracef_select,
+	systracef_poll,
 	systracef_kqfilter,
 	systracef_stat,
 	systracef_close
@@ -361,26 +362,27 @@ systracef_ioctl(fp, cmd, data, p)
 
 /* ARGSUSED */
 int
-systracef_select(fp, which, p)
+systracef_poll(fp, events, p)
 	struct file *fp;
-	int which;
+	int events;
 	struct proc *p;
 {
 	struct fsystrace *fst = (struct fsystrace *)fp->f_data;
-	int ready = 0;
+	int revents = 0;
 
-	if (which != FREAD)
+	if ((events & (POLLIN | POLLRDNORM)) == 0)
 		return (0);
 
 	systrace_lock();
 	lockmgr(&fst->lock, LK_EXCLUSIVE, NULL, p);
 	systrace_unlock();
-	ready = TAILQ_FIRST(&fst->messages) != NULL;
-	if (!ready)
+	if (!TAILQ_EMPTY(&fst->messages))
+		revents = events & (POLLIN | POLLRDNORM);
+	else
 		selrecord(p, &fst->si);
 	lockmgr(&fst->lock, LK_RELEASE, NULL, p);
 
-	return (ready);
+	return (revents);
 }
 
 /* ARGSUSED */
@@ -558,12 +560,12 @@ systraceioctl(dev, cmd, data, flag, p)
 }
 
 int
-systraceselect(dev, rw, p)
+systracepoll(dev, events, p)
 	dev_t	dev;
-	int	rw;
+	int	events;
 	struct proc *p;
 {
-	return (0);
+	return (seltrue(dev, events, p));
 }
 
 void
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index d5ed452ed1b..dfcdd5598b6 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_port.h,v 1.44 2003/09/19 12:07:20 avsm Exp $ */
+/*	$OpenBSD: usb_port.h,v 1.45 2003/09/23 16:51:12 millert Exp $ */
 /*	$NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -286,12 +286,6 @@ typedef int usb_malloc_type;
 #define if_deactivate(x)
 #define IF_INPUT(ifp, m) ether_input_mbuf((ifp), (m))
 
-#define	usbpoll			usbselect
-#define	uhidpoll		uhidselect
-#define	ugenpoll		ugenselect
-#define	uriopoll		urioselect
-#define uscannerpoll		uscannerselect
-
 #define logprintf printf
 
 #define swap_bytes_change_sign16_le swap_bytes_change_sign16
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index c998d9a09f0..b910c825fd3 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.50 2003/02/23 19:08:11 tedu Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.51 2003/09/23 16:51:12 millert Exp $ */
 /* $NetBSD: wsdisplay.c,v 1.37.4.1 2000/06/30 16:27:53 simonb Exp $ */
 
 /*
@@ -1325,7 +1325,7 @@ wsdisplaymmap(dev, offset, prot)
 }
 
 int
-wsdisplayselect(dev, events, p)
+wsdisplaypoll(dev, events, p)
 	dev_t dev;
 	int events;
 	struct proc *p;
@@ -1339,7 +1339,7 @@ wsdisplayselect(dev, events, p)
 	scr = sc->sc_scr[WSDISPLAYSCREEN(dev)];
 
 	if (WSSCREEN_HAS_TTY(scr))
-		return (ttselect(dev, events, p));
+		return (ttpoll(dev, events, p));
 	else
 		return (0);
 }
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index c163ff838c7..6f2cffced0d 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbd.c,v 1.36 2003/08/15 20:32:18 tedu Exp $ */
+/* $OpenBSD: wskbd.c,v 1.37 2003/09/23 16:51:12 millert Exp $ */
 /* $NetBSD: wskbd.c,v 1.38 2000/03/23 07:01:47 thorpej Exp $ */
 
 /*
@@ -1075,7 +1075,7 @@ getkeyrepeat:
 }
 
 int
-wskbdselect(dev, events, p)
+wskbdpoll(dev, events, p)
 	dev_t dev;
 	int events;
 	struct proc *p;
diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index da37afa5662..668eb55a39d 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmouse.c,v 1.11 2003/06/02 23:28:04 millert Exp $ */
+/* $OpenBSD: wsmouse.c,v 1.12 2003/09/23 16:51:12 millert Exp $ */
 /* $NetBSD: wsmouse.c,v 1.12 2000/05/01 07:36:58 takemura Exp $ */
 
 /*
@@ -638,7 +638,7 @@ wsmouse_do_ioctl(sc, cmd, data, flag, p)
 #endif /* NWSMOUSE > 0 */
 
 int
-wsmouseselect(dev, events, p)
+wsmousepoll(dev, events, p)
 	dev_t dev;
 	int events;
 	struct proc *p;
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index 5d745573dae..a6af8aff3f6 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsmux.c,v 1.10 2002/10/12 01:09:44 krw Exp $	*/
+/*	$OpenBSD: wsmux.c,v 1.11 2003/09/23 16:51:12 millert Exp $	*/
 /*	$NetBSD: wsmux.c,v 1.9 2000/05/28 10:33:14 takemura Exp $	*/
 
 /*
@@ -294,7 +294,7 @@ wsmuxioctl(dev, cmd, data, flag, p)
 }
 
 int
-wsmuxselect(dev, events, p)
+wsmuxpoll(dev, events, p)
 	dev_t dev;
 	int events;
 	struct proc *p;