nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

sched/clock: cleanup g_system_ticks reference if arch timer is enabled

Browse source 
continue work of: https://github.com/apache/nuttx/pull/15139

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-12-12 15:09:21 +08:00 committed by Xiang Xiao
parent 1463a49396
commit 6825f66fd6
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sched/clock/clock.h
View file

@ -75,7 +75,8 @@ extern struct timespec g_basetime;
int clock_basetime(FAR struct timespec *tp); int clock_basetime(FAR struct timespec *tp);
void clock_initialize(void); void clock_initialize(void);
#ifndef CONFIG_SCHED_TICKLESS #if !defined(CONFIG_SCHED_TICKLESS) && \
!defined(CONFIG_ALARM_ARCH) && !defined(CONFIG_TIMER_ARCH)
void clock_timer(void); void clock_timer(void);
#else #else
# define clock_timer() # define clock_timer()

16
sched/clock/clock_initialize.c
View file

@ -49,12 +49,9 @@
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_SCHED_TICKLESS #if !defined(CONFIG_SCHED_TICKLESS) && \
#ifdef CONFIG_SYSTEM_TIME64 !defined(CONFIG_ALARM_ARCH) && !defined(CONFIG_TIMER_ARCH)
volatile uint64_t g_system_ticks = INITIAL_SYSTEM_TIMER_TICKS; volatile clock_t g_system_ticks = INITIAL_SYSTEM_TIMER_TICKS;
#else
volatile uint32_t g_system_ticks = INITIAL_SYSTEM_TIMER_TICKS;
#endif
#endif #endif
#ifndef CONFIG_CLOCK_TIMEKEEPING #ifndef CONFIG_CLOCK_TIMEKEEPING
@ -305,7 +302,9 @@ void clock_synchronize(FAR const struct timespec *tp)
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_RTC) && !defined(CONFIG_SCHED_TICKLESS) && !defined(CONFIG_CLOCK_TIMEKEEPING) #if defined(CONFIG_RTC) && !defined(CONFIG_SCHED_TICKLESS) && \
!defined(CONFIG_CLOCK_TIMEKEEPING) && !defined(CONFIG_ALARM_ARCH) && \
!defined(CONFIG_TIMER_ARCH)
void clock_resynchronize(FAR struct timespec *rtc_diff) void clock_resynchronize(FAR struct timespec *rtc_diff)
{ {
struct timespec rtc_time; struct timespec rtc_time;
@ -393,7 +392,8 @@ skip:
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_SCHED_TICKLESS #if !defined(CONFIG_SCHED_TICKLESS) && \
!defined(CONFIG_ALARM_ARCH) && !defined(CONFIG_TIMER_ARCH)
void clock_timer(void) void clock_timer(void)
{ {
/* Increment the per-tick system counter */ /* Increment the per-tick system counter */