apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-17 15:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

apps/: Removed all references to CONFIG_DISABLE_POLL. The standard POSIX poll() can not longer be disabled.

Browse Source
This commit is contained in:
Gregory Nutt
2019-05-21 19:08:12 -06:00
parent b7b3dfb58b
commit dd35a7cacc
20 changed files with 28 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
canutils/libcanard/Kconfig
View File

@@ -6,7 +6,7 @@
config CANUTILS_LIBCANARD config CANUTILS_LIBCANARD
bool "libcanard UAVCAN Library" bool "libcanard UAVCAN Library"
default n default n
depends on CAN && CAN_EXTID && !DISABLE_POLL depends on CAN && CAN_EXTID
---help--- ---help---
Enable the libcanard UAVCAN library. Enable the libcanard UAVCAN library.

11
examples/README.txt
View File

@@ -495,7 +495,6 @@ examples/ftpd
is required. But here are a couple that are less obvious: is required. But here are a couple that are less obvious:
CONFIG_DISABLE_PTHREAD - pthread support is required CONFIG_DISABLE_PTHREAD - pthread support is required
CONFIG_DISABLE_POLL - poll() support is required
Other FTPD configuration options thay may be of interest: Other FTPD configuration options thay may be of interest:
@@ -1244,13 +1243,9 @@ examples/poll
^^^^^^^^^^^^^ ^^^^^^^^^^^^^
A test of the poll() and select() APIs using FIFOs and, if available, A test of the poll() and select() APIs using FIFOs and, if available,
stdin, and a TCP/IP socket. In order to build this test, you must the stdin, and a TCP/IP socket. In order to use the TCP/IP select
following selected in your NuttX configuration file: test, you must have the following things selected in your NuttX
configuration file:
CONFIG_DISABLE_POLL - NOT defined
In order to use the TCP/IP select test, you have also the following
additional things selected in your NuttX configuration file:
CONFIG_NET - Defined for general network support CONFIG_NET - Defined for general network support
CONFIG_NET_TCP - Defined for TCP/IP support CONFIG_NET_TCP - Defined for TCP/IP support

1
examples/buttons/Kconfig
View File

@@ -47,7 +47,6 @@ config EXAMPLES_BUTTONS_SIGNAL
config EXAMPLES_BUTTONS_POLL config EXAMPLES_BUTTONS_POLL
bool "Notify using poll()" bool "Notify using poll()"
depends on !DISABLE_POLL
endchoice endchoice

14
examples/module/drivers/chardev/chardev.c
View File

@@ -79,17 +79,15 @@ static ssize_t chardev_write(FAR struct file *filep, FAR const char *buffer,
static const struct file_operations chardev_fops = static const struct file_operations chardev_fops =
{ {
0, /* open */ NULL, /* open */
0, /* close */ NULL, /* close */
chardev_read, /* read */ chardev_read, /* read */
chardev_write, /* write */ chardev_write, /* write */
0, /* seek */ NULL, /* seek */
0 /* ioctl */ NULL, /* ioctl */
#ifndef CONFIG_DISABLE_POLL NULL /* poll */
, 0 /* poll */
#endif
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
, 0 /* unlink */ , NULL /* unlink */
#endif #endif
}; };

4
examples/netloop/netloop.h
View File

@@ -50,10 +50,6 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_DISABLE_POLL
# error "The polling API is disabled"
#endif
/* Here are all of the configuration settings that must be met to have TCP/IP /* Here are all of the configuration settings that must be met to have TCP/IP
* poll/select support. This kind of looks like overkill. * poll/select support. This kind of looks like overkill.
* *

4
examples/nrf24l01_term/nrf24l01_term.c
View File

@@ -59,10 +59,6 @@
#include "system/readline.h" #include "system/readline.h"
#ifdef CONFIG_DISABLE_POLL
# error The poll interface is required for the nRF24L01 terminal example. You must disable config option DISABLE_POLL.
#endif
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/

14
examples/pashello/device.c
View File

@@ -63,15 +63,13 @@ static ssize_t hello_read(struct file *, char *, size_t);
static const struct file_operations hello_fops = static const struct file_operations hello_fops =
{ {
0, /* open */ NULL, /* open */
0, /* close */ NULL, /* close */
hello_read, /* read */ hello_read, /* read */
0, /* write */ NULL, /* write */
0, /* seek */ NULL, /* seek */
0, /* ioctl */ NULL, /* ioctl */
#ifndef CONFIG_DISABLE_POLL NULL /* poll */
0 /* poll */
#endif
}; };
/**************************************************************************** /****************************************************************************

4
examples/poll/poll_internal.h
View File

@@ -50,10 +50,6 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_DISABLE_POLL
# error "The polling API is disabled"
#endif
/* Here are all of the configuration settings that must be met to have TCP/IP /* Here are all of the configuration settings that must be met to have TCP/IP
* poll/select support. This kind of looks like overkill. * poll/select support. This kind of looks like overkill.
* *

2
examples/tcpblaster/Kconfig
View File

@@ -39,7 +39,6 @@ config EXAMPLES_TCPBLASTER_PRIORITY1
config EXAMPLES_TCPBLASTER_POLLOUT config EXAMPLES_TCPBLASTER_POLLOUT
bool "Use poll() to pace output" bool "Use poll() to pace output"
default n default n
depends on !DISABLE_POLL
---help--- ---help---
Client will use poll() to verify that send() will not block. This Client will use poll() to verify that send() will not block. This
does not improve performance (in fact, it will degrade perform does not improve performance (in fact, it will degrade perform
@@ -49,7 +48,6 @@ config EXAMPLES_TCPBLASTER_POLLOUT
config EXAMPLES_TCPBLASTER_POLLIN config EXAMPLES_TCPBLASTER_POLLIN
bool "Use poll() to pace input" bool "Use poll() to pace input"
default n default n
depends on !DISABLE_POLL
---help--- ---help---
Client will use poll() to verify that recv() will not block. This Client will use poll() to verify that recv() will not block. This
does not improve performance (in fact, it will degrade perform does not improve performance (in fact, it will degrade perform

1
examples/udpblaster/Kconfig
View File

@@ -31,7 +31,6 @@ config EXAMPLES_UDPBLASTER_PRIORITY
config EXAMPLES_UDPBLASTER_POLLOUT config EXAMPLES_UDPBLASTER_POLLOUT
bool "Use poll() to pace output" bool "Use poll() to pace output"
default n default n
depends on !DISABLE_POLL
---help--- ---help---
Client will use poll() to verify that sendto() will not block. This Client will use poll() to verify that sendto() will not block. This
does not improve performance (in fact, it will degrade perform does not improve performance (in fact, it will degrade perform

2
examples/usrsocktest/Kconfig
View File

@@ -6,7 +6,7 @@
config EXAMPLES_USRSOCKTEST config EXAMPLES_USRSOCKTEST
tristate "USRSOCK test example" tristate "USRSOCK test example"
default n default n
depends on NET && NET_USRSOCK && !DISABLE_POLL depends on NET && NET_USRSOCK
select NET_USRSOCK_TCP select NET_USRSOCK_TCP
select NET_USRSOCK_UDP select NET_USRSOCK_UDP
select NET_SOCKOPTS select NET_SOCKOPTS

2
examples/xmlrpc/Kconfig
View File

@@ -6,7 +6,7 @@
config EXAMPLES_XMLRPC config EXAMPLES_XMLRPC
tristate "XML RPC example" tristate "XML RPC example"
default n default n
depends on NET_TCP && !DISABLE_POLL depends on NET_TCP
select NETUTILS_XMLRPC select NETUTILS_XMLRPC
---help--- ---help---
An example for the netutils/xmlrpc library. An example for the netutils/xmlrpc library.

8
graphics/pdcurs34/nuttx/Kconfig
View File

@@ -168,7 +168,7 @@ config PDCURSES_DJOYSTICK
bool "Discrete Joystick" bool "Discrete Joystick"
default n default n
select PDCURSES_HAVE_INPUT select PDCURSES_HAVE_INPUT
depends on DJOYSTICK && !DISABLE_POLL depends on DJOYSTICK
config PDCURSES_DJOYDEV config PDCURSES_DJOYDEV
string "Discrete Joystick Device" string "Discrete Joystick Device"
@@ -179,19 +179,19 @@ config PDCURSES_KEYBOARD
bool "Discrete Joystick" bool "Discrete Joystick"
default n default n
select PDCURSES_HAVE_INPUT select PDCURSES_HAVE_INPUT
depends on USBHOST_HIDKBD && !DISABLE_POLL && EXPERIMENTAL depends on USBHOST_HIDKBD && EXPERIMENTAL
config PDCURSES_MOUSE config PDCURSES_MOUSE
bool "Discrete Joystick" bool "Discrete Joystick"
default n default n
select PDCURSES_HAVE_INPUT select PDCURSES_HAVE_INPUT
depends on MOUSE && !DISABLE_POLL && EXPERIMENTAL depends on MOUSE && EXPERIMENTAL
config PDCURSES_TERMINPUT config PDCURSES_TERMINPUT
bool "Terminal Input" bool "Terminal Input"
default y default y
select PDCURSES_HAVE_INPUT select PDCURSES_HAVE_INPUT
depends on SYSTEM_TERMCURSES && !DISABLE_POLL depends on SYSTEM_TERMCURSES
endmenu # Input Devices endmenu # Input Devices

5
include/netutils/ftpd.h
View File

@@ -52,7 +52,6 @@
* required. But here are a couple that are less obvious: * required. But here are a couple that are less obvious:
* *
* CONFIG_DISABLE_PTHREAD - pthread support is required * CONFIG_DISABLE_PTHREAD - pthread support is required
* CONFIG_DISABLE_POLL - poll() support is required
* *
* Other FTPD configuration options that may be of interest: * Other FTPD configuration options that may be of interest:
* *
@@ -72,10 +71,6 @@
# error "pthread support is required (CONFIG_DISABLE_PTHREAD=n)" # error "pthread support is required (CONFIG_DISABLE_PTHREAD=n)"
#endif #endif
#ifdef CONFIG_DISABLE_POLL
# error "poll() support is required (CONFIG_DISABLE_POLL=n)"
#endif
#ifndef CONFIG_FTPD_VENDORID #ifndef CONFIG_FTPD_VENDORID
# define CONFIG_FTPD_VENDORID "NuttX" # define CONFIG_FTPD_VENDORID "NuttX"
#endif #endif

1
netutils/chat/Kconfig
View File

@@ -6,7 +6,6 @@
config NETUTILS_CHAT config NETUTILS_CHAT
bool "Chat tool" bool "Chat tool"
default n default n
depends on !DISABLE_POLL
---help--- ---help---
Enable the chat tool. Enable the chat tool.

2
netutils/ftpd/Kconfig
View File

@@ -6,7 +6,7 @@
config NETUTILS_FTPD config NETUTILS_FTPD
bool "FTP server" bool "FTP server"
default n default n
depends on NET_TCP && !DISABLE_POLL depends on NET_TCP
---help--- ---help---
Enable support for the FTP server. Enable support for the FTP server.

2
netutils/thttpd/Kconfig
View File

@@ -6,7 +6,7 @@
config NETUTILS_THTTPD config NETUTILS_THTTPD
tristate "THTTPD webserver" tristate "THTTPD webserver"
default n default n
depends on (NXFLAT || FS_BINFS) && !DISABLE_POLL depends on NXFLAT || FS_BINFS
---help--- ---help---
Enable support for the THTTPD webservert. Enable support for the THTTPD webservert.

4
nshlib/README.txt
View File

@@ -1536,9 +1536,9 @@ All built-in applications require that support for NSH built-in applications has
Application Depends on Configuration Application Depends on Configuration
----------- -------------------------- ----------- --------------------------
ping CONFIG_NET && CONFIG_NET_ICMP && CONFIG_NET_ICMP_SOCKET && ping CONFIG_NET && CONFIG_NET_ICMP && CONFIG_NET_ICMP_SOCKET &&
CONFIG_SYSTEM_PING && !CONFIG_DISABLE_POLL CONFIG_SYSTEM_PING
ping6 CONFIG_NET && CONFIG_NET_ICMPv6 && CONFIG_NET_ICMPv6_SOCKET && ping6 CONFIG_NET && CONFIG_NET_ICMPv6 && CONFIG_NET_ICMPv6_SOCKET &&
CONFIG_SYSTEM_PING6 && !CONFIG_DISABLE_POLL CONFIG_SYSTEM_PING6
NSH-Specific Configuration Settings NSH-Specific Configuration Settings
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

4
system/telnet/Kconfig
View File

@@ -6,7 +6,7 @@
menuconfig SYSTEM_TELNET_CHATD menuconfig SYSTEM_TELNET_CHATD
tristate "Telnet chat deamon" tristate "Telnet chat deamon"
default n default n
depends on NET && NET_TCP && !DISABLE_POLL depends on NET && NET_TCP
select NETUTILS_TELNETC select NETUTILS_TELNETC
---help--- ---help---
Enable the Telnet Chat daemon. Enable the Telnet Chat daemon.
@@ -34,7 +34,7 @@ endif # SYSTEM_TELNET_CHATD
menuconfig SYSTEM_TELNET_CLIENT menuconfig SYSTEM_TELNET_CLIENT
tristate "Telnet client" tristate "Telnet client"
default n default n
depends on NET && NET_TCP && !DISABLE_POLL depends on NET && NET_TCP
select NETUTILS_TELNETC select NETUTILS_TELNETC
select SYSTEM_READLINE select SYSTEM_READLINE
---help--- ---help---

2
system/termcurses/Kconfig
View File

@@ -12,8 +12,6 @@ config SYSTEM_TERMCURSES
Terminal emulation library for curses support on TTY type consoles Terminal emulation library for curses support on TTY type consoles
such as serial port, CDCACM, telnet, etc. such as serial port, CDCACM, telnet, etc.
Must deselect CONFIG_DISABLE_POLL!
config SYSTEM_TERMCURSES_VT100 config SYSTEM_TERMCURSES_VT100
bool "Terminal pdcurses support for VT-100" bool "Terminal pdcurses support for VT-100"
depends on SYSTEM_TERMCURSES depends on SYSTEM_TERMCURSES