Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-12 09:48:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

include/clock.h: Fix type of macro defination of constants

Browse Source 
keep type of constants as ul add clock_t cast to tick relate macro.

Signed-off-by: jiangtao16 <jiangtao16@xiaomi.com>
This commit is contained in:
jiangtao16
2025-09-09 12:10:38 +08:00
committed by Xiang Xiao
parent bc386d73b4
commit e01fbb757c
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/clock.h
+26 -24
View File
@@ -37,6 +37,7 @@
#include <nuttx/compiler.h>
#include <nuttx/lib/math32.h>
#include <nuttx/macro.h>
/****************************************************************************
* Pre-processor Definitions
@@ -106,34 +107,34 @@
/* Timing constants *********************************************************/
#define NSEC_PER_SEC 1000000000UL /* Seconds */
#define USEC_PER_SEC 1000000UL
#define MSEC_PER_SEC 1000UL
#define DSEC_PER_SEC 10
#define HSEC_PER_SEC 2
#define NSEC_PER_SEC 1000000000L /* Seconds */
#define USEC_PER_SEC 1000000L
#define MSEC_PER_SEC 1000L
#define DSEC_PER_SEC 10L
#define HSEC_PER_SEC 2L
#define NSEC_PER_HSEC 500000000UL /* Half seconds */
#define USEC_PER_HSEC 500000UL
#define MSEC_PER_HSEC 500
#define DSEC_PER_HSEC 5
#define NSEC_PER_HSEC 500000000L /* Half seconds */
#define USEC_PER_HSEC 500000L
#define MSEC_PER_HSEC 500L
#define DSEC_PER_HSEC 5L
#define NSEC_PER_DSEC 100000000UL /* Deciseconds */
#define USEC_PER_DSEC 100000UL
#define MSEC_PER_DSEC 100
#define NSEC_PER_DSEC 100000000L /* Deciseconds */
#define USEC_PER_DSEC 100000L
#define MSEC_PER_DSEC 100L
#define NSEC_PER_MSEC 1000000UL /* Milliseconds */
#define USEC_PER_MSEC 1000UL
#define NSEC_PER_MSEC 1000000L /* Milliseconds */
#define USEC_PER_MSEC 1000L
#define NSEC_PER_USEC 1000UL /* Microseconds */
#define NSEC_PER_USEC 1000L /* Microseconds */
#define SEC_PER_MIN 60
#define SEC_PER_MIN 60L
#define NSEC_PER_MIN (NSEC_PER_SEC * SEC_PER_MIN)
#define USEC_PER_MIN (USEC_PER_SEC * SEC_PER_MIN)
#define MSEC_PER_MIN (MSEC_PER_SEC * SEC_PER_MIN)
#define DSEC_PER_MIN (DSEC_PER_SEC * SEC_PER_MIN)
#define HSEC_PER_MIN (HSEC_PER_SEC * SEC_PER_MIN)
#define MIN_PER_HOUR 60
#define MIN_PER_HOUR 60L
#define NSEC_PER_HOUR (NSEC_PER_MIN * MIN_PER_HOUR)
#define USEC_PER_HOUR (USEC_PER_MIN * MIN_PER_HOUR)
#define MSEC_PER_HOUR (MSEC_PER_MIN * MIN_PER_HOUR)
@@ -141,7 +142,7 @@
#define HSEC_PER_HOUR (HSEC_PER_MIN * MIN_PER_HOUR)
#define SEC_PER_HOUR (SEC_PER_MIN * MIN_PER_HOUR)
#define HOURS_PER_DAY 24
#define HOURS_PER_DAY 24L
#define SEC_PER_DAY (HOURS_PER_DAY * SEC_PER_HOUR)
/* If CONFIG_SCHED_TICKLESS is not defined, then the interrupt interval of
@@ -159,9 +160,9 @@
*/
#ifdef CONFIG_USEC_PER_TICK
# define USEC_PER_TICK (CONFIG_USEC_PER_TICK)
# define USEC_PER_TICK CONCATENATE(CONFIG_USEC_PER_TICK, L)
#else
# define USEC_PER_TICK (10000)
# define USEC_PER_TICK (10000L)
#endif
/* MSEC_PER_TICK can be very inaccurate if CONFIG_USEC_PER_TICK is not an
@@ -336,15 +337,16 @@ extern "C"
#define clock_ticks2time(ts, tick) \
do \
{ \
clock_t _tick = (clock_t)(tick); \
(ts)->tv_sec = (time_t)div_const(_tick, TICK_PER_SEC); \
_tick -= (clock_t)(ts)->tv_sec * TICK_PER_SEC; \
clock_t _tick = tick; \
(ts)->tv_sec = (time_t)div_const(_tick, (uint32_t)TICK_PER_SEC); \
_tick -= (clock_t)((ts)->tv_sec * TICK_PER_SEC); \
(ts)->tv_nsec = (long)_tick * NSEC_PER_TICK; \
} \
while (0)
#define clock_time2ticks(ts) \
((clock_t)(ts)->tv_sec * TICK_PER_SEC + NSEC2TICK((uint32_t)(ts)->tv_nsec))
((clock_t)((ts)->tv_sec * TICK_PER_SEC) + \
(clock_t)div_const_roundup((uint64_t)(ts)->tv_nsec, (uint32_t)NSEC_PER_TICK))
#define clock_time2ticks_floor(ts) \
((clock_t)(ts)->tv_sec * TICK_PER_SEC + \
sched/clock/clock_initialize.c
+1 -1
View File
@@ -136,7 +136,7 @@ int clock_basetime(FAR struct timespec *tp)
/* Set the base time as seconds into this julian day. */
tp->tv_sec = jdn * SEC_PER_DAY;
tp->tv_sec = jdn * (time_t)SEC_PER_DAY;
tp->tv_nsec = 0;
return OK;
}