diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-26 07:25:34 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-26 07:25:34 -0600 |
| commit | fcb7bb2b984bc528191b39fb6a436e0af63e7170 (patch) | |
| tree | e40a40e7ba40fbeeacd245e67e99f19218614802 | |
| parent | 3810231337f94c28e41d36815eb823d2811610b7 (diff) | |
| download | nuttx-fcb7bb2b984bc528191b39fb6a436e0af63e7170.tar.gz nuttx-fcb7bb2b984bc528191b39fb6a436e0af63e7170.tar.bz2 nuttx-fcb7bb2b984bc528191b39fb6a436e0af63e7170.zip | |
fs/poll: More typo fixes. Now I understand. It was not really being built in the configuration that I was using
| -rw-r--r-- | nuttx/fs/fs_poll.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/nuttx/fs/fs_poll.c b/nuttx/fs/fs_poll.c index 78d68602c..8ae0c8909 100644 --- a/nuttx/fs/fs_poll.c +++ b/nuttx/fs/fs_poll.c @@ -41,7 +41,6 @@ #include <stdint.h> #include <stdbool.h> -#include <time.h> #include <poll.h> #include <errno.h> #include <assert.h> @@ -244,22 +243,6 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds, int *count) #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 ****************************************************************************/ @@ -326,7 +309,7 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout) */ 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. * 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; } - ret = sem_timedwai&sem, &abstime); + ret = sem_timedwait(&sem, &abstime); irqrestore(flags); } else |