Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 16:59:28 +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/sensors/hc_sr04.c
+2 -12
View File
@@ -72,10 +72,8 @@ static ssize_t hcsr04_read(FAR struct file *filep, FAR char *buffer,
static ssize_t hcsr04_write(FAR struct file *filep, FAR const char *buffer,
size_t buflen);
static int hcsr04_ioctl(FAR struct file *filep, int cmd, unsigned long arg);
#ifndef CONFIG_DISABLE_POLL
static int hcsr04_poll(FAR struct file *filep, FAR struct pollfd *fds,
bool setup);
#endif
/****************************************************************************
* Private Types
@@ -89,9 +87,7 @@ struct hcsr04_dev_s
int time_start_pulse;
int time_finish_pulse;
volatile bool rising;
#ifndef CONFIG_DISABLE_POLL
struct pollfd *fds[CONFIG_HCSR04_NPOLLWAITERS];
#endif
};
/****************************************************************************
@@ -105,10 +101,8 @@ static const struct file_operations g_hcsr04ops =
hcsr04_read, /* read */
hcsr04_write, /* write */
NULL, /* seek */
hcsr04_ioctl /* ioctl */
#ifndef CONFIG_DISABLE_POLL
, hcsr04_poll /* poll */
#endif
hcsr04_ioctl, /* ioctl */
hcsr04_poll /* poll */
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
, NULL /* unlink */
#endif
@@ -316,7 +310,6 @@ static int hcsr04_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
return ret;
}
#ifndef CONFIG_DISABLE_POLL
static bool hcsr04_sample(FAR struct hcsr04_dev_s *priv)
{
int done;
@@ -439,7 +432,6 @@ out:
nxsem_post(&priv->devsem);
return ret;
}
#endif /* !CONFIG_DISABLE_POLL */
static int hcsr04_int_handler(int irq, FAR void *context, FAR void *arg)
{
@@ -477,9 +469,7 @@ static int hcsr04_int_handler(int irq, FAR void *context, FAR void *arg)
}
hcsr04_dbg("HC-SR04 interrupt\n");
#ifndef CONFIG_DISABLE_POLL
hcsr04_notify(priv);
#endif
return OK;
}