Rename CONFIG_SCHED_TIMEKEEPING to CONFIG_CLOCK_TIMEKEEPING. That is a better compartmentalized name.

This commit is contained in:
Gregory Nutt
2016-07-11 06:54:02 -06:00
parent f47b69e1f0
commit 246773faa7
18 changed files with 43 additions and 43 deletions
+1 -1
View File
@@ -38,7 +38,7 @@ CSRCS += clock_time2ticks.c clock_abstime2ticks.c clock_ticks2time.c
CSRCS += clock_systimer.c clock_systimespec.c clock_timespec_add.c
CSRCS += clock_timespec_subtract.c
ifeq ($(CONFIG_SCHED_TIMEKEEPING),y
ifeq ($(CONFIG_CLOCK_TIMEKEEPING),y
CSRCS += clock_timekeeping.c
endif
+1 -1
View File
@@ -79,7 +79,7 @@ extern volatile uint32_t g_system_timer;
# endif
#endif
#ifndef CONFIG_SCHED_TIMEKEEPING
#ifndef CONFIG_CLOCK_TIMEKEEPING
extern struct timespec g_basetime;
#endif
+5 -5
View File
@@ -49,7 +49,7 @@
#include <nuttx/arch.h>
#include "clock/clock.h"
#ifdef CONFIG_SCHED_TIMEKEEPING
#ifdef CONFIG_CLOCK_TIMEKEEPING
# include "clock/clock_timekeeping.h"
#endif
@@ -93,7 +93,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
* reset.
*/
#if defined(CONFIG_SCHED_TIMEKEEPING)
#if defined(CONFIG_CLOCK_TIMEKEEPING)
ret = clock_timekeeping_get_monotonic_time(tp);
#elif defined(CONFIG_SCHED_TICKLESS)
ret = up_timer_gettime(tp);
@@ -118,7 +118,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
* last set.
*/
#if defined(CONFIG_SCHED_TIMEKEEPING)
#if defined(CONFIG_CLOCK_TIMEKEEPING)
ret = clock_timekeeping_get_wall_time(tp);
#elif defined(CONFIG_SCHED_TICKLESS)
ret = up_timer_gettime(&ts);
@@ -126,7 +126,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
ret = clock_systimespec(&ts);
#endif
#ifndef CONFIG_SCHED_TIMEKEEPING
#ifndef CONFIG_CLOCK_TIMEKEEPING
if (ret == OK)
{
/* Add the base time to this. The base time is the time-of-day
@@ -151,7 +151,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
tp->tv_sec = ts.tv_sec;
tp->tv_nsec = ts.tv_nsec;
}
#endif /* CONFIG_SCHED_TIMEKEEPING */
#endif /* CONFIG_CLOCK_TIMEKEEPING */
}
else
{
+2 -2
View File
@@ -54,7 +54,7 @@
#include <nuttx/time.h>
#include "clock/clock.h"
#ifdef CONFIG_SCHED_TIMEKEEPING
#ifdef CONFIG_CLOCK_TIMEKEEPING
# include "clock/clock_timekeeping.h"
#endif
@@ -175,7 +175,7 @@ static void clock_inittime(void)
{
/* (Re-)initialize the time value to match the RTC */
#ifndef CONFIG_SCHED_TIMEKEEPING
#ifndef CONFIG_CLOCK_TIMEKEEPING
#ifndef CONFIG_RTC_HIRES
clock_basetime(&g_basetime);
#endif
+2 -2
View File
@@ -48,7 +48,7 @@
#include <nuttx/irq.h>
#include "clock/clock.h"
#ifdef CONFIG_SCHED_TIMEKEEPING
#ifdef CONFIG_CLOCK_TIMEKEEPING
# include "clock/clock_timekeeping.h"
#endif
@@ -79,7 +79,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
if (clock_id == CLOCK_REALTIME)
{
#ifndef CONFIG_SCHED_TIMEKEEPING
#ifndef CONFIG_CLOCK_TIMEKEEPING
/* Interrupts are disabled here so that the in-memory time
* representation and the RTC setting will be as close as
* possible.
+2 -2
View File
@@ -83,7 +83,7 @@ systime_t clock_systimer(void)
/* Get the time from the platform specific hardware */
#ifndef CONFIG_SCHED_TIMEKEEPING
#ifndef CONFIG_CLOCK_TIMEKEEPING
(void)up_timer_gettime(&ts);
#else
(void)clock_timekeeping_get_monotonic_time(&ts);
@@ -100,7 +100,7 @@ systime_t clock_systimer(void)
/* Get the time from the platform specific hardware */
#ifndef CONFIG_SCHED_TIMEKEEPING
#ifndef CONFIG_CLOCK_TIMEKEEPING
(void)up_timer_gettime(&ts);
#else
(void)clock_timekeeping_get_monotonic_time(&ts);
+2 -2
View File
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
#ifdef CONFIG_SCHED_TIMEKEEPING
#ifdef CONFIG_CLOCK_TIMEKEEPING
#include <sys/time.h>
#include <stdint.h>
@@ -326,4 +326,4 @@ void clock_inittimekeeping(void)
memset(&g_clock_monotonic_time, 0, sizeof(g_clock_monotonic_time));
}
#endif /* CONFIG_SCHED_TIMEKEEPING */
#endif /* CONFIG_CLOCK_TIMEKEEPING */