Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
arch/:  Removed all references to CONFIG_DISABLE_POLL.  The standard POSIX poll() can not longer be disabled.
    sched/ audio/ crypto/:  Removed all references to CONFIG_DISABLE_POLL.  The standard POSIX poll() can not longer be disabled.
    Documentation/:  Removed all references to CONFIG_DISABLE_POLL.  The standard POSIX poll() can not longer be disabled.
    fs/:  Removed all references to CONFIG_DISABLE_POLL.  The standard POSIX poll() can not longer be disabled.
    graphics/:  Removed all references to CONFIG_DISABLE_POLL.  The standard POSIX poll() can not longer be disabled.
    net/:  Removed all references to CONFIG_DISABLE_POLL.  The standard POSIX poll() can not longer be disabled.
    drivers/:  Removed all references to CONFIG_DISABLE_POLL.  The standard POSIX poll() can not longer be disabled.
    include/, syscall/, wireless/:  Removed all references to CONFIG_DISABLE_POLL.  The standard POSIX poll() can not longer be disabled.
    configs/:  Remove all references to CONFIG_DISABLE_POLL.  Standard POSIX poll can no longer be disabled.
This commit is contained in:
Gregory Nutt
2019-05-21 18:57:54 -06:00
parent 3ab2b82b63
commit b49be4bb20
516 changed files with 424 additions and 1705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/serial/Kconfig
+1 -1
View File
@@ -72,7 +72,7 @@ config STANDARD_SERIAL
config SERIAL_NPOLLWAITERS
int "Number of poll threads"
default 2
depends on !DISABLE_POLL && STANDARD_SERIAL
depends on STANDARD_SERIAL
---help---
Maximum number of threads than can be waiting for POLL events.
Default: 2
drivers/serial/lowconsole.c
+2 -4
View File
@@ -75,10 +75,8 @@ static const struct file_operations g_consoleops =
lowconsole_read, /* read */
lowconsole_write, /* write */
NULL, /* seek */
lowconsole_ioctl /* ioctl */
#ifndef CONFIG_DISABLE_POLL
, NULL /* poll */
#endif
lowconsole_ioctl, /* ioctl */
NULL /* poll */
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
, NULL /* unlink */
#endif
drivers/serial/ptmx.c
+2 -4
View File
@@ -103,10 +103,8 @@ static const struct file_operations g_ptmx_fops =
ptmx_read, /* read */
ptmx_write, /* write */
NULL, /* seek */
NULL /* ioctl */
#ifndef CONFIG_DISABLE_POLL
, NULL /* poll */
#endif
NULL, /* ioctl */
NULL /* poll */
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
, NULL /* unlink */
#endif
drivers/serial/pty.c
+2 -10
View File
@@ -145,9 +145,7 @@ struct pty_dev_s
tcflag_t pd_oflag; /* Terminal output modes */
#endif
#ifndef CONFIG_DISABLE_POLL
struct pty_poll_s pd_poll[CONFIG_DEV_PTY_NPOLLWAITERS];
#endif
};
/* This structure describes the pipe pair */
@@ -185,10 +183,8 @@ static ssize_t pty_read(FAR struct file *filep, FAR char *buffer,
static ssize_t pty_write(FAR struct file *filep, FAR const char *buffer,
size_t buflen);
static int pty_ioctl(FAR struct file *filep, int cmd, unsigned long arg);
#ifndef CONFIG_DISABLE_POLL
static int pty_poll(FAR struct file *filep, FAR struct pollfd *fds,
bool setup);
#endif
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
static int pty_unlink(FAR struct inode *inode);
#endif
@@ -209,10 +205,8 @@ static const struct file_operations g_pty_fops =
pty_read, /* read */
pty_write, /* write */
NULL, /* seek */
pty_ioctl /* ioctl */
#ifndef CONFIG_DISABLE_POLL
, pty_poll /* poll */
#endif
pty_ioctl, /* ioctl */
pty_poll /* poll */
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
, pty_unlink /* unlink */
#endif
@@ -934,7 +928,6 @@ static int pty_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
* Name: pty_poll
****************************************************************************/
#ifndef CONFIG_DISABLE_POLL
static int pty_poll(FAR struct file *filep, FAR struct pollfd *fds,
bool setup)
{
@@ -1017,7 +1010,6 @@ errout:
pty_semgive(devpair);
return ret;
}
#endif
/****************************************************************************
* Name: pty_unlink
drivers/serial/serial.c
+3 -18
View File
@@ -93,9 +93,7 @@
************************************************************************************/
static int uart_takesem(FAR sem_t *sem, bool errout);
#ifndef CONFIG_DISABLE_POLL
static void uart_pollnotify(FAR uart_dev_t *dev, pollevent_t eventset);
#endif
/* Write support */
@@ -111,9 +109,7 @@ static int uart_close(FAR struct file *filep);
static ssize_t uart_read(FAR struct file *filep, FAR char *buffer, size_t buflen);
static ssize_t uart_write(FAR struct file *filep, FAR const char *buffer, size_t buflen);
static int uart_ioctl(FAR struct file *filep, int cmd, unsigned long arg);
#ifndef CONFIG_DISABLE_POLL
static int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup);
#endif
/************************************************************************************
* Private Data
@@ -126,10 +122,8 @@ static const struct file_operations g_serialops =
uart_read, /* read */
uart_write, /* write */
0, /* seek */
uart_ioctl /* ioctl */
#ifndef CONFIG_DISABLE_POLL
, uart_poll /* poll */
#endif
uart_ioctl, /* ioctl */
uart_poll /* poll */
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
, NULL /* unlink */
#endif
@@ -185,7 +179,6 @@ static int uart_takesem(FAR sem_t *sem, bool errout)
* Name: uart_pollnotify
****************************************************************************/
#ifndef CONFIG_DISABLE_POLL
static void uart_pollnotify(FAR uart_dev_t *dev, pollevent_t eventset)
{
int i;
@@ -208,9 +201,6 @@ static void uart_pollnotify(FAR uart_dev_t *dev, pollevent_t eventset)
}
}
}
#else
# define uart_pollnotify(dev,event)
#endif
/************************************************************************************
* Name: uart_putxmitchar
@@ -1454,7 +1444,6 @@ static int uart_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
* Name: uart_poll
****************************************************************************/
#ifndef CONFIG_DISABLE_POLL
static int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
{
FAR struct inode *inode = filep->f_inode;
@@ -1590,7 +1579,6 @@ errout:
uart_givesem(&dev->pollsem);
return ret;
}
#endif
/************************************************************************************
* Public Functions
@@ -1634,9 +1622,7 @@ int uart_register(FAR const char *path, FAR uart_dev_t *dev)
nxsem_init(&dev->closesem, 0, 1);
nxsem_init(&dev->xmitsem, 0, 0);
nxsem_init(&dev->recvsem, 0, 0);
#ifndef CONFIG_DISABLE_POLL
nxsem_init(&dev->pollsem, 0, 1);
#endif
/* The recvsem and xmitsem are used for signaling and, hence, should not have
* priority inheritance enabled.
@@ -1797,7 +1783,6 @@ void uart_reset_sem(FAR uart_dev_t *dev)
nxsem_reset(&dev->recvsem, 0);
nxsem_reset(&dev->xmit.sem, 1);
nxsem_reset(&dev->recv.sem, 1);
#ifndef CONFIG_DISABLE_POLL
nxsem_reset(&dev->pollsem, 1);
#endif
}