diff --git a/canutils/libcanard/Kconfig b/canutils/libcanard/Kconfig index 98ad3b424..dfb760752 100644 --- a/canutils/libcanard/Kconfig +++ b/canutils/libcanard/Kconfig @@ -6,7 +6,7 @@ config CANUTILS_LIBCANARD bool "libcanard UAVCAN Library" default n - depends on CAN && CAN_EXTID && !DISABLE_POLL + depends on CAN && CAN_EXTID ---help--- Enable the libcanard UAVCAN library. diff --git a/examples/README.txt b/examples/README.txt index 035594c92..021df0814 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -495,7 +495,6 @@ examples/ftpd is required. But here are a couple that are less obvious: CONFIG_DISABLE_PTHREAD - pthread support is required - CONFIG_DISABLE_POLL - poll() support is required 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, - stdin, and a TCP/IP socket. In order to build this test, you must the - following 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: + stdin, and a TCP/IP socket. In order to use the TCP/IP select + test, you must have the following things selected in your NuttX + configuration file: CONFIG_NET - Defined for general network support CONFIG_NET_TCP - Defined for TCP/IP support diff --git a/examples/buttons/Kconfig b/examples/buttons/Kconfig index cab8d3559..0783d8c8b 100644 --- a/examples/buttons/Kconfig +++ b/examples/buttons/Kconfig @@ -47,7 +47,6 @@ config EXAMPLES_BUTTONS_SIGNAL config EXAMPLES_BUTTONS_POLL bool "Notify using poll()" - depends on !DISABLE_POLL endchoice diff --git a/examples/module/drivers/chardev/chardev.c b/examples/module/drivers/chardev/chardev.c index 09423d17b..3b098170d 100644 --- a/examples/module/drivers/chardev/chardev.c +++ b/examples/module/drivers/chardev/chardev.c @@ -79,17 +79,15 @@ static ssize_t chardev_write(FAR struct file *filep, FAR const char *buffer, static const struct file_operations chardev_fops = { - 0, /* open */ - 0, /* close */ + NULL, /* open */ + NULL, /* close */ chardev_read, /* read */ chardev_write, /* write */ - 0, /* seek */ - 0 /* ioctl */ -#ifndef CONFIG_DISABLE_POLL - , 0 /* poll */ -#endif + NULL, /* seek */ + NULL, /* ioctl */ + NULL /* poll */ #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS - , 0 /* unlink */ + , NULL /* unlink */ #endif }; diff --git a/examples/netloop/netloop.h b/examples/netloop/netloop.h index 3e323585e..ea18f1322 100644 --- a/examples/netloop/netloop.h +++ b/examples/netloop/netloop.h @@ -50,10 +50,6 @@ * 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 * poll/select support. This kind of looks like overkill. * diff --git a/examples/nrf24l01_term/nrf24l01_term.c b/examples/nrf24l01_term/nrf24l01_term.c index 179139728..3b49a5598 100644 --- a/examples/nrf24l01_term/nrf24l01_term.c +++ b/examples/nrf24l01_term/nrf24l01_term.c @@ -59,10 +59,6 @@ #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 ****************************************************************************/ diff --git a/examples/pashello/device.c b/examples/pashello/device.c index a3950e6a3..904a8fc11 100644 --- a/examples/pashello/device.c +++ b/examples/pashello/device.c @@ -63,15 +63,13 @@ static ssize_t hello_read(struct file *, char *, size_t); static const struct file_operations hello_fops = { - 0, /* open */ - 0, /* close */ + NULL, /* open */ + NULL, /* close */ hello_read, /* read */ - 0, /* write */ - 0, /* seek */ - 0, /* ioctl */ -#ifndef CONFIG_DISABLE_POLL - 0 /* poll */ -#endif + NULL, /* write */ + NULL, /* seek */ + NULL, /* ioctl */ + NULL /* poll */ }; /**************************************************************************** diff --git a/examples/poll/poll_internal.h b/examples/poll/poll_internal.h index 3b1a7098f..5229ae43d 100644 --- a/examples/poll/poll_internal.h +++ b/examples/poll/poll_internal.h @@ -50,10 +50,6 @@ * 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 * poll/select support. This kind of looks like overkill. * diff --git a/examples/tcpblaster/Kconfig b/examples/tcpblaster/Kconfig index c8912c66a..369afc0a1 100644 --- a/examples/tcpblaster/Kconfig +++ b/examples/tcpblaster/Kconfig @@ -39,7 +39,6 @@ config EXAMPLES_TCPBLASTER_PRIORITY1 config EXAMPLES_TCPBLASTER_POLLOUT bool "Use poll() to pace output" default n - depends on !DISABLE_POLL ---help--- Client will use poll() to verify that send() will not block. This does not improve performance (in fact, it will degrade perform @@ -49,7 +48,6 @@ config EXAMPLES_TCPBLASTER_POLLOUT config EXAMPLES_TCPBLASTER_POLLIN bool "Use poll() to pace input" default n - depends on !DISABLE_POLL ---help--- Client will use poll() to verify that recv() will not block. This does not improve performance (in fact, it will degrade perform diff --git a/examples/udpblaster/Kconfig b/examples/udpblaster/Kconfig index 1ce058629..caf3c9dc6 100644 --- a/examples/udpblaster/Kconfig +++ b/examples/udpblaster/Kconfig @@ -31,7 +31,6 @@ config EXAMPLES_UDPBLASTER_PRIORITY config EXAMPLES_UDPBLASTER_POLLOUT bool "Use poll() to pace output" default n - depends on !DISABLE_POLL ---help--- Client will use poll() to verify that sendto() will not block. This does not improve performance (in fact, it will degrade perform diff --git a/examples/usrsocktest/Kconfig b/examples/usrsocktest/Kconfig index d40e73cbd..73c6597ad 100644 --- a/examples/usrsocktest/Kconfig +++ b/examples/usrsocktest/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_USRSOCKTEST tristate "USRSOCK test example" default n - depends on NET && NET_USRSOCK && !DISABLE_POLL + depends on NET && NET_USRSOCK select NET_USRSOCK_TCP select NET_USRSOCK_UDP select NET_SOCKOPTS diff --git a/examples/xmlrpc/Kconfig b/examples/xmlrpc/Kconfig index 0a53b945e..90ca53a96 100644 --- a/examples/xmlrpc/Kconfig +++ b/examples/xmlrpc/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_XMLRPC tristate "XML RPC example" default n - depends on NET_TCP && !DISABLE_POLL + depends on NET_TCP select NETUTILS_XMLRPC ---help--- An example for the netutils/xmlrpc library. diff --git a/graphics/pdcurs34/nuttx/Kconfig b/graphics/pdcurs34/nuttx/Kconfig index f0d916057..c107b999f 100644 --- a/graphics/pdcurs34/nuttx/Kconfig +++ b/graphics/pdcurs34/nuttx/Kconfig @@ -168,7 +168,7 @@ config PDCURSES_DJOYSTICK bool "Discrete Joystick" default n select PDCURSES_HAVE_INPUT - depends on DJOYSTICK && !DISABLE_POLL + depends on DJOYSTICK config PDCURSES_DJOYDEV string "Discrete Joystick Device" @@ -179,19 +179,19 @@ config PDCURSES_KEYBOARD bool "Discrete Joystick" default n select PDCURSES_HAVE_INPUT - depends on USBHOST_HIDKBD && !DISABLE_POLL && EXPERIMENTAL + depends on USBHOST_HIDKBD && EXPERIMENTAL config PDCURSES_MOUSE bool "Discrete Joystick" default n select PDCURSES_HAVE_INPUT - depends on MOUSE && !DISABLE_POLL && EXPERIMENTAL + depends on MOUSE && EXPERIMENTAL config PDCURSES_TERMINPUT bool "Terminal Input" default y select PDCURSES_HAVE_INPUT - depends on SYSTEM_TERMCURSES && !DISABLE_POLL + depends on SYSTEM_TERMCURSES endmenu # Input Devices diff --git a/include/netutils/ftpd.h b/include/netutils/ftpd.h index 9912d024e..6f36838c4 100644 --- a/include/netutils/ftpd.h +++ b/include/netutils/ftpd.h @@ -52,7 +52,6 @@ * required. But here are a couple that are less obvious: * * CONFIG_DISABLE_PTHREAD - pthread support is required - * CONFIG_DISABLE_POLL - poll() support is required * * Other FTPD configuration options that may be of interest: * @@ -72,10 +71,6 @@ # error "pthread support is required (CONFIG_DISABLE_PTHREAD=n)" #endif -#ifdef CONFIG_DISABLE_POLL -# error "poll() support is required (CONFIG_DISABLE_POLL=n)" -#endif - #ifndef CONFIG_FTPD_VENDORID # define CONFIG_FTPD_VENDORID "NuttX" #endif diff --git a/netutils/chat/Kconfig b/netutils/chat/Kconfig index 9b15b9d7d..62b86d712 100644 --- a/netutils/chat/Kconfig +++ b/netutils/chat/Kconfig @@ -6,7 +6,6 @@ config NETUTILS_CHAT bool "Chat tool" default n - depends on !DISABLE_POLL ---help--- Enable the chat tool. diff --git a/netutils/ftpd/Kconfig b/netutils/ftpd/Kconfig index 602aaf2e9..c3fe95ad8 100644 --- a/netutils/ftpd/Kconfig +++ b/netutils/ftpd/Kconfig @@ -6,7 +6,7 @@ config NETUTILS_FTPD bool "FTP server" default n - depends on NET_TCP && !DISABLE_POLL + depends on NET_TCP ---help--- Enable support for the FTP server. diff --git a/netutils/thttpd/Kconfig b/netutils/thttpd/Kconfig index c1b94fa54..d46c18097 100644 --- a/netutils/thttpd/Kconfig +++ b/netutils/thttpd/Kconfig @@ -6,7 +6,7 @@ config NETUTILS_THTTPD tristate "THTTPD webserver" default n - depends on (NXFLAT || FS_BINFS) && !DISABLE_POLL + depends on NXFLAT || FS_BINFS ---help--- Enable support for the THTTPD webservert. diff --git a/nshlib/README.txt b/nshlib/README.txt index df5bd37e7..8909dc736 100644 --- a/nshlib/README.txt +++ b/nshlib/README.txt @@ -1536,9 +1536,9 @@ All built-in applications require that support for NSH built-in applications has Application Depends on Configuration ----------- -------------------------- 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 && - CONFIG_SYSTEM_PING6 && !CONFIG_DISABLE_POLL + CONFIG_SYSTEM_PING6 NSH-Specific Configuration Settings ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/system/telnet/Kconfig b/system/telnet/Kconfig index 977a330b2..a034be733 100644 --- a/system/telnet/Kconfig +++ b/system/telnet/Kconfig @@ -6,7 +6,7 @@ menuconfig SYSTEM_TELNET_CHATD tristate "Telnet chat deamon" default n - depends on NET && NET_TCP && !DISABLE_POLL + depends on NET && NET_TCP select NETUTILS_TELNETC ---help--- Enable the Telnet Chat daemon. @@ -34,7 +34,7 @@ endif # SYSTEM_TELNET_CHATD menuconfig SYSTEM_TELNET_CLIENT tristate "Telnet client" default n - depends on NET && NET_TCP && !DISABLE_POLL + depends on NET && NET_TCP select NETUTILS_TELNETC select SYSTEM_READLINE ---help--- diff --git a/system/termcurses/Kconfig b/system/termcurses/Kconfig index 8d67591e8..47732e160 100644 --- a/system/termcurses/Kconfig +++ b/system/termcurses/Kconfig @@ -12,8 +12,6 @@ config SYSTEM_TERMCURSES Terminal emulation library for curses support on TTY type consoles such as serial port, CDCACM, telnet, etc. - Must deselect CONFIG_DISABLE_POLL! - config SYSTEM_TERMCURSES_VT100 bool "Terminal pdcurses support for VT-100" depends on SYSTEM_TERMCURSES