Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't try to return time remaining if the timespec pointer is NULL

Browse Source
This commit is contained in:
Gregory Nutt
2014-08-10 11:39:16 -06:00
parent a5514be85c
commit 71e18367f6
1 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/sama5/sam_oneshot.c
+18 -26
View File
@@ -54,7 +54,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <debug.h>
#include <arch/irq.h> #include <arch/irq.h>
@@ -66,18 +65,6 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAMA5_TC_DEBUG
# define tcdbg dbg
# define tcvdbg vdbg
# define tclldbg lldbg
# define tcllvdbg llvdbg
#else
# define tcdbg(x...)
# define tcvdbg(x...)
# define tclldbg(x...)
# define tcllvdbg(x...)
#endif
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@@ -295,8 +282,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, oneshot_handler_t handler,
usec = (uint64_t)ts->tv_sec * 1000000 + (uint64_t)(ts->tv_nsec / 1000); usec = (uint64_t)ts->tv_sec * 1000000 + (uint64_t)(ts->tv_nsec / 1000);
regval = usec / oneshot->resolution; regval = usec / oneshot->resolution;
tcdbg("usec=%lu regval=%08lx\n", tcvdbg("usec=%lu regval=%08lx\n",
(unsigned long)usec, (unsigned long)regval); (unsigned long)usec, (unsigned long)regval);
DEBUGASSERT(regval <= UINT32_MAX); DEBUGASSERT(regval <= UINT32_MAX);
/* Set up to receive the callback when the interrupt occurs */ /* Set up to receive the callback when the interrupt occurs */
@@ -338,7 +325,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, oneshot_handler_t handler,
* sam_oneshot_initialize(); * sam_oneshot_initialize();
* ts The location in which to return the time remaining on the * ts The location in which to return the time remaining on the
* oneshot timer. A time of zero is returned if the timer is * oneshot timer. A time of zero is returned if the timer is
* not running. * not running. ts may be zero in which case the time remaining
* is not returned.
* *
* Returned Value: * Returned Value:
* Zero (OK) is returned on success. A call to up_timer_cancel() when * Zero (OK) is returned on success. A call to up_timer_cancel() when
@@ -404,20 +392,24 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct timespec *ts)
/* The total time remaining is the difference */ /* The total time remaining is the difference */
DEBUGASSERT(rc >= count); DEBUGASSERT(rc >= count);
usec = (rc - count) * oneshot->resolution; if (ts)
{
usec = (rc - count) * oneshot->resolution;
tcdbg("rc=%lu count=%lu resolution=%u usec=%lu\n", tcvdbg("rc=%lu count=%lu resolution=%u usec=%lu\n",
(unsigned long)rc, (unsigned long)count, oneshot->resolution, (unsigned long)rc, (unsigned long)count, oneshot->resolution,
(unsigned long)usec); (unsigned long)usec);
/* Return the time remaining in the correct form */ /* Return the time remaining in the correct form */
sec = usec / 1000000; sec = usec / 1000000;
ts->tv_sec = sec; ts->tv_sec = sec;
ts->tv_nsec = ((usec) - (sec * 1000000)) * 1000; ts->tv_nsec = ((usec) - (sec * 1000000)) * 1000;
tcvdbg("remaining (%lu, %lu)\n",
(unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
}
tcvdbg("remaining (%lu, %lu)\n",
(unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
return OK; return OK;
} }