diff options
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/Documentation/NuttxUserGuide.html | 2 | ||||
| -rw-r--r-- | nuttx/configs/README.txt | 2 | ||||
| -rw-r--r-- | nuttx/fs/fs_poll.c | 4 | ||||
| -rw-r--r-- | nuttx/include/nuttx/fs.h | 4 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net.h | 2 | ||||
| -rw-r--r-- | nuttx/net/net-poll.c | 4 |
6 files changed, 13 insertions, 5 deletions
diff --git a/nuttx/Documentation/NuttxUserGuide.html b/nuttx/Documentation/NuttxUserGuide.html index 557d59036..7d37b73ef 100644 --- a/nuttx/Documentation/NuttxUserGuide.html +++ b/nuttx/Documentation/NuttxUserGuide.html @@ -5772,7 +5772,7 @@ interface of the same name. <li><a href="#unsetenv">2.10.5 <code>unsetenv</code></a></li> </ul> <p><b>Disabling Environment Variable Support</b>. - All support for environment variables can be disabled by setting <code>CONFIG_DISABLE_ENVIRONMENT</code> + All support for environment variables can be disabled by setting <code>CONFIG_DISABLE_ENVIRON</code> in the board configuration file. </p> diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 71a1f49e4..750d945a9 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -212,7 +212,7 @@ defconfig -- This is a configuration file similar to the Linux CONFIG_DISABLE_CLOCK, CONFIG_DISABLE_POSIX_TIMERS, CONFIG_DISABLE_PTHREAD. CONFIG_DISABLE_SIGNALS, CONFIG_DISABLE_MQUEUE, CONFIG_DISABLE_MOUNTPOUNT, - CONFIG_DISABLE_ENVIRON + CONFIG_DISABLE_ENVIRON, CONFIG_DISABLE_POLL Misc libc settings diff --git a/nuttx/fs/fs_poll.c b/nuttx/fs/fs_poll.c index 2f585d818..a59cee5aa 100644 --- a/nuttx/fs/fs_poll.c +++ b/nuttx/fs/fs_poll.c @@ -51,6 +51,8 @@ #include "fs_internal.h" +#ifndef CONFIG_DISABLE_POLL + /**************************************************************************** * Definitions ****************************************************************************/ @@ -313,3 +315,5 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout) return count; } +#endif /* CONFIG_DISABLE_POLL */ + diff --git a/nuttx/include/nuttx/fs.h b/nuttx/include/nuttx/fs.h index 65e033208..ced7beed1 100644 --- a/nuttx/include/nuttx/fs.h +++ b/nuttx/include/nuttx/fs.h @@ -75,7 +75,9 @@ struct file_operations ssize_t (*write)(FAR struct file *filp, FAR const char *buffer, size_t buflen); off_t (*seek)(FAR struct file *filp, off_t offset, int whence); int (*ioctl)(FAR struct file *filp, int cmd, unsigned long arg); - int (*poll)(FAR struct file *filp, struct pollfd *poll); +#ifndef CONFIG_DISABLE_POLL + int (*poll)(FAR struct file *filp, struct pollfd *fds); +#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 5126e7b65..9ae4217cc 100644 --- a/nuttx/include/nuttx/net.h +++ b/nuttx/include/nuttx/net.h @@ -158,8 +158,10 @@ EXTERN int netdev_ioctl(int sockfd, int cmd, struct ifreq *req); * to this function. */ +#ifndef CONFIG_DISABLE_POLL struct pollfd; /* Forward reference -- see poll.h */ EXTERN int net_poll(int sockfd, struct pollfd *fds); +#endif /* netdev-register.c *********************************************************/ /* This function is called by network interface device drivers to inform the diff --git a/nuttx/net/net-poll.c b/nuttx/net/net-poll.c index ef4ba9dd3..b11cfe964 100644 --- a/nuttx/net/net-poll.c +++ b/nuttx/net/net-poll.c @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#ifdef CONFIG_NET +#if defined(CONFIG_NET) && !defined(CONFIG_DISABLE_POLL) #include <sys/types.h> #include <sys/socket.h> @@ -77,4 +77,4 @@ int net_poll(int sockfd, struct pollfd *fds) return -ENOSYS; } -#endif /* CONFIG_NET */ +#endif /* CONFIG_NET&& !CONFIG_DISABLE_POLL */ |