diff options
| -rw-r--r-- | nuttx/sched/clock_initialize.c | 6 | ||||
| -rw-r--r-- | nuttx/sched/timer_initialize.c | 6 | ||||
| -rw-r--r-- | nuttx/sched/timer_settime.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/nuttx/sched/clock_initialize.c b/nuttx/sched/clock_initialize.c index 8dc8a00e8..e63ba1dea 100644 --- a/nuttx/sched/clock_initialize.c +++ b/nuttx/sched/clock_initialize.c @@ -51,6 +51,10 @@ * Definitions ****************************************************************************/ +#define SEC_PER_MIN ((time_t)60) +#define SEC_PER_HOUR ((time_t)60 * SEC_PER_MIN) +#define SEC_PER_DAY ((time_t)24 * SEC_PER_HOUR) + /**************************************************************************** * Private Type Declarations ****************************************************************************/ @@ -108,7 +112,7 @@ void clock_initialize(void) /* Set the base time as seconds into this julian day. */ - g_basetime.tv_sec = jdn * (24*60*60); + g_basetime.tv_sec = jdn * SEC_PER_DAY; g_basetime.tv_nsec = 0; /* These is no time bias from this time. */ diff --git a/nuttx/sched/timer_initialize.c b/nuttx/sched/timer_initialize.c index 9acfb17d3..af430fd58 100644 --- a/nuttx/sched/timer_initialize.c +++ b/nuttx/sched/timer_initialize.c @@ -1,7 +1,7 @@ /******************************************************************************** * timer_initialize.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 3. Neither the name NuttX nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -103,11 +103,11 @@ volatile sq_queue_t g_alloctimers; void weak_function timer_initialize(void) { +#if CONFIG_PREALLOC_TIMERS > 0 int i; /* Place all of the pre-allocated timers into the free timer list */ -#if CONFIG_PREALLOC_TIMERS > 0 sq_init((sq_queue_t*)&g_freetimers); for (i = 0; i < CONFIG_PREALLOC_TIMERS; i++) diff --git a/nuttx/sched/timer_settime.c b/nuttx/sched/timer_settime.c index 2068f56ab..25dfc32c4 100644 --- a/nuttx/sched/timer_settime.c +++ b/nuttx/sched/timer_settime.c @@ -1,7 +1,7 @@ /******************************************************************************** * sched/timer_settime.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without |