diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2005-11-21 18:16:48 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2005-11-21 18:16:48 +0000 |
| commit | 0bec780131c1105ad6cf2a2cbc989ee84ffdbb10 (patch) | |
| tree | 2286c902bd69d876f7d004015a7f4c743851e804 | |
| parent | eb01b2b7fa7f0eff236c6683e0369227aef6c5ae (diff) | |
Move contents of sys/select.h to sys/selinfo.h in preparation for a
userland-visible sys/select.h. Consistent with what Net and Free do.
OK deraadt@, tested with full ports build by naddy@.
83 files changed, 270 insertions, 214 deletions
diff --git a/include/unistd.h b/include/unistd.h index ae2e03e6e60..1a28ebc8a06 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: unistd.h,v 1.54 2005/11/20 02:24:59 millert Exp $ */ +/* $OpenBSD: unistd.h,v 1.55 2005/11/21 18:16:36 millert Exp $ */ /* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */ /*- @@ -190,7 +190,8 @@ int ruserok(const char *, int, const char *, const char *); int quotactl(const char *, int, int, char *); void *sbrk(int); -#if !defined(_XOPEN_SOURCE) +#if !defined(_XOPEN_SOURCE) && !defined(_SELECT_DEFINED_) +#define _SELECT_DEFINED_ int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); #endif diff --git a/sys/arch/alpha/alpha/promcons.c b/sys/arch/alpha/alpha/promcons.c index 836aceb0567..5ff451ef1ab 100644 --- a/sys/arch/alpha/alpha/promcons.c +++ b/sys/arch/alpha/alpha/promcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promcons.c,v 1.8 2003/10/03 16:44:46 miod Exp $ */ +/* $OpenBSD: promcons.c,v 1.9 2005/11/21 18:16:36 millert Exp $ */ /* $NetBSD: promcons.c,v 1.5 1996/11/13 22:20:55 cgd Exp $ */ /* @@ -31,7 +31,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/ioctl.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/tty.h> #include <sys/proc.h> #include <sys/user.h> diff --git a/sys/arch/arm/footbridge/footbridge_com.c b/sys/arch/arm/footbridge/footbridge_com.c index f799b6bb676..0912d165042 100644 --- a/sys/arch/arm/footbridge/footbridge_com.c +++ b/sys/arch/arm/footbridge/footbridge_com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: footbridge_com.c,v 1.5 2005/05/25 07:43:46 miod Exp $ */ +/* $OpenBSD: footbridge_com.c,v 1.6 2005/11/21 18:16:36 millert Exp $ */ /* $NetBSD: footbridge_com.c,v 1.13 2003/03/23 14:12:25 chris Exp $ */ /*- @@ -39,7 +39,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/ioctl.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/tty.h> #include <sys/proc.h> #include <sys/conf.h> diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c index 8d3e7770da7..4866deb63e1 100644 --- a/sys/arch/i386/isa/pccom.c +++ b/sys/arch/i386/isa/pccom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccom.c,v 1.48 2005/10/24 14:22:34 fgsch Exp $ */ +/* $OpenBSD: pccom.c,v 1.49 2005/11/21 18:16:36 millert Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -67,7 +67,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/ioctl.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/tty.h> #include <sys/proc.h> #include <sys/user.h> diff --git a/sys/arch/mac68k/dev/adb.c b/sys/arch/mac68k/dev/adb.c index cb421922eda..e83010937ed 100644 --- a/sys/arch/mac68k/dev/adb.c +++ b/sys/arch/mac68k/dev/adb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb.c,v 1.13 2003/09/23 16:51:11 millert Exp $ */ +/* $OpenBSD: adb.c,v 1.14 2005/11/21 18:16:37 millert Exp $ */ /* $NetBSD: adb.c,v 1.13 1996/12/16 16:17:02 scottr Exp $ */ /*- @@ -35,7 +35,7 @@ e* notice, this list of conditions and the following disclaimer in the #include <sys/device.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/poll.h> #include <sys/proc.h> #include <sys/signalvar.h> diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c index f28dff44802..58b6e247d5c 100644 --- a/sys/arch/macppc/dev/adb.c +++ b/sys/arch/macppc/dev/adb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb.c,v 1.14 2005/11/16 12:28:54 kettenis Exp $ */ +/* $OpenBSD: adb.c,v 1.15 2005/11/21 18:16:37 millert Exp $ */ /* $NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $ */ /*- @@ -35,7 +35,7 @@ #include <sys/device.h> #include <sys/fcntl.h> #include <sys/poll.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/systm.h> diff --git a/sys/arch/macppc/dev/aed.c b/sys/arch/macppc/dev/aed.c index 1cc6a227fd7..a48d481c710 100644 --- a/sys/arch/macppc/dev/aed.c +++ b/sys/arch/macppc/dev/aed.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aed.c,v 1.8 2003/10/16 03:54:48 deraadt Exp $ */ +/* $OpenBSD: aed.c,v 1.9 2005/11/21 18:16:37 millert Exp $ */ /* $NetBSD: aed.c,v 1.5 2000/03/23 06:40:33 thorpej Exp $ */ /* @@ -35,7 +35,7 @@ #include <sys/device.h> #include <sys/fcntl.h> #include <sys/poll.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/systm.h> diff --git a/sys/arch/macppc/dev/akbd.c b/sys/arch/macppc/dev/akbd.c index ffd16bf9f38..2d91faf27c8 100644 --- a/sys/arch/macppc/dev/akbd.c +++ b/sys/arch/macppc/dev/akbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: akbd.c,v 1.17 2005/10/15 15:01:23 martin Exp $ */ +/* $OpenBSD: akbd.c,v 1.18 2005/11/21 18:16:37 millert Exp $ */ /* $NetBSD: akbd.c,v 1.13 2001/01/25 14:08:55 tsubai Exp $ */ /* @@ -37,7 +37,7 @@ #include <sys/device.h> #include <sys/fcntl.h> #include <sys/poll.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/systm.h> diff --git a/sys/arch/macppc/dev/ams.c b/sys/arch/macppc/dev/ams.c index 50e38a5045b..8f70ac9f9f0 100644 --- a/sys/arch/macppc/dev/ams.c +++ b/sys/arch/macppc/dev/ams.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ams.c,v 1.10 2005/10/15 15:01:23 martin Exp $ */ +/* $OpenBSD: ams.c,v 1.11 2005/11/21 18:16:37 millert Exp $ */ /* $NetBSD: ams.c,v 1.11 2000/12/19 03:13:40 tsubai Exp $ */ /* @@ -35,7 +35,7 @@ #include <sys/device.h> #include <sys/fcntl.h> #include <sys/poll.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/systm.h> diff --git a/sys/arch/vax/vsa/lk201.c b/sys/arch/vax/vsa/lk201.c index 3413416ee00..3ffcdd36352 100644 --- a/sys/arch/vax/vsa/lk201.c +++ b/sys/arch/vax/vsa/lk201.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lk201.c,v 1.5 2002/03/14 03:16:02 millert Exp $ */ +/* $OpenBSD: lk201.c,v 1.6 2005/11/21 18:16:37 millert Exp $ */ /* * The LK201 keycode mapping routine is here, along with initialization @@ -8,7 +8,7 @@ #include <sys/param.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <dev/cons.h> #include <pmax/include/pmioctl.h> diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index f4217145118..9811ff3fe93 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_socket.c,v 1.33 2005/06/07 02:30:47 henning Exp $ */ +/* $OpenBSD: linux_socket.c,v 1.34 2005/11/21 18:16:37 millert Exp $ */ /* $NetBSD: linux_socket.c,v 1.14 1996/04/05 00:01:50 christos Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/tty.h> #include <sys/file.h> #include <sys/filedesc.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <net/if.h> diff --git a/sys/compat/svr4/svr4_net.c b/sys/compat/svr4/svr4_net.c index 2accdd81afe..5a7e45cf2db 100644 --- a/sys/compat/svr4/svr4_net.c +++ b/sys/compat/svr4/svr4_net.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_net.c,v 1.16 2003/09/23 16:51:12 millert Exp $ */ +/* $OpenBSD: svr4_net.c,v 1.17 2005/11/21 18:16:38 millert Exp $ */ /* $NetBSD: svr4_net.c,v 1.12 1996/09/07 12:40:51 mycroft Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/tty.h> #include <sys/file.h> #include <sys/filedesc.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/protosw.h> diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index c79643ec1d9..e636098820f 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_stream.c,v 1.18 2003/11/23 17:14:21 avsm Exp $ */ +/* $OpenBSD: svr4_stream.c,v 1.19 2005/11/21 18:16:38 millert Exp $ */ /* $NetBSD: svr4_stream.c,v 1.19 1996/12/22 23:00:03 fvdl Exp $ */ /* @@ -46,7 +46,7 @@ #include <sys/tty.h> #include <sys/file.h> #include <sys/filedesc.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/un.h> diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 01137c92a4c..cafb8d75310 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audio.c,v 1.46 2005/06/02 19:04:18 joris Exp $ */ +/* $OpenBSD: audio.c,v 1.47 2005/11/21 18:16:38 millert Exp $ */ /* $NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $ */ /* @@ -68,7 +68,7 @@ #include <sys/ioctl.h> #include <sys/fcntl.h> #include <sys/vnode.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/poll.h> #include <sys/malloc.h> #include <sys/proc.h> diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c index c8da5199b63..0a985814b3f 100644 --- a/sys/dev/eisa/if_ep_eisa.c +++ b/sys/dev/eisa/if_ep_eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_eisa.c,v 1.19 2004/10/29 19:35:13 miod Exp $ */ +/* $OpenBSD: if_ep_eisa.c,v 1.20 2005/11/21 18:16:39 millert Exp $ */ /* $NetBSD: if_ep_eisa.c,v 1.13 1997/04/18 00:50:33 cgd Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 2afb17b734a..9d1cb63e9bc 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com.c,v 1.107 2005/11/11 15:22:00 fgsch Exp $ */ +/* $OpenBSD: com.c,v 1.108 2005/11/21 18:16:39 millert Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -65,7 +65,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/ioctl.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/tty.h> #include <sys/proc.h> #include <sys/user.h> diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c index 897e889b369..cda20beff29 100644 --- a/sys/dev/ic/cy.c +++ b/sys/dev/ic/cy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy.c,v 1.24 2003/10/03 16:44:51 miod Exp $ */ +/* $OpenBSD: cy.c,v 1.25 2005/11/21 18:16:39 millert Exp $ */ /* * Copyright (c) 1996 Timo Rossi. * All rights reserved. @@ -63,7 +63,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/user.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index 7e337e5bc86..559c823ddc5 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elink3.c,v 1.65 2005/11/14 12:24:34 mickey Exp $ */ +/* $OpenBSD: elink3.c,v 1.66 2005/11/21 18:16:39 millert Exp $ */ /* $NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/ic/opl.c b/sys/dev/ic/opl.c index 02704e044e7..c18530ab414 100644 --- a/sys/dev/ic/opl.c +++ b/sys/dev/ic/opl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl.c,v 1.6 2003/10/21 18:58:49 jmc Exp $ */ +/* $OpenBSD: opl.c,v 1.7 2005/11/21 18:16:39 millert Exp $ */ /* $NetBSD: opl.c,v 1.7 1998/12/08 14:26:56 augustss Exp $ */ /* @@ -48,7 +48,7 @@ #include <sys/ioctl.h> #include <sys/syslog.h> #include <sys/device.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <machine/cpu.h> #include <machine/bus.h> diff --git a/sys/dev/ic/oplinstrs.c b/sys/dev/ic/oplinstrs.c index dd32b8faff9..3369277f4e0 100644 --- a/sys/dev/ic/oplinstrs.c +++ b/sys/dev/ic/oplinstrs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: oplinstrs.c,v 1.2 2001/05/01 02:21:42 mickey Exp $ */ +/* $OpenBSD: oplinstrs.c,v 1.3 2005/11/21 18:16:39 millert Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -6,7 +6,7 @@ #include <sys/ioctl.h> #include <sys/syslog.h> #include <sys/device.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <machine/bus.h> diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c index 49fb365dd79..f0a49a8f8f5 100644 --- a/sys/dev/isa/if_ef_isapnp.c +++ b/sys/dev/isa/if_ef_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ef_isapnp.c,v 1.19 2005/11/09 05:46:21 brad Exp $ */ +/* $OpenBSD: if_ef_isapnp.c,v 1.20 2005/11/21 18:16:40 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -35,7 +35,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <sys/queue.h> #include <sys/kernel.h> diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index ff53e8e86b6..9ffc03ca0b9 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_eg.c,v 1.26 2004/05/12 06:35:11 tedu Exp $ */ +/* $OpenBSD: if_eg.c,v 1.27 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */ /* @@ -48,7 +48,7 @@ #include <sys/errno.h> #include <sys/syslog.h> #include <sys/systm.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c index 0917638af9f..b47f468b294 100644 --- a/sys/dev/isa/if_ep_isa.c +++ b/sys/dev/isa/if_ep_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_isa.c,v 1.22 2004/12/26 21:22:13 miod Exp $ */ +/* $OpenBSD: if_ep_isa.c,v 1.23 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: if_ep_isa.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <sys/queue.h> diff --git a/sys/dev/isa/if_ep_isapnp.c b/sys/dev/isa/if_ep_isapnp.c index 10124ebffa9..bf03d7e625a 100644 --- a/sys/dev/isa/if_ep_isapnp.c +++ b/sys/dev/isa/if_ep_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_isapnp.c,v 1.8 2004/05/12 06:35:11 tedu Exp $ */ +/* $OpenBSD: if_ep_isapnp.c,v 1.9 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: if_ep_isapnp.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <sys/queue.h> diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c index f929276038f..e1cbd70790d 100644 --- a/sys/dev/isa/if_hp.c +++ b/sys/dev/isa/if_hp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hp.c,v 1.14 2004/09/28 01:02:14 brad Exp $ */ +/* $OpenBSD: if_hp.c,v 1.15 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: if_hp.c,v 1.21 1995/12/24 02:31:31 mycroft Exp $ */ /* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */ @@ -76,7 +76,7 @@ #include "bpfilter.h" #if NBPFILTER > 0 -#include <sys/select.h> +#include <sys/selinfo.h> #include <net/bpf.h> #endif diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c index e2cd42c2212..a25d22bc731 100644 --- a/sys/dev/isa/if_lc_isa.c +++ b/sys/dev/isa/if_lc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lc_isa.c,v 1.6 2005/11/14 12:28:00 mickey Exp $ */ +/* $OpenBSD: if_lc_isa.c,v 1.7 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: if_lc_isa.c,v 1.10 2001/06/13 10:46:03 wiz Exp $ */ /*- @@ -42,7 +42,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <sys/queue.h> diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c index a69740b7d73..7a087cccff5 100644 --- a/sys/dev/isa/if_ne_isa.c +++ b/sys/dev/isa/if_ne_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_isa.c,v 1.9 2005/10/22 23:26:05 brad Exp $ */ +/* $OpenBSD: if_ne_isa.c,v 1.10 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $ */ /*- @@ -47,7 +47,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c index 5b5aa32ff8b..b9b727224b7 100644 --- a/sys/dev/isa/if_ne_isapnp.c +++ b/sys/dev/isa/if_ne_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_isapnp.c,v 1.8 2005/10/22 23:26:05 brad Exp $ */ +/* $OpenBSD: if_ne_isapnp.c,v 1.9 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $ */ /*- @@ -47,7 +47,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c index bbd28ab4f60..2c90380701e 100644 --- a/sys/dev/isa/if_sm_isa.c +++ b/sys/dev/isa/if_sm_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sm_isa.c,v 1.5 2005/06/08 17:03:00 henning Exp $ */ +/* $OpenBSD: if_sm_isa.c,v 1.6 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: if_sm_isa.c,v 1.4 1998/07/05 06:49:14 jonathan Exp $ */ /*- @@ -47,7 +47,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/isa/midi_pcppi.c b/sys/dev/isa/midi_pcppi.c index ed303aef605..a0a4d61965c 100644 --- a/sys/dev/isa/midi_pcppi.c +++ b/sys/dev/isa/midi_pcppi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midi_pcppi.c,v 1.3 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: midi_pcppi.c,v 1.4 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: midi_pcppi.c,v 1.4 1998/11/25 22:17:06 augustss Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/malloc.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/audioio.h> #include <sys/midiio.h> diff --git a/sys/dev/isa/opl_ess.c b/sys/dev/isa/opl_ess.c index aadb1665631..8e1ba457f0a 100644 --- a/sys/dev/isa/opl_ess.c +++ b/sys/dev/isa/opl_ess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_ess.c,v 1.3 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: opl_ess.c,v 1.4 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: opl_ess.c,v 1.3 1998/12/08 14:26:57 augustss Exp $ */ /* @@ -44,7 +44,7 @@ #include <sys/malloc.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/audioio.h> #include <sys/midiio.h> diff --git a/sys/dev/isa/opl_isa.c b/sys/dev/isa/opl_isa.c index 24c0ed1de09..f59e1a754ce 100644 --- a/sys/dev/isa/opl_isa.c +++ b/sys/dev/isa/opl_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_isa.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: opl_isa.c,v 1.4 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: opl_isa.c,v 1.1 1998/08/26 13:33:59 augustss Exp $ */ /* @@ -44,7 +44,7 @@ #include <sys/malloc.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/audioio.h> #include <sys/midiio.h> diff --git a/sys/dev/isa/opl_sb.c b/sys/dev/isa/opl_sb.c index d817c6b71be..b0dd8ccf474 100644 --- a/sys/dev/isa/opl_sb.c +++ b/sys/dev/isa/opl_sb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_sb.c,v 1.3 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: opl_sb.c,v 1.4 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: opl_sb.c,v 1.4 1998/12/08 14:26:57 augustss Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/malloc.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/audioio.h> #include <sys/midiio.h> diff --git a/sys/dev/midisyn.c b/sys/dev/midisyn.c index b9a16aaa645..86e29965324 100644 --- a/sys/dev/midisyn.c +++ b/sys/dev/midisyn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midisyn.c,v 1.4 2003/02/24 23:57:11 tedu Exp $ */ +/* $OpenBSD: midisyn.c,v 1.5 2005/11/21 18:16:38 millert Exp $ */ /* $NetBSD: midisyn.c,v 1.5 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/ioctl.h> #include <sys/fcntl.h> #include <sys/vnode.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/sys/dev/midivar.h b/sys/dev/midivar.h index 2bc6bf0f412..427a841391c 100644 --- a/sys/dev/midivar.h +++ b/sys/dev/midivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: midivar.h,v 1.4 2004/10/01 04:08:45 jsg Exp $ */ +/* $OpenBSD: midivar.h,v 1.5 2005/11/21 18:16:38 millert Exp $ */ /* * Copyright (c) 2003, 2004 Alexandre Ratchov @@ -21,7 +21,7 @@ #include <dev/midi_if.h> #include <sys/device.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index d0e3bc25a1d..0b8fa974cbc 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auixp.c,v 1.1 2005/08/07 20:08:45 mickey Exp $ */ +/* $OpenBSD: auixp.c,v 1.2 2005/11/21 18:16:40 millert Exp $ */ /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */ /* @@ -58,7 +58,7 @@ #include <sys/device.h> #include <sys/conf.h> #include <sys/exec.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/audioio.h> #include <sys/queue.h> diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index 4670b2cccd7..99fd0455ce3 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_os.c,v 1.19 2004/06/29 12:24:57 mickey Exp $ */ +/* $OpenBSD: bktr_os.c,v 1.20 2005/11/21 18:16:41 millert Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */ /* @@ -74,7 +74,7 @@ #include <sys/signalvar.h> #include <sys/mman.h> #include <sys/poll.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/vnode.h> #include <vm/vm.h> @@ -147,7 +147,7 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, slow_msp_audio, CTLFLAG_RW, &bt848_slow_msp_audi #include <sys/signalvar.h> #include <sys/mman.h> #include <sys/poll.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/vnode.h> #if NRADIO > 0 #include <sys/radioio.h> diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h index 9ac715629ed..909f6d4cf5a 100644 --- a/sys/dev/pci/bktr/bktr_reg.h +++ b/sys/dev/pci/bktr/bktr_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_reg.h,v 1.7 2004/06/29 12:24:57 mickey Exp $ */ +/* $OpenBSD: bktr_reg.h,v 1.8 2005/11/21 18:16:41 millert Exp $ */ /* * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp $ * @@ -49,7 +49,7 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) #include <machine/bus.h> /* struct device */ #include <sys/device.h> -#include <sys/select.h> /* struct selinfo */ +#include <sys/selinfo.h> /* struct selinfo */ # ifdef DEBUG # define bootverbose 1 # else diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index 4788e48ecc3..605f886f440 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emuxki.c,v 1.20 2005/08/09 04:10:11 mickey Exp $ */ +/* $OpenBSD: emuxki.c,v 1.21 2005/11/21 18:16:41 millert Exp $ */ /* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */ /*- @@ -63,7 +63,7 @@ #include <sys/systm.h> #include <sys/param.h> #include <sys/audioio.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c index 945b7624135..b7bdc550c1e 100644 --- a/sys/dev/pci/esa.c +++ b/sys/dev/pci/esa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esa.c,v 1.9 2005/08/09 04:10:11 mickey Exp $ */ +/* $OpenBSD: esa.c,v 1.10 2005/11/21 18:16:41 millert Exp $ */ /* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */ /* @@ -51,7 +51,7 @@ #include <sys/device.h> #include <sys/conf.h> #include <sys/exec.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/audioio.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index 1886515574c..f44747dc6b1 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pci.c,v 1.25 2005/09/11 18:17:08 mickey Exp $ */ +/* $OpenBSD: if_ep_pci.c,v 1.26 2005/11/21 18:16:41 millert Exp $ */ /* $NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $ */ /* @@ -40,7 +40,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c index 6a0afd4bb35..c8f2414387f 100644 --- a/sys/dev/pci/opl_eso.c +++ b/sys/dev/pci/opl_eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_eso.c,v 1.4 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: opl_eso.c,v 1.5 2005/11/21 18:16:41 millert Exp $ */ /* $NetBSD: opl_eso.c,v 1.1 1999/07/12 15:13:31 kleink Exp $ */ /* @@ -53,7 +53,7 @@ #include <sys/malloc.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/audioio.h> #include <sys/midiio.h> diff --git a/sys/dev/pci/opl_yds.c b/sys/dev/pci/opl_yds.c index 8210c3c9787..4f378779d7a 100644 --- a/sys/dev/pci/opl_yds.c +++ b/sys/dev/pci/opl_yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_yds.c,v 1.4 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: opl_yds.c,v 1.5 2005/11/21 18:16:41 millert Exp $ */ /* $NetBSD$ */ /* @@ -45,7 +45,7 @@ #include <sys/malloc.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/audioio.h> #include <sys/midiio.h> diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c index b125b9c5876..0734bf9b600 100644 --- a/sys/dev/pcmcia/aic_pcmcia.c +++ b/sys/dev/pcmcia/aic_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic_pcmcia.c,v 1.11 2005/01/27 17:04:55 millert Exp $ */ +/* $OpenBSD: aic_pcmcia.c,v 1.12 2005/11/21 18:16:41 millert Exp $ */ /* $NetBSD: aic_pcmcia.c,v 1.6 1998/07/19 17:28:15 christos Exp $ */ /* @@ -32,7 +32,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <machine/cpu.h> diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index af370b32839..c9b7a549b35 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pcmcia.c,v 1.42 2005/09/26 22:32:06 miod Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.43 2005/11/21 18:16:41 millert Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /* @@ -98,7 +98,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/ioctl.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/tty.h> #include <sys/proc.h> #include <sys/user.h> diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c index 86c3b599966..ea78c4cf609 100644 --- a/sys/dev/pcmcia/if_awi_pcmcia.c +++ b/sys/dev/pcmcia/if_awi_pcmcia.c @@ -1,5 +1,5 @@ /* $NetBSD: if_awi_pcmcia.c,v 1.13 2000/03/22 11:22:20 onoe Exp $ */ -/* $OpenBSD: if_awi_pcmcia.c,v 1.15 2005/02/21 11:16:00 dlg Exp $ */ +/* $OpenBSD: if_awi_pcmcia.c,v 1.16 2005/11/21 18:16:42 millert Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -54,7 +54,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c index 41d7391843f..0c9bf9524c3 100644 --- a/sys/dev/pcmcia/if_ep_pcmcia.c +++ b/sys/dev/pcmcia/if_ep_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pcmcia.c,v 1.33 2005/06/08 17:03:01 henning Exp $ */ +/* $OpenBSD: if_ep_pcmcia.c,v 1.34 2005/11/21 18:16:42 millert Exp $ */ /* $NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $ */ /*- @@ -76,7 +76,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c index 30df0ad79f2..f04b25cb016 100644 --- a/sys/dev/pcmcia/if_ne_pcmcia.c +++ b/sys/dev/pcmcia/if_ne_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_pcmcia.c,v 1.82 2005/10/22 23:26:06 brad Exp $ */ +/* $OpenBSD: if_ne_pcmcia.c,v 1.83 2005/11/21 18:16:42 millert Exp $ */ /* $NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $ */ /* @@ -32,7 +32,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c index d57b051518f..78dbe79b69d 100644 --- a/sys/dev/pcmcia/if_sm_pcmcia.c +++ b/sys/dev/pcmcia/if_sm_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sm_pcmcia.c,v 1.23 2005/06/08 17:03:01 henning Exp $ */ +/* $OpenBSD: if_sm_pcmcia.c,v 1.24 2005/11/21 18:16:42 millert Exp $ */ /* $NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $ */ /*- @@ -47,7 +47,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/puc/com_puc.c b/sys/dev/puc/com_puc.c index 4a81caa0afd..13ce0303bae 100644 --- a/sys/dev/puc/com_puc.c +++ b/sys/dev/puc/com_puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_puc.c,v 1.9 2005/09/26 22:32:06 miod Exp $ */ +/* $OpenBSD: com_puc.c,v 1.10 2005/11/21 18:16:42 millert Exp $ */ /* * Copyright (c) 1997 - 1999, Jason Downs. All rights reserved. @@ -31,7 +31,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/ioctl.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/tty.h> #include <sys/proc.h> #include <sys/user.h> diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index 74d1ef0ba94..81eebcf7d50 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sequencer.c,v 1.10 2004/10/10 07:13:16 jsg Exp $ */ +/* $OpenBSD: sequencer.c,v 1.11 2005/11/21 18:16:38 millert Exp $ */ /* $NetBSD: sequencer.c,v 1.13 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -44,7 +44,7 @@ #include <sys/ioctl.h> #include <sys/fcntl.h> #include <sys/vnode.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/poll.h> #include <sys/malloc.h> #include <sys/proc.h> diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 013c47a9f53..4f619730749 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.51 2005/11/15 07:02:37 miod Exp $ */ +/* $OpenBSD: ehci.c,v 1.52 2005/11/21 18:16:42 millert Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -64,7 +64,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/queue.h> diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 136070e9045..88ff878ee35 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.63 2005/11/15 07:02:37 miod Exp $ */ +/* $OpenBSD: ohci.c,v 1.64 2005/11/21 18:16:42 millert Exp $ */ /* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -52,7 +52,7 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) #include <sys/kernel.h> #include <sys/device.h> -#include <sys/select.h> +#include <sys/selinfo.h> #elif defined(__FreeBSD__) #include <sys/module.h> #include <sys/bus.h> diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index 15bc4a7a5c7..d99470935ec 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uaudio.c,v 1.22 2005/08/01 05:36:48 brad Exp $ */ +/* $OpenBSD: uaudio.c,v 1.23 2005/11/21 18:16:43 millert Exp $ */ /* $NetBSD: uaudio.c,v 1.67 2003/05/03 18:11:41 wiz Exp $ */ /* @@ -53,7 +53,7 @@ #include <sys/tty.h> #include <sys/file.h> #include <sys/reboot.h> /* for bootverbose */ -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/device.h> diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 6dd8595bcca..dbbca010ade 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.12 2005/10/29 23:35:20 deraadt Exp $ */ +/* $OpenBSD: ubsa.c,v 1.13 2005/11/21 18:16:43 millert Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -77,11 +77,7 @@ #include <sys/conf.h> #include <sys/tty.h> #include <sys/file.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/proc.h> #include <sys/vnode.h> #include <sys/poll.h> diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 4233cb57650..7e023c17ba6 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucom.c,v 1.26 2005/04/08 04:30:17 deraadt Exp $ */ +/* $OpenBSD: ucom.c,v 1.27 2005/11/21 18:16:43 millert Exp $ */ /* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */ /* @@ -48,7 +48,7 @@ #include <sys/conf.h> #include <sys/tty.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/device.h> diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index e62083e9dd2..9bcc875d770 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugen.c,v 1.32 2005/08/01 05:36:48 brad Exp $ */ +/* $OpenBSD: ugen.c,v 1.33 2005/11/21 18:16:43 millert Exp $ */ /* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -58,7 +58,7 @@ #include <sys/conf.h> #include <sys/tty.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/poll.h> diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index caafb124f0d..f4d36abd899 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.40 2005/11/15 07:02:37 miod Exp $ */ +/* $OpenBSD: uhci.c,v 1.41 2005/11/21 18:16:43 millert Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -55,7 +55,7 @@ #include <sys/malloc.h> #if defined(__NetBSD__) || defined(__OpenBSD__) #include <sys/device.h> -#include <sys/select.h> +#include <sys/selinfo.h> #elif defined(__FreeBSD__) #include <sys/module.h> #include <sys/bus.h> diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 895866d1c58..4c6800311b3 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhid.c,v 1.27 2004/07/08 22:18:44 deraadt Exp $ */ +/* $OpenBSD: uhid.c,v 1.28 2005/11/21 18:16:43 millert Exp $ */ /* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -52,7 +52,7 @@ #include <sys/conf.h> #include <sys/tty.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/poll.h> diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 08bca6a2d01..6fd92e02d71 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ukbd.c,v 1.22 2005/07/18 07:41:38 jsg Exp $ */ +/* $OpenBSD: ukbd.c,v 1.23 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -54,7 +54,7 @@ #include <sys/ioctl.h> #include <sys/tty.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/poll.h> diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c index 7d00d8136a9..3ade0b8518c 100644 --- a/sys/dev/usb/umct.c +++ b/sys/dev/usb/umct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umct.c,v 1.15 2005/08/01 05:41:54 brad Exp $ */ +/* $OpenBSD: umct.c,v 1.16 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ #include <sys/conf.h> #include <sys/tty.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/device.h> diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c index 95fc9c1dc61..582e54cb5ef 100644 --- a/sys/dev/usb/umidi.c +++ b/sys/dev/usb/umidi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umidi.c,v 1.13 2005/09/07 05:27:47 jsg Exp $ */ +/* $OpenBSD: umidi.c,v 1.14 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ #include <sys/ioctl.h> #include <sys/conf.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/poll.h> diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c index d1cfe011191..38d34512a6f 100644 --- a/sys/dev/usb/umidi_quirks.c +++ b/sys/dev/usb/umidi_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umidi_quirks.c,v 1.6 2004/06/27 19:44:48 deraadt Exp $ */ +/* $OpenBSD: umidi_quirks.c,v 1.7 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/ioctl.h> #include <sys/conf.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/poll.h> diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index 2d01c98873e..c3f965cee40 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umodem.c,v 1.19 2005/09/28 00:20:12 dlg Exp $ */ +/* $OpenBSD: umodem.c,v 1.20 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ /* @@ -58,7 +58,7 @@ #include <sys/conf.h> #include <sys/tty.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/device.h> diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index 93fdcb0c536..25fc6991edf 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ums.c,v 1.15 2004/12/06 11:08:23 dlg Exp $ */ +/* $OpenBSD: ums.c,v 1.16 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -50,7 +50,7 @@ #include <sys/ioctl.h> #include <sys/tty.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/poll.h> diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 658fbd5e40f..1c743a3dde3 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uplcom.c,v 1.24 2005/08/01 05:36:49 brad Exp $ */ +/* $OpenBSD: uplcom.c,v 1.25 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ #include <sys/conf.h> #include <sys/tty.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/device.h> diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c index 4848370fff7..513eaf0557f 100644 --- a/sys/dev/usb/urio.c +++ b/sys/dev/usb/urio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: urio.c,v 1.19 2005/08/01 05:36:49 brad Exp $ */ +/* $OpenBSD: urio.c,v 1.20 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $ */ /* @@ -60,7 +60,7 @@ #endif #include <sys/conf.h> #include <sys/file.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/poll.h> diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 5f65b0597bf..7a4f88561a2 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.31 2005/10/11 09:09:21 dlg Exp $ */ +/* $OpenBSD: usb.c,v 1.32 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -57,7 +57,7 @@ #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/poll.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/vnode.h> #include <sys/signalvar.h> diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index 3a11114e216..c8baf80f50c 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_subr.c,v 1.40 2005/10/17 18:00:43 drahn Exp $ */ +/* $OpenBSD: usb_subr.c,v 1.41 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -45,7 +45,7 @@ #include <sys/malloc.h> #if defined(__NetBSD__) || defined(__OpenBSD__) #include <sys/device.h> -#include <sys/select.h> +#include <sys/selinfo.h> #elif defined(__FreeBSD__) #include <sys/module.h> #include <sys/bus.h> diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index d1c219f2469..c49018b5947 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscanner.c,v 1.18 2005/08/01 05:36:49 brad Exp $ */ +/* $OpenBSD: uscanner.c,v 1.19 2005/11/21 18:16:44 millert Exp $ */ /* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */ /* @@ -55,11 +55,7 @@ #endif #include <sys/tty.h> #include <sys/file.h> -#if defined(__FreeBSD__) && __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/proc.h> #include <sys/vnode.h> #include <sys/poll.h> diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c index 627663f90ca..ea030c1534c 100644 --- a/sys/dev/wscons/wsevent.c +++ b/sys/dev/wscons/wsevent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsevent.c,v 1.4 2005/05/15 11:29:15 miod Exp $ */ +/* $OpenBSD: wsevent.c,v 1.5 2005/11/21 18:16:45 millert Exp $ */ /* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */ /* @@ -83,7 +83,7 @@ #include <sys/proc.h> #include <sys/systm.h> #include <sys/vnode.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/poll.h> #include <dev/wscons/wsconsio.h> diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 5124454475f..0eabced16b6 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_event.c,v 1.25 2004/09/16 18:46:01 millert Exp $ */ +/* $OpenBSD: kern_event.c,v 1.26 2005/11/21 18:16:45 millert Exp $ */ /*- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org> @@ -37,7 +37,7 @@ #include <sys/file.h> #include <sys/filedesc.h> #include <sys/fcntl.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/queue.h> #include <sys/event.h> #include <sys/eventvar.h> diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h index b9b3c2e5a1d..b077f085ca0 100644 --- a/sys/net/bpfdesc.h +++ b/sys/net/bpfdesc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bpfdesc.h,v 1.15 2004/12/17 15:56:58 reyk Exp $ */ +/* $OpenBSD: bpfdesc.h,v 1.16 2005/11/21 18:16:45 millert Exp $ */ /* $NetBSD: bpfdesc.h,v 1.11 1995/09/27 18:30:42 thorpej Exp $ */ /* @@ -40,7 +40,7 @@ #ifndef _NET_BPFDESC_H_ #define _NET_BPFDESC_H_ -#include <sys/select.h> +#include <sys/selinfo.h> /* * Descriptor associated with each open bpf file. diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index b8895f48e93..1ec1a51b3d3 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.70 2005/11/17 11:08:52 henning Exp $ */ +/* $OpenBSD: if_tun.c,v 1.71 2005/11/21 18:16:45 millert Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -47,7 +47,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/file.h> #include <sys/time.h> #include <sys/device.h> diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h index 109b4099e02..3d761ad4143 100644 --- a/sys/sys/pipe.h +++ b/sys/sys/pipe.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipe.h,v 1.12 2004/06/24 19:35:26 tholo Exp $ */ +/* $OpenBSD: pipe.h,v 1.13 2005/11/21 18:16:46 millert Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -26,7 +26,7 @@ #ifndef _KERNEL #include <sys/time.h> /* for struct timeval */ -#include <sys/select.h> /* for struct selinfo */ +#include <sys/selinfo.h> /* for struct selinfo */ #include <uvm/uvm_extern.h> /* for vm_page_t */ #include <machine/param.h> /* for PAGE_SIZE */ #endif /* _KERNEL */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 642633e87e2..aecb2689f18 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.80 2005/09/14 20:55:59 kettenis Exp $ */ +/* $OpenBSD: proc.h,v 1.81 2005/11/21 18:16:46 millert Exp $ */ /* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #define _SYS_PROC_H_ #include <machine/proc.h> /* Machine-dependent proc substruct. */ -#include <sys/select.h> /* For struct selinfo. */ +#include <sys/selinfo.h> /* For struct selinfo. */ #include <sys/queue.h> #include <sys/timeout.h> /* For struct timeout. */ #include <sys/event.h> /* For struct klist */ diff --git a/sys/sys/select.h b/sys/sys/select.h index a19d36563eb..1f6a0df5b09 100644 --- a/sys/sys/select.h +++ b/sys/sys/select.h @@ -1,5 +1,4 @@ -/* $OpenBSD: select.h,v 1.6 2003/06/02 23:28:21 millert Exp $ */ -/* $NetBSD: select.h,v 1.10 1995/03/26 20:24:38 jtc Exp $ */ +/* $OpenBSD: select.h,v 1.7 2005/11/21 18:16:46 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -35,24 +34,63 @@ #ifndef _SYS_SELECT_H_ #define _SYS_SELECT_H_ -#include <sys/event.h> /* for struct klist */ +#include <sys/time.h> /* - * Used to maintain information about processes that wish to be - * notified when I/O becomes possible. + * Select uses bit masks of file descriptors in longs. These macros + * manipulate such bit fields (the filesystem macros use chars). + * FD_SETSIZE may be defined by the user, but the default here should + * be enough for most uses. */ -struct selinfo { - pid_t si_selpid; /* process to be notified */ - struct klist si_note; /* kernel note list */ - short si_flags; /* see below */ -}; -#define SI_COLL 0x0001 /* collision occurred */ +#ifndef FD_SETSIZE +#define FD_SETSIZE 1024 +#endif + +/* + * We don't want to pollute the namespace with select(2) internals. + * Non-underscore versions are exposed later. + */ +#define __NBBY 8 /* number of bits in a byte */ +typedef int32_t __fd_mask; +#define __NFDBITS (sizeof(__fd_mask) * __NBBY) /* bits per mask */ +#define __howmany(x, y) (((x) + ((y) - 1)) / (y)) +typedef struct fd_set { + __fd_mask fds_bits[__howmany(FD_SETSIZE, __NFDBITS)]; +} fd_set; + +#define FD_SET(n, p) \ + ((p)->fds_bits[(n) / __NFDBITS] |= (1 << ((n) % __NFDBITS))) +#define FD_CLR(n, p) \ + ((p)->fds_bits[(n) / __NFDBITS] &= ~(1 << ((n) % __NFDBITS))) +#define FD_ISSET(n, p) \ + ((p)->fds_bits[(n) / __NFDBITS] & (1 << ((n) % __NFDBITS))) #ifdef _KERNEL -struct proc; +#define FD_COPY(f, t) bcopy(f, t, sizeof(*(f))) +#define FD_ZERO(p) bzero(p, sizeof(*(p))) +#else +#define FD_COPY(f, t) memcpy(t, f, sizeof(*(f))) +#define FD_ZERO(p) memset(p, 0, sizeof(*(p))) +#endif + +#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) +#define NBBY __NBBY +#define fd_mask __fd_mask +#define NFDBITS __NFDBITS +#ifndef howmany +#define howmany(x, y) __howmany(x, y) +#endif +#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */ -void selrecord(struct proc *selector, struct selinfo *); -void selwakeup(struct selinfo *); +#ifndef _KERNEL +#ifndef _SELECT_DEFINED_ +#define _SELECT_DEFINED_ +#include <sys/cdefs.h> +__BEGIN_DECLS +struct timeval; +int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); +__END_DECLS #endif +#endif /* !_KERNEL */ #endif /* !_SYS_SELECT_H_ */ diff --git a/sys/sys/selinfo.h b/sys/sys/selinfo.h new file mode 100644 index 00000000000..497c2da9d19 --- /dev/null +++ b/sys/sys/selinfo.h @@ -0,0 +1,57 @@ +/* $OpenBSD: selinfo.h,v 1.1 2005/11/21 18:16:46 millert Exp $ */ + +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. 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. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 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. + * + * @(#)select.h 8.2 (Berkeley) 1/4/94 + */ + +#ifndef _SYS_SELINFO_H_ +#define _SYS_SELINFO_H_ + +#include <sys/event.h> /* for struct klist */ + +/* + * Used to maintain information about processes that wish to be + * notified when I/O becomes possible. + */ +struct selinfo { + pid_t si_selpid; /* process to be notified */ + struct klist si_note; /* kernel note list */ + short si_flags; /* see below */ +}; +#define SI_COLL 0x0001 /* collision occurred */ + +#ifdef _KERNEL +struct proc; + +void selrecord(struct proc *selector, struct selinfo *); +void selwakeup(struct selinfo *); +#endif + +#endif /* !_SYS_SELINFO_H_ */ diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 52198b65833..4d605a1ad41 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: socketvar.h,v 1.37 2005/05/27 17:16:13 dhartmei Exp $ */ +/* $OpenBSD: socketvar.h,v 1.38 2005/11/21 18:16:46 millert Exp $ */ /* $NetBSD: socketvar.h,v 1.18 1996/02/09 18:25:38 christos Exp $ */ /*- @@ -32,7 +32,7 @@ * @(#)socketvar.h 8.1 (Berkeley) 6/2/93 */ -#include <sys/select.h> /* for struct selinfo */ +#include <sys/selinfo.h> /* for struct selinfo */ #include <sys/queue.h> TAILQ_HEAD(soqhead, socket); diff --git a/sys/sys/tty.h b/sys/sys/tty.h index e34d3f18968..d2af7c8e052 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.h,v 1.19 2004/09/19 21:34:43 mickey Exp $ */ +/* $OpenBSD: tty.h,v 1.20 2005/11/21 18:16:46 millert Exp $ */ /* $NetBSD: tty.h,v 1.30.4.1 1996/06/02 09:08:13 mrg Exp $ */ /*- @@ -39,7 +39,7 @@ #include <sys/termios.h> #include <sys/queue.h> -#include <sys/select.h> /* For struct selinfo. */ +#include <sys/selinfo.h> /* For struct selinfo. */ #include <sys/timeout.h> #define KERN_TTY_TKNIN 1 /* quad: input chars */ diff --git a/sys/sys/types.h b/sys/sys/types.h index ebfa5347634..89df14acf37 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.26 2004/07/13 21:04:29 millert Exp $ */ +/* $OpenBSD: types.h,v 1.27 2005/11/21 18:16:46 millert Exp $ */ /* $NetBSD: types.h,v 1.29 1996/11/15 22:48:25 jtc Exp $ */ /*- @@ -153,39 +153,7 @@ __END_DECLS #endif #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) -#define NBBY 8 /* number of bits in a byte */ - -/* - * Select uses bit masks of file descriptors in longs. These macros - * manipulate such bit fields (the filesystem macros use chars). - * FD_SETSIZE may be defined by the user, but the default here should - * be enough for most uses. - */ -#ifndef FD_SETSIZE -#define FD_SETSIZE 1024 -#endif - -typedef int32_t fd_mask; -#define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ - -#ifndef howmany -#define howmany(x, y) (((x) + ((y) - 1)) / (y)) -#endif - -typedef struct fd_set { - fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)]; -} fd_set; - -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) -#ifdef _KERNEL -#define FD_COPY(f, t) bcopy(f, t, sizeof(*(f))) -#define FD_ZERO(p) bzero(p, sizeof(*(p))) -#else -#define FD_COPY(f, t) memcpy(t, f, sizeof(*(f))) -#define FD_ZERO(p) memset(p, 0, sizeof(*(p))) -#endif +#include <sys/select.h> /* must be after type declarations */ #if defined(__STDC__) && defined(_KERNEL) /* diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 5f353425f6e..1c4c2c17817 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vnode.h,v 1.63 2005/10/19 16:50:47 pedro Exp $ */ +/* $OpenBSD: vnode.h,v 1.64 2005/11/21 18:16:46 millert Exp $ */ /* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */ /* @@ -35,7 +35,7 @@ #include <sys/types.h> #include <sys/queue.h> #include <sys/lock.h> -#include <sys/select.h> +#include <sys/selinfo.h> /* XXX: clean up includes later */ #include <uvm/uvm_pglist.h> /* XXX */ diff --git a/sys/xfs/xfs_locl.h b/sys/xfs/xfs_locl.h index c6308eef4d0..d05d644a2e1 100644 --- a/sys/xfs/xfs_locl.h +++ b/sys/xfs/xfs_locl.h @@ -158,7 +158,7 @@ typedef struct componentname xfs_componentname; #include <sys/namei.h> #include <sys/dirent.h> #include <sys/ucred.h> -#include <sys/select.h> +#include <sys/selinfo.h> #include <sys/uio.h> #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> |