diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-03 11:21:35 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-03 11:21:35 -0600 |
| commit | 6c819d2332d9c9a587e00668f1d9f797b942a951 (patch) | |
| tree | 4bbf26decc7d0bf46fce8f26a3dd09974c6f5413 /nuttx/sched/clock | |
| parent | 25dcd00e237144cc1666375c708709f7dd4f7783 (diff) | |
| download | nuttx-6c819d2332d9c9a587e00668f1d9f797b942a951.tar.gz nuttx-6c819d2332d9c9a587e00668f1d9f797b942a951.tar.bz2 nuttx-6c819d2332d9c9a587e00668f1d9f797b942a951.zip | |
Update TODO list + cosmetic changes to clock_systimer.c
Diffstat (limited to 'nuttx/sched/clock')
| -rw-r--r-- | nuttx/sched/clock/clock_systimer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nuttx/sched/clock/clock_systimer.c b/nuttx/sched/clock/clock_systimer.c index 530d4b18c..c316b8c08 100644 --- a/nuttx/sched/clock/clock_systimer.c +++ b/nuttx/sched/clock/clock_systimer.c @@ -53,7 +53,7 @@ #undef clock_systimer #undef clock_systimer64 - + /**************************************************************************** * Private Data ****************************************************************************/ @@ -99,13 +99,14 @@ uint32_t clock_systimer(void) /* Return the current system time truncated to 32-bits */ return (uint32_t)(g_system_timer & 0x00000000ffffffff); + #else /* Return the current system time */ return g_system_timer; -#endif #endif +#endif } /**************************************************************************** @@ -134,7 +135,7 @@ uint64_t clock_systimer64(void) (void)up_timer_gettime(&ts); - /* Convert to a 64- then 32-bit value */ + /* Convert to a 64-bit value */ return MSEC2TICK(1000 * (uint64_t)ts.tv_sec + (uint64_t)ts.tv_nsec / 1000000); @@ -142,6 +143,7 @@ uint64_t clock_systimer64(void) /* Return the current system time */ return g_system_timer; + #endif } #endif |