Fixes to tickless operation code. From Brandon Warhurst

This commit is contained in:
Gregory Nutt 2014-10-23 06:41:31 -06:00
parent c8b4ab7383
commit a7a5c8cff3
2 changed files with 6 additions and 6 deletions

View File

@ -1676,7 +1676,7 @@ void sched_timer_expiration(void);
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_SCHED_TICKLESS) && defined(CONFIG_SCHED_TICKLESS_ALARM) #if defined(CONFIG_SCHED_TICKLESS) && defined(CONFIG_SCHED_TICKLESS_ALARM)
void sched_alarm_expiration(FAR const struct *ts); void sched_alarm_expiration(FAR const struct timespec *ts);
#endif #endif
/************************************************************************ /************************************************************************

View File

@ -131,14 +131,14 @@ static struct timespec g_stop_time;
#ifdef CONFIG_SCHED_TICKLESS_ALARM #ifdef CONFIG_SCHED_TICKLESS_ALARM
static void sched_timespec_add(FAR const struct timespec *ts1, static void sched_timespec_add(FAR const struct timespec *ts1,
FAR const struct timespec *ts2, FAR const struct timespec *ts2,
FAR struct timespec ts3) FAR struct timespec *ts3)
{ {
time_t sec = ts1->tv_sec + ts2->tv_sec; time_t sec = ts1->tv_sec + ts2->tv_sec;
long nsec = ts1->tv_nsec + ts2->tv_nsec; long nsec = ts1->tv_nsec + ts2->tv_nsec;
if (nsec >= NSEC_PER_SEC) if (nsec >= NSEC_PER_SEC)
{ {
nsec -= NSEC_PER_SEC nsec -= NSEC_PER_SEC;
sec++; sec++;
} }
@ -166,7 +166,7 @@ static void sched_timespec_add(FAR const struct timespec *ts1,
#ifdef CONFIG_SCHED_TICKLESS_ALARM #ifdef CONFIG_SCHED_TICKLESS_ALARM
static void sched_timespec_subtract(FAR const struct timespec *ts1, static void sched_timespec_subtract(FAR const struct timespec *ts1,
FAR const struct timespec *ts2, FAR const struct timespec *ts2,
FAR struct timespec ts3) FAR struct timespec *ts3)
{ {
time_t sec; time_t sec;
long nsec; long nsec;
@ -196,7 +196,7 @@ static void sched_timespec_subtract(FAR const struct timespec *ts1,
} }
ts3->tv_sec = sec; ts3->tv_sec = sec;
ts3->tv_nsec = sec; ts3->tv_nsec = nsec;
} }
#endif #endif
@ -497,7 +497,7 @@ static void sched_timer_start(unsigned int ticks)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SCHED_TICKLESS_ALARM #ifdef CONFIG_SCHED_TICKLESS_ALARM
void sched_alarm_expiration(FAR const struct *ts); void sched_alarm_expiration(FAR const struct timespec *ts)
{ {
unsigned int elapsed; unsigned int elapsed;
unsigned int nexttime; unsigned int nexttime;