d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update interfaces for poll()

Browse Source
This commit is contained in:
Peter Wemm 1997-09-14 02:25:41 +00:00
parent 818661c8f6
commit 3a74593f48
7 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/sys/conf.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.5 (Berkeley) 1/9/95
* $Id$
* $Id: conf.h,v 1.34 1997/02/22 09:44:58 peter Exp $
*/
#ifndef _SYS_CONF_H_
@ -65,7 +65,7 @@ typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag));
typedef void d_stop_t __P((struct tty *tp, int rw));
typedef int d_reset_t __P((dev_t dev));
typedef struct tty *d_devtotty_t __P((dev_t dev));
typedef int d_select_t __P((dev_t dev, int which, struct proc *p));
typedef int d_poll_t __P((dev_t dev, int events, struct proc *p));
typedef int d_mmap_t __P((dev_t dev, int offset, int nprot));
typedef int l_open_t __P((dev_t dev, struct tty *tp));
@ -117,7 +117,7 @@ struct cdevsw {
d_stop_t *d_stop;
d_reset_t *d_reset; /* XXX not used */
d_devtotty_t *d_devtotty;
d_select_t *d_select;
d_poll_t *d_poll;
d_mmap_t *d_mmap;
d_strategy_t *d_strategy;
char *d_name; /* see above */
@ -174,7 +174,6 @@ d_ioctl_t noioctl;
d_stop_t nostop;
d_reset_t noreset;
d_devtotty_t nodevtotty;
d_select_t noselect;
d_mmap_t nommap;
/* Bogus defines for compatibility. */
@ -207,7 +206,6 @@ d_ioctl_t nxioctl;
#define nxstop nostop /* one void return is as good as another */
#define nxreset noreset /* one unused function is as good as another */
#define nxdevtotty nodevtotty /* one NULL return is as good as another */
d_select_t nxselect;
#define nxmmap nommap /* one -1 return is as good as another */
#define nxstrategy nostrategy /* one NULL value is as good as another */
d_dump_t nxdump;

6
sys/sys/file.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)file.h 8.3 (Berkeley) 1/9/95
* $Id: file.h,v 1.12 1997/02/22 09:45:14 peter Exp $
* $Id: file.h,v 1.13 1997/03/23 03:37:29 bde Exp $
*/
#ifndef _SYS_FILE_H_
@ -70,8 +70,8 @@ struct file {
struct ucred *cred));
int (*fo_ioctl) __P((struct file *fp, int com,
caddr_t data, struct proc *p));
int (*fo_select) __P((struct file *fp, int which,
struct proc *p));
int (*fo_poll) __P((struct file *fp, int events,
struct ucred *cred, struct proc *p));
int (*fo_close) __P((struct file *fp, struct proc *p));
} *f_ops;
int f_seqcount; /*

8
sys/sys/linedisc.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.5 (Berkeley) 1/9/95
* $Id$
* $Id: conf.h,v 1.34 1997/02/22 09:44:58 peter Exp $
*/
#ifndef _SYS_CONF_H_
@ -65,7 +65,7 @@ typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag));
typedef void d_stop_t __P((struct tty *tp, int rw));
typedef int d_reset_t __P((dev_t dev));
typedef struct tty *d_devtotty_t __P((dev_t dev));
typedef int d_select_t __P((dev_t dev, int which, struct proc *p));
typedef int d_poll_t __P((dev_t dev, int events, struct proc *p));
typedef int d_mmap_t __P((dev_t dev, int offset, int nprot));
typedef int l_open_t __P((dev_t dev, struct tty *tp));
@ -117,7 +117,7 @@ struct cdevsw {
d_stop_t *d_stop;
d_reset_t *d_reset; /* XXX not used */
d_devtotty_t *d_devtotty;
d_select_t *d_select;
d_poll_t *d_poll;
d_mmap_t *d_mmap;
d_strategy_t *d_strategy;
char *d_name; /* see above */
@ -174,7 +174,6 @@ d_ioctl_t noioctl;
d_stop_t nostop;
d_reset_t noreset;
d_devtotty_t nodevtotty;
d_select_t noselect;
d_mmap_t nommap;
/* Bogus defines for compatibility. */
@ -207,7 +206,6 @@ d_ioctl_t nxioctl;
#define nxstop nostop /* one void return is as good as another */
#define nxreset noreset /* one unused function is as good as another */
#define nxdevtotty nodevtotty /* one NULL return is as good as another */
d_select_t nxselect;
#define nxmmap nommap /* one -1 return is as good as another */
#define nxstrategy nostrategy /* one NULL value is as good as another */
d_dump_t nxdump;

6
sys/sys/protosw.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)protosw.h 8.1 (Berkeley) 6/2/93
* $Id: protosw.h,v 1.19 1997/05/27 06:17:22 charnier Exp $
* $Id: protosw.h,v 1.20 1997/08/16 19:16:13 wollman Exp $
*/
#ifndef _SYS_PROTOSW_H_
@ -224,8 +224,8 @@ struct pr_usrreqs {
struct sockaddr **paddr,
struct uio *uio, struct mbuf **mp0,
struct mbuf **controlp, int *flagsp));
int (*pru_soselect) __P((struct socket *so, int which,
struct proc *p));
int (*pru_sopoll) __P((struct socket *so, int events,
struct ucred *cred, struct proc *p));
};
int pru_accept_notsupp __P((struct socket *so, struct sockaddr **nam));

8
sys/sys/socketvar.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)socketvar.h 8.3 (Berkeley) 2/19/95
* $Id: socketvar.h,v 1.20 1997/07/19 20:15:43 fenner Exp $
* $Id: socketvar.h,v 1.21 1997/08/16 19:16:14 wollman Exp $
*/
#ifndef _SYS_SOCKETVAR_H_
@ -210,7 +210,8 @@ struct stat;
*/
int soo_ioctl __P((struct file *fp, int cmd, caddr_t data,
struct proc *p));
int soo_select __P((struct file *fp, int which, struct proc *p));
int soo_poll __P((struct file *fp, int events, struct ucred *cred,
struct proc *p));
int soo_stat __P((struct socket *so, struct stat *ub));
/*
@ -262,12 +263,13 @@ struct socket *
sodropablereq __P((struct socket *head));
struct socket *
sonewconn __P((struct socket *head, int connstatus));
int sopoll __P((struct socket *so, int events, struct ucred *cred,
struct proc *p));
int soreceive __P((struct socket *so, struct sockaddr **paddr,
struct uio *uio, struct mbuf **mp0,
struct mbuf **controlp, int *flagsp));
int soreserve __P((struct socket *so, u_long sndcc, u_long rcvcc));
void sorflush __P((struct socket *so));
int soselect __P((struct socket *so, int which, struct proc *p));
int sosend __P((struct socket *so, struct sockaddr *addr, struct uio *uio,
struct mbuf *top, struct mbuf *control, int flags,
struct proc *p));

6
sys/sys/tty.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)tty.h 8.6 (Berkeley) 1/21/94
* $Id$
* $Id: tty.h,v 1.38 1997/02/22 09:46:13 peter Exp $
*/
#ifndef _SYS_TTY_H_
@ -236,8 +236,8 @@ int tputchar __P((int c, struct tty *tp));
int ttioctl __P((struct tty *tp, int com, void *data, int flag));
int ttread __P((struct tty *tp, struct uio *uio, int flag));
void ttrstrt __P((void *tp));
int ttyselect __P((struct tty *tp, int rw, struct proc *p));
int ttselect __P((dev_t dev, int rw, struct proc *p));
int ttypoll __P((struct tty *tp, int events, struct proc *p));
int ttpoll __P((dev_t dev, int events, struct proc *p));
void ttsetwater __P((struct tty *tp));
int ttspeedtab __P((int speed, struct speedtab *table));
int ttstart __P((struct tty *tp));

5
sys/sys/vnode.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)vnode.h 8.7 (Berkeley) 2/4/94
* $Id: vnode.h,v 1.46 1997/08/26 07:32:46 phk Exp $
* $Id: vnode.h,v 1.47 1997/08/31 07:32:35 phk Exp $
*/
#ifndef _SYS_VNODE_H_
@ -500,9 +500,10 @@ int vfs_object_create __P((struct vnode *vp, struct proc *p,
int vn_writechk __P((struct vnode *vp));
int vop_noislocked __P((struct vop_islocked_args *));
int vop_nolock __P((struct vop_lock_args *));
int vop_nopoll __P((struct vop_poll_args *));
int vop_nounlock __P((struct vop_unlock_args *));
int vop_sharedlock __P((struct vop_lock_args *));
int vop_revoke __P((struct vop_revoke_args *));
int vop_sharedlock __P((struct vop_lock_args *));
struct vnode *
checkalias __P((struct vnode *vp, dev_t nvp_rdev, struct mount *mp));
void vput __P((struct vnode *vp));