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 2 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
graphics/nxterm/nxterm.h
-4
View File
@@ -173,9 +173,7 @@ struct nxterm_state_s
* retained in the f_priv field of the 'struct file'.
*/
#ifndef CONFIG_DISABLE_POLL
struct pollfd *fds[CONFIG_NXTERM_NPOLLWAITERS];
#endif
#endif /* CONFIG_NXTERM_NXKBDIN */
};
@@ -214,10 +212,8 @@ void nxterm_unregister(FAR struct nxterm_state_s *priv);
#ifdef CONFIG_NXTERM_NXKBDIN
ssize_t nxterm_read(FAR struct file *filep, FAR char *buffer, size_t len);
#ifndef CONFIG_DISABLE_POLL
int nxterm_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup);
#endif
#endif
/* IOCTL handlers */
graphics/nxterm/nxterm_driver.c
+6 -12
View File
@@ -79,12 +79,9 @@ const struct file_operations g_nxterm_drvrops =
nxterm_close, /* close */
nxterm_read, /* read */
nxterm_write, /* write */
0, /* seek */
nxterm_ioctl /* ioctl */
#ifndef CONFIG_DISABLE_POLL
,
NULL, /* seek */
nxterm_ioctl, /* ioctl */
nxterm_poll /* poll */
#endif
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
,
nxterm_unlink /* unlink */
@@ -97,14 +94,11 @@ const struct file_operations g_nxterm_drvrops =
{
nxterm_open, /* open */
nxterm_close, /* close */
0, /* read */
NULL, /* read */
nxterm_write, /* write */
0, /* seek */
nxterm_ioctl /* ioctl */
#ifndef CONFIG_DISABLE_POLL
,
0 /* poll */
#endif
NULL, /* seek */
nxterm_ioctl, /* ioctl */
NULL /* poll */
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
,
nxterm_unlink /* unlink */
graphics/nxterm/nxterm_kbdin.c
+2 -11
View File
@@ -60,8 +60,8 @@
* Name: nxterm_pollnotify
****************************************************************************/
#ifndef CONFIG_DISABLE_POLL
static void nxterm_pollnotify(FAR struct nxterm_state_s *priv, pollevent_t eventset)
static void nxterm_pollnotify(FAR struct nxterm_state_s *priv,
pollevent_t eventset)
{
FAR struct pollfd *fds;
irqstate_t flags;
@@ -85,9 +85,6 @@ static void nxterm_pollnotify(FAR struct nxterm_state_s *priv, pollevent_t event
leave_critical_section(flags);
}
}
#else
# define nxterm_pollnotify(priv,event)
#endif
/****************************************************************************
* Public Functions
@@ -240,12 +237,10 @@ ssize_t nxterm_read(FAR struct file *filep, FAR char *buffer, size_t len)
errout_without_sem:
#ifndef CONFIG_DISABLE_POLL
if (nread > 0)
{
nxterm_pollnotify(priv, POLLOUT);
}
#endif
/* Return the number of characters actually read */
@@ -256,7 +251,6 @@ errout_without_sem:
* Name: nxterm_poll
****************************************************************************/
#ifndef CONFIG_DISABLE_POLL
int nxterm_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
{
FAR struct inode *inode = filep->f_inode;
@@ -355,7 +349,6 @@ errout:
nxterm_sempost(priv);
return ret;
}
#endif
/****************************************************************************
* Name: nxterm_kbdin
@@ -466,9 +459,7 @@ void nxterm_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen)
/* Notify all poll/select waiters that they can write to the FIFO */
#ifndef CONFIG_DISABLE_POLL
nxterm_pollnotify(priv, POLLIN);
#endif
sched_unlock();
}