Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Request for SIM/QEMU automation script #14007

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions include/nuttx/clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,6 @@ extern "C"
* access to kernel global data
*/

#ifdef __HAVE_KERNEL_GLOBALS
EXTERN volatile clock_t g_system_ticks;

# ifndef CONFIG_SYSTEM_TIME64
# define clock_systime_ticks() g_system_ticks
# endif
#endif

/****************************************************************************
* Public Function Prototypes
****************************************************************************/
Expand Down
4 changes: 3 additions & 1 deletion sched/clock/clock_systime_ticks.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@

up_timer_gettick(&ticks);
return ticks;
#elif defined(CONFIG_SCHED_TICKLESS)
#elif defined(CONFIG_ALARM_ARCH) || \
defined(CONFIG_TIMER_ARCH) || \
defined(CONFIG_SCHED_TICKLESS)
struct timespec ts =
{
0
Expand Down Expand Up @@ -123,6 +125,6 @@

return sample;
#else
return g_system_ticks;

Check failure on line 128 in sched/clock/clock_systime_ticks.c

View workflow job for this annotation

GitHub Actions / msys2 (msys2)

'g_system_ticks' undeclared (first use in this function); did you mean 'clock_systime_ticks'?

Check failure on line 128 in sched/clock/clock_systime_ticks.c

View workflow job for this annotation

GitHub Actions / msys2 (msys2)

'g_system_ticks' undeclared (first use in this function); did you mean 'clock_systime_ticks'?
#endif
}
4 changes: 3 additions & 1 deletion sched/clock/clock_systime_timespec.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,12 @@

up_timer_gettick(&ticks);
clock_ticks2time(ts, ticks);
#elif defined(CONFIG_SCHED_TICKLESS)
#elif defined(CONFIG_ALARM_ARCH) || \
defined(CONFIG_TIMER_ARCH) || \
defined(CONFIG_SCHED_TICKLESS)
up_timer_gettime(ts);
#else
clock_ticks2time(ts, g_system_ticks);

Check failure on line 90 in sched/clock/clock_systime_timespec.c

View workflow job for this annotation

GitHub Actions / msys2 (msys2)

'g_system_ticks' undeclared (first use in this function)

Check failure on line 90 in sched/clock/clock_systime_timespec.c

View workflow job for this annotation

GitHub Actions / msys2 (msys2)

'g_system_ticks' undeclared (first use in this function)
#endif
return 0;
}
Expand Down
Loading