sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/poll: More typo fixes. Now I understand. It was not really being built in the configuration that I was using

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-26 07:25:34 -06:00
parent edcf863162
commit a05107e7fe
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/fs_poll.c
View File

@ -41,7 +41,6 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <time.h>
#include <poll.h> #include <poll.h>
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
@ -243,22 +242,6 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds, int *count)
} }
#endif #endif
/****************************************************************************
* Name: poll_timeout
*
* Description:
* The wdog expired before any other events were received.
*
****************************************************************************/
static void poll_timeout(int argc, uint32_t isem, ...)
{
/* Wake up the poller */
FAR sem_t *sem = (FAR sem_t *)isem;
poll_semgive(sem);
}
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -326,7 +309,7 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout)
*/ */
sec = timeout / MSEC_PER_SEC; sec = timeout / MSEC_PER_SEC;
nsec = (timout - MSEC_PER_SEC * sec) * NSEC_PER_MSEC; nsec = (timeout - MSEC_PER_SEC * sec) * NSEC_PER_MSEC;
/* Make sure that the following are atomic by disabling interrupts. /* Make sure that the following are atomic by disabling interrupts.
* Interrupts will be re-enabled while we are waiting. * Interrupts will be re-enabled while we are waiting.
@ -343,7 +326,7 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout)
abstime.tv_nsec -= NSEC_PER_SEC; abstime.tv_nsec -= NSEC_PER_SEC;
} }
ret = sem_timedwai&sem, &abstime); ret = sem_timedwait(&sem, &abstime);
irqrestore(flags); irqrestore(flags);
} }
else else