This commit is contained in:
Gregory Nutt 2019-05-26 12:33:42 -06:00
parent f60301665b
commit 788f77a9af
5 changed files with 7 additions and 13 deletions

View File

@ -44,14 +44,6 @@
#ifdef HAVE_CCM_HEAP
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/

View File

@ -48,7 +48,9 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
/* Assume that we can support the CCM heap */
#define HAVE_CCM_HEAP 1

View File

@ -1044,7 +1044,7 @@ static int ft5x06_poll(FAR struct file *filep, FAR struct pollfd *fds,
ret = nxsem_wait(&priv->devsem);
if (ret < 0)
{
/* This should only happen if the wait was cancelled by an signal */
/* This should only happen if the wait was canceled by an signal */
ierr("ERROR: nxsem_wait failed: %d\n", ret);
DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);

View File

@ -1456,7 +1456,7 @@ static int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
/* Some sanity checking */
#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !fds)
if (dev == NULL || fds == NULL)
{
return -ENODEV;
}
@ -1555,11 +1555,11 @@ static int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
}
}
else if (fds->priv)
else if (fds->priv != NULL)
{
/* This is a request to tear down the poll. */
struct pollfd **slot = (struct pollfd **)fds->priv;
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
#ifdef CONFIG_DEBUG_FEATURES
if (!slot)

View File

@ -457,7 +457,7 @@ void nxterm_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen)
nxsem_post(&priv->waitsem);
}
/* Notify all poll/select waiters that they can write to the FIFO */
/* Notify all poll/select waiters that they can read from the FIFO */
nxterm_pollnotify(priv, POLLIN);
sched_unlock();