diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-19 18:43:50 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-19 18:43:50 +0000 |
| commit | d8c1d769c45dde09573ea6ba3f968491cc5e68b2 (patch) | |
| tree | 6a6105e2401ec7e9eb4e590c49c3121b2c4b82ae /nuttx/include | |
| parent | b62fb5c894ea28ccc83c5760605f5322bf38f971 (diff) | |
| download | px4-nuttx-d8c1d769c45dde09573ea6ba3f968491cc5e68b2.tar.gz px4-nuttx-d8c1d769c45dde09573ea6ba3f968491cc5e68b2.tar.bz2 px4-nuttx-d8c1d769c45dde09573ea6ba3f968491cc5e68b2.zip | |
Move poll save area back into struct pollfd (as it was
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1288 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/fs.h | 2 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net.h | 8 | ||||
| -rw-r--r-- | nuttx/include/poll.h | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/nuttx/include/nuttx/fs.h b/nuttx/include/nuttx/fs.h index ced7beed1..3d2370688 100644 --- a/nuttx/include/nuttx/fs.h +++ b/nuttx/include/nuttx/fs.h @@ -76,7 +76,7 @@ struct file_operations off_t (*seek)(FAR struct file *filp, off_t offset, int whence); int (*ioctl)(FAR struct file *filp, int cmd, unsigned long arg); #ifndef CONFIG_DISABLE_POLL - int (*poll)(FAR struct file *filp, struct pollfd *fds); + int (*poll)(FAR struct file *filp, struct pollfd *fds, boolean setup); #endif /* The two structures need not be common after this point */ diff --git a/nuttx/include/nuttx/net.h b/nuttx/include/nuttx/net.h index e28f28b5c..b6bdfbe74 100644 --- a/nuttx/include/nuttx/net.h +++ b/nuttx/include/nuttx/net.h @@ -95,12 +95,6 @@ struct socket #endif #endif void *s_conn; /* Connection: struct uip_conn or uip_udp_conn */ - - /* The socket poll logic needs a place to retain state info */ - -#if !defined(CONFIG_DISABLE_POLL) && defined(CONFIG_NET_TCP) && CONFIG_NET_NTCP_READAHEAD_BUFFERS > 0 - FAR void *private; -#endif }; /* This defines a list of sockets indexed by the socket descriptor */ @@ -166,7 +160,7 @@ EXTERN int netdev_ioctl(int sockfd, int cmd, struct ifreq *req); #ifndef CONFIG_DISABLE_POLL struct pollfd; /* Forward reference -- see poll.h */ -EXTERN int net_poll(int sockfd, struct pollfd *fds); +EXTERN int net_poll(int sockfd, struct pollfd *fds, boolean setup); #endif /* netdev-register.c *********************************************************/ diff --git a/nuttx/include/poll.h b/nuttx/include/poll.h index e82d48f57..3b41ec99a 100644 --- a/nuttx/include/poll.h +++ b/nuttx/include/poll.h @@ -108,6 +108,7 @@ struct pollfd sem_t *sem; /* Pointer to semaphore used to post output event */ pollevent_t events; /* The input event flags */ pollevent_t revents; /* The output event flags */ + FAR void *private; /* For use by drivers */ }; /**************************************************************************** |