From 39b93bf9fe041c6146f8086ed0335cefeb990133 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Fri, 8 May 2026 18:32:57 +0800 Subject: [PATCH 1/8] sched/clock: Remove TIMER_MASK32 from clock.h since it isn't used anymore Signed-off-by: Xiang Xiao --- sched/clock/clock.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sched/clock/clock.h b/sched/clock/clock.h index 71b80297b094f..4ea585f3ea257 100644 --- a/sched/clock/clock.h +++ b/sched/clock/clock.h @@ -39,10 +39,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* 32-bit mask for 64-bit timer values */ - -#define TIMER_MASK32 0x00000000ffffffff - /* Configuration ************************************************************/ /* If CONFIG_SYSTEM_TIME64 is selected and the CPU supports long long types, From 7df23b73c47fdb450bf721d01aebaa2dae965ef9 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 3 May 2026 16:24:57 +0800 Subject: [PATCH 2/8] !compiler: drop CONFIG_HAVE_LONG_LONG and require long long support Every compiler supported by NuttX provides the "long long" types, so the CONFIG_HAVE_LONG_LONG indirection is no longer useful. Remove the option from include/nuttx/compiler.h and treat "long long" as unconditionally available across the OS. In addition to deleting the guard itself, this commit unconditionally enables the long-long flavored helpers that used to be gated behind it: - libs/libc/fixedmath: drop the soft-emulated b32/ub32 routines in lib_fixedmath.c (-261 lines) and trim the matching prototypes, Make.defs and CMakeLists.txt entries; keep only the long-long backed implementations. - include/sys/endian.h, include/strings.h, libs/libc/string /lib_ffsll.c, lib_flsll.c: always expose the 64-bit byte-swap and ffsll/flsll variants. - libs/libm/libm/lib_llround{,f,l}.c: drop the empty stubs. - libs/libc/stdlib (atoll, llabs, lldiv, strtoll/ull, rand48, strtold), libs/libc/stream (libvsprintf, libvscanf, libbsprintf, ultoa_invert), libs/libc/misc (crc64, crc64emac), libs/libc/inttypes/strtoimax, libs/libc/lzf, libs/libc/libc.csv, libs/libc/string (memset, vikmemcpy): remove the #ifdef CONFIG_HAVE_LONG_LONG branches. - include/{stddef.h,stdlib.h,fixedmath.h,sys/epoll.h,cxx/cstdlib, nuttx/audio/audio.h,nuttx/crc64.h,nuttx/lib/math.h, nuttx/lib/math32.h,nuttx/lib/stdbit.h}: same guard cleanup. - drivers/note/note_driver.c, fs/spiffs/src/spiffs.h, sched/irq/irq_procfs.c: drop their local guards as well. - Documentation/applications/netutils/ntpclient/index.rst: refresh the documentation snippet. Signed-off-by: Xiang Xiao --- .../applications/netutils/ntpclient/index.rst | 1 - drivers/note/note_driver.c | 4 - fs/spiffs/src/spiffs.h | 4 - include/cxx/cstdlib | 6 - include/fixedmath.h | 57 +--- include/nuttx/audio/audio.h | 2 - include/nuttx/clock.h | 8 - include/nuttx/compiler.h | 10 - include/nuttx/crc64.h | 3 - include/nuttx/lib/math.h | 4 - include/nuttx/lib/math32.h | 5 +- include/nuttx/lib/stdbit.h | 3 +- include/stddef.h | 4 - include/stdlib.h | 10 - include/strings.h | 18 +- include/sys/endian.h | 60 ++-- include/sys/epoll.h | 2 - libs/libc/fixedmath/CMakeLists.txt | 3 +- libs/libc/fixedmath/Make.defs | 2 +- libs/libc/fixedmath/lib_fixedmath.c | 261 ------------------ libs/libc/fixedmath/lib_ubsqrt.c | 4 - libs/libc/inttypes/lib_strtoimax.c | 3 - libs/libc/libc.csv | 15 +- libs/libc/lzf/lzf_c.c | 7 +- libs/libc/misc/lib_crc64.c | 3 - libs/libc/misc/lib_crc64emac.c | 3 - libs/libc/stdlib/lib_atoll.c | 2 - libs/libc/stdlib/lib_llabs.c | 2 - libs/libc/stdlib/lib_lldiv.c | 3 - libs/libc/stdlib/lib_rand48.c | 4 - libs/libc/stdlib/lib_strtold.c | 9 +- libs/libc/stdlib/lib_strtoll.c | 3 - libs/libc/stdlib/lib_strtoull.c | 3 - libs/libc/stream/lib_libbsprintf.c | 4 - libs/libc/stream/lib_libvscanf.c | 40 +-- libs/libc/stream/lib_libvsprintf.c | 40 +-- libs/libc/stream/lib_ultoa_invert.h | 4 - libs/libc/string/lib_ffsll.c | 3 - libs/libc/string/lib_flsll.c | 3 - libs/libc/string/lib_memset.c | 12 - libs/libc/string/lib_vikmemcpy.c | 40 +-- libs/libm/libm/lib_llround.c | 2 - libs/libm/libm/lib_llroundf.c | 2 - libs/libm/libm/lib_llroundl.c | 2 - sched/clock/clock.h | 18 -- sched/irq/irq_procfs.c | 9 +- 46 files changed, 96 insertions(+), 611 deletions(-) delete mode 100644 libs/libc/fixedmath/lib_fixedmath.c diff --git a/Documentation/applications/netutils/ntpclient/index.rst b/Documentation/applications/netutils/ntpclient/index.rst index 6dde8fe632baa..b6349b49a45ff 100644 --- a/Documentation/applications/netutils/ntpclient/index.rst +++ b/Documentation/applications/netutils/ntpclient/index.rst @@ -167,7 +167,6 @@ The NTP client requires: - **CONFIG_NET_UDP**: UDP protocol support - **CONFIG_NET_SOCKOPTS**: Socket options support - **CONFIG_LIBC_NETDB**: DNS resolution (recommended) -- **CONFIG_HAVE_LONG_LONG**: 64-bit integer support For best results, ensure: - Stable network connectivity diff --git a/drivers/note/note_driver.c b/drivers/note/note_driver.c index bbdb180e0f5f0..f9c803493a6cd 100644 --- a/drivers/note/note_driver.c +++ b/drivers/note/note_driver.c @@ -1568,9 +1568,7 @@ void sched_note_vprintf_ip(uint32_t tag, uintptr_t ip, FAR const char *fmt, { int i; long l; -#ifdef CONFIG_HAVE_LONG_LONG long long ll; -#endif intmax_t im; size_t sz; ptrdiff_t ptr; @@ -1679,7 +1677,6 @@ void sched_note_vprintf_ip(uint32_t tag, uintptr_t ip, FAR const char *fmt, var->im = va_arg(*va, intmax_t); next += sizeof(var->im); } -#ifdef CONFIG_HAVE_LONG_LONG else if (*(p - 2) == 'l' && *(p - 3) == 'l') { if (next + sizeof(var->ll) > length) @@ -1690,7 +1687,6 @@ void sched_note_vprintf_ip(uint32_t tag, uintptr_t ip, FAR const char *fmt, var->ll = va_arg(*va, long long); next += sizeof(var->ll); } -#endif else if (*(p - 2) == 'l') { if (next + sizeof(var->l) > length) diff --git a/fs/spiffs/src/spiffs.h b/fs/spiffs/src/spiffs.h index d564f102ce5e6..09ac969e89200 100644 --- a/fs/spiffs/src/spiffs.h +++ b/fs/spiffs/src/spiffs.h @@ -122,11 +122,7 @@ struct spiffs_s FAR uint8_t *work; /* Secondary work buffer, size of a logical page */ FAR uint8_t *mtd_work; /* MTD I/O buffer for read-modify-write */ FAR void *cache; /* Cache memory */ -#ifdef CONFIG_HAVE_LONG_LONG off64_t media_size; /* Physical size of the SPI flash */ -#else - off_t media_size; /* Physical size of the SPI flash */ -#endif int free_entry; /* Cursor for free blocks, entry index */ int lu_entry; /* Cursor when searching, entry index */ uint32_t total_pages; /* Total number of pages on the media */ diff --git a/include/cxx/cstdlib b/include/cxx/cstdlib index 87e350e2e5e90..ff6e41bc37de0 100644 --- a/include/cxx/cstdlib +++ b/include/cxx/cstdlib @@ -72,10 +72,8 @@ namespace std using ::atol; using ::strtol; using ::strtoul; -#ifdef CONFIG_HAVE_LONG_LONG using ::strtoll; using ::strtoull; -#endif using ::strtof; #ifdef CONFIG_HAVE_DOUBLE using ::strtod; @@ -114,15 +112,11 @@ namespace std using ::abs; using ::labs; -#ifdef CONFIG_HAVE_LONG_LONG using ::llabs; -#endif using ::div; using ::ldiv; -#ifdef CONFIG_HAVE_LONG_LONG using ::lldiv; -#endif // Temporary files diff --git a/include/fixedmath.h b/include/fixedmath.h index 585c25cdd7a10..b21f49ad4f803 100644 --- a/include/fixedmath.h +++ b/include/fixedmath.h @@ -94,15 +94,13 @@ #define b16tob8(b) (b8_t)(((b)+0x0080)>>8) #define ub16toub8(b) (ub8_t)(((b)+0x0080)>>8) -#ifdef CONFIG_HAVE_LONG_LONG -# define b8tob32(b) (((b32_t)(b)) << 24) -# define ub8toub32(b) (((ub32_t)(b)) << 24) -# define b16tob32(b) (((b32_t)(b)) << 16) -# define ub16toub32(b) (((ub32_t)(b)) << 16) -# define b32tob16(b) (b16_t)(((b) + 0x0000000000008000)>>16) -# define ub32toub16(b) (ub16_t)(((b) + 0x0000000000008000)>>16) -# define b32tob8(b) (b8_t)(((b) + 0x0000000000000080)>>8) -#endif +#define b8tob32(b) (((b32_t)(b)) << 24) +#define ub8toub32(b) (((ub32_t)(b)) << 24) +#define b16tob32(b) (((b32_t)(b)) << 16) +#define ub16toub32(b) (((ub32_t)(b)) << 16) +#define b32tob16(b) (b16_t)(((b) + 0x0000000000008000)>>16) +#define ub32toub16(b) (ub16_t)(((b) + 0x0000000000008000)>>16) +#define b32tob8(b) (b8_t)(((b) + 0x0000000000000080)>>8) /* 16-bit values with 8 bits of precision ***********************************/ @@ -168,32 +166,27 @@ #define b16abs(b) ((b < 0) ? (-b) : (b)) /* Get the absolute value */ #define b16sign(b) ((b > 0) ? (b16ONE) : (-b16ONE)) -#ifdef CONFIG_HAVE_LONG_LONG /* Multiplication operators */ -# define b16mulb16(a,b) b32tob16((b32_t)(a)*(b32_t)(b)) -# define ub16mulub16(a,b) ub32toub16((ub32_t)(a)*(ub32_t)(b)) +#define b16mulb16(a,b) b32tob16((b32_t)(a)*(b32_t)(b)) +#define ub16mulub16(a,b) ub32toub16((ub32_t)(a)*(ub32_t)(b)) /* Square operators */ -# define b16sqr(a) b16mulb16(a,a) -# define ub16sqr(a) ub16mulub16(a,a) +#define b16sqr(a) b16mulb16(a,a) +#define ub16sqr(a) ub16mulub16(a,a) /* Division operators */ -# define b16divb16(a,b) (b16_t)(b16tob32(a)/(b32_t)(b)) -# define ub16divub16(a,b) (ub16_t)(ub16toub32(a)/(ub32_t)(b)) +#define b16divb16(a,b) (b16_t)(b16tob32(a)/(b32_t)(b)) +#define ub16divub16(a,b) (ub16_t)(ub16toub32(a)/(ub32_t)(b)) /* Square root operators */ -# define ub16sqrtub16(a) ub32sqrtub16(ub16toub32(a)) -#else -# define ub16sqrtub16(a) ub8toub16(ub16sqrtub8(a)) -#endif +#define ub16sqrtub16(a) ub32sqrtub16(ub16toub32(a)) /* 64-bit values with 32 bits of precision **********************************/ -#ifdef CONFIG_HAVE_LONG_LONG /* Conversions */ #define b32toi(a) ((a) >> 32) /* Conversion to integer */ @@ -206,7 +199,6 @@ #define b32frac(a) ((a) & 0x00000000ffffffff) /* Take fractional part */ #define b32abs(b) ((b < 0) ? (-b) : (b)) /* Get the absolute value */ #define b32sign(b) ((b > 0) ? (b32ONE) : (-b32ONE)) -#endif /**************************************************************************** * Public Types @@ -216,10 +208,8 @@ typedef int16_t b8_t; typedef uint16_t ub8_t; typedef int32_t b16_t; typedef uint32_t ub16_t; -#ifdef CONFIG_HAVE_LONG_LONG typedef int64_t b32_t; typedef uint64_t ub32_t; -#endif /**************************************************************************** * Public Function Prototypes @@ -234,23 +224,6 @@ extern "C" #define EXTERN extern #endif -#ifndef CONFIG_HAVE_LONG_LONG -/* Multiplication operators */ - -b16_t b16mulb16(b16_t m1, b16_t m2); -ub16_t ub16mulub16(ub16_t m1, ub16_t m2); - -/* Square operators */ - -b16_t b16sqr(b16_t a); -ub16_t ub16sqr(ub16_t a); - -/* Division operators */ - -b16_t b16divb16(b16_t num, b16_t denom); -ub16_t ub16divub16(ub16_t num, ub16_t denom); -#endif - /* Trigonometric Functions */ b16_t b16sin(b16_t rad); @@ -259,9 +232,7 @@ b16_t b16atan2(b16_t y, b16_t x); /* Square root operators */ -#ifdef CONFIG_HAVE_LONG_LONG ub16_t ub32sqrtub16(ub32_t a); -#endif ub8_t ub16sqrtub8(ub16_t a); #undef EXTERN diff --git a/include/nuttx/audio/audio.h b/include/nuttx/audio/audio.h index 624c4ea836edc..0a3d3d0f88ba5 100644 --- a/include/nuttx/audio/audio.h +++ b/include/nuttx/audio/audio.h @@ -710,9 +710,7 @@ struct audio_caps_s uint8_t b[4]; uint16_t hw[2]; uint32_t w; -#ifdef CONFIG_HAVE_LONG_LONG uint64_t qw; -#endif } ac_controls; /* Codec info */ diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h index d7dbfc4d467f6..3485e5568cb80 100644 --- a/include/nuttx/clock.h +++ b/include/nuttx/clock.h @@ -77,14 +77,6 @@ # define __HAVE_KERNEL_GLOBALS 1 #endif -/* If CONFIG_SYSTEM_TIME64 is selected and the CPU supports long long types, - * then a 64-bit system time will be used. - */ - -#ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_SYSTEM_TIME64 -#endif - /* The following are the bit fields of the clockid_t * bit 0~2: the clock type * CLOCK_REALTIME - 0 diff --git a/include/nuttx/compiler.h b/include/nuttx/compiler.h index 65cbce4e8d0aa..81d83f501a868 100644 --- a/include/nuttx/compiler.h +++ b/include/nuttx/compiler.h @@ -442,7 +442,6 @@ /* Define these here and allow specific architectures to override as needed */ -# define CONFIG_HAVE_LONG_LONG 1 # define CONFIG_HAVE_FLOAT 1 # define CONFIG_HAVE_DOUBLE 1 # define CONFIG_HAVE_LONG_DOUBLE 1 @@ -814,7 +813,6 @@ * double. */ -# define CONFIG_HAVE_LONG_LONG 1 # define CONFIG_HAVE_FLOAT 1 # undef CONFIG_HAVE_DOUBLE # undef CONFIG_HAVE_LONG_DOUBLE @@ -982,7 +980,6 @@ * simply do not support long long or double. */ -# undef CONFIG_HAVE_LONG_LONG # define CONFIG_HAVE_FLOAT 1 # undef CONFIG_HAVE_DOUBLE # undef CONFIG_HAVE_LONG_DOUBLE @@ -1106,7 +1103,6 @@ /* Define these here and allow specific architectures to override as needed */ -# define CONFIG_HAVE_LONG_LONG 1 # define CONFIG_HAVE_FLOAT 1 # define CONFIG_HAVE_DOUBLE 1 # define CONFIG_HAVE_LONG_DOUBLE 1 @@ -1211,7 +1207,6 @@ /* Define these here and allow specific architectures to override as needed */ -# define CONFIG_HAVE_LONG_LONG 1 # define CONFIG_HAVE_FLOAT 1 # define CONFIG_HAVE_DOUBLE 1 # define CONFIG_HAVE_LONG_DOUBLE 1 @@ -1379,7 +1374,6 @@ # undef CONFIG_SMALL_MEMORY # undef CONFIG_LONG_IS_NOT_INT # undef CONFIG_PTR_IS_NOT_INT -# undef CONFIG_HAVE_LONG_LONG # define CONFIG_HAVE_FLOAT 1 # undef CONFIG_HAVE_DOUBLE # undef CONFIG_HAVE_LONG_DOUBLE @@ -1406,10 +1400,6 @@ #endif -#ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_FS_LARGEFILE -#endif - #ifdef CONFIG_DISABLE_FLOAT # undef CONFIG_HAVE_FLOAT # undef CONFIG_HAVE_DOUBLE diff --git a/include/nuttx/crc64.h b/include/nuttx/crc64.h index 35115dea430e2..0026f23289663 100644 --- a/include/nuttx/crc64.h +++ b/include/nuttx/crc64.h @@ -32,8 +32,6 @@ #include #include -#ifdef CONFIG_HAVE_LONG_LONG - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -123,5 +121,4 @@ uint64_t crc64emac(FAR const uint8_t *src, size_t len); } #endif -#endif /* CONFIG_HAVE_LONG_LONG */ #endif /* __INCLUDE_NUTTX_CRC64_H */ diff --git a/include/nuttx/lib/math.h b/include/nuttx/lib/math.h index e9d4895b82703..771901f7e31fb 100644 --- a/include/nuttx/lib/math.h +++ b/include/nuttx/lib/math.h @@ -179,7 +179,6 @@ long int lround(double x); long int lroundl(long double x); #endif -#ifdef CONFIG_HAVE_LONG_LONG long long int llroundf(float x); #ifdef CONFIG_HAVE_DOUBLE long long int llround (double x); @@ -187,7 +186,6 @@ long long int llround (double x); #ifdef CONFIG_HAVE_LONG_DOUBLE long long int llroundl(long double x); #endif -#endif float rintf(float x); /* Not implemented */ #ifdef CONFIG_HAVE_DOUBLE @@ -205,7 +203,6 @@ long int lrint(double x); long int lrintl(long double x); #endif -#ifdef CONFIG_HAVE_LONG_LONG long long int llrintf(float x); #ifdef CONFIG_HAVE_DOUBLE long long int llrint(double x); @@ -213,7 +210,6 @@ long long int llrint(double x); #ifdef CONFIG_HAVE_LONG_DOUBLE long long int llrintl(long double x); #endif -#endif float fabsf (float x); #ifdef CONFIG_HAVE_DOUBLE diff --git a/include/nuttx/lib/math32.h b/include/nuttx/lib/math32.h index 3bb55c065c287..14fd78577bbb8 100644 --- a/include/nuttx/lib/math32.h +++ b/include/nuttx/lib/math32.h @@ -196,7 +196,6 @@ extern "C" * (It is unfortunate that gcc doesn't perform all this internally.) */ -#ifdef CONFIG_HAVE_LONG_LONG /* Default C implementation for umul64_const() * * Prototype: uint64_t umul64_const(uint64_t retval, uint64_t m, @@ -319,9 +318,7 @@ extern "C" } \ while (0) -#endif - -#if defined(CONFIG_HAVE_LONG_LONG) && defined(CONFIG_HAVE_EXPRESSION_STATEMENT) +#if defined(CONFIG_HAVE_EXPRESSION_STATEMENT) # define div64_const(n, base) \ ({ \ uint64_t __n = (n); \ diff --git a/include/nuttx/lib/stdbit.h b/include/nuttx/lib/stdbit.h index 25858a6100536..b360315e70c9e 100644 --- a/include/nuttx/lib/stdbit.h +++ b/include/nuttx/lib/stdbit.h @@ -50,8 +50,7 @@ # error "Generic stdbit requires CONFIG_HAVE_BUILTIN_CLZ, CTZ, POPCOUNT" # endif -# if defined(CONFIG_HAVE_LONG_LONG) && \ - !defined(CONFIG_HAVE_BUILTIN_POPCOUNTLL) +# if !defined(CONFIG_HAVE_BUILTIN_POPCOUNTLL) # error "Generic stdbit 64-bit requires CONFIG_HAVE_BUILTIN_POPCOUNTLL" # endif diff --git a/include/stddef.h b/include/stddef.h index afe88c6d7f1e2..cbea9949e2801 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -72,11 +72,7 @@ typedef struct { -#if defined(CONFIG_HAVE_LONG_LONG) long long max_align_i; -#else - long max_align_i; -#endif #if defined(CONFIG_HAVE_LONG_DOUBLE) long double max_align_f; #elif defined(CONFIG_HAVE_DOUBLE) diff --git a/include/stdlib.h b/include/stdlib.h index 0047c798ddbef..ca93bb4ca085d 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -154,7 +154,6 @@ int rand_r(FAR unsigned int *seedp); void lcong48(FAR unsigned short int param[7]); FAR unsigned short int *seed48(FAR unsigned short int seed16v[3]); void srand48(long int seedval); -#ifdef CONFIG_HAVE_LONG_LONG long int jrand48(FAR unsigned short int xsubi[3]); long int lrand48(void); long int mrand48(void); @@ -163,7 +162,6 @@ long int nrand48(FAR unsigned short int xsubi[3]); double drand48(void); double erand48(FAR unsigned short int xsubi[3]); # endif -#endif #define srandom(s) srand(s) long random(void); @@ -209,11 +207,9 @@ FAR char *realpath(FAR const char *path, FAR char *resolved); long strtol(FAR const char *nptr, FAR char **endptr, int base); unsigned long strtoul(FAR const char *nptr, FAR char **endptr, int base); -#ifdef CONFIG_HAVE_LONG_LONG long long strtoll(FAR const char *nptr, FAR char **endptr, int base); unsigned long long strtoull(FAR const char *nptr, FAR char **endptr, int base); -#endif float strtof(FAR const char *str, FAR char **endptr); #ifdef CONFIG_HAVE_DOUBLE double strtod(FAR const char *str, FAR char **endptr); @@ -224,9 +220,7 @@ long double strtold(FAR const char *str, FAR char **endptr); int atoi(FAR const char *nptr); long atol(FAR const char *nptr); -#ifdef CONFIG_HAVE_LONG_LONG long long atoll(FAR const char *nptr); -#endif #ifdef CONFIG_HAVE_DOUBLE double atof(FAR const char *nptr); #endif @@ -273,15 +267,11 @@ int unlockpt(int fd); int abs(int j); long int labs(long int j); -#ifdef CONFIG_HAVE_LONG_LONG long long int llabs(long long int j); -#endif div_t div(int number, int denom); ldiv_t ldiv(long number, long denom); -#ifdef CONFIG_HAVE_LONG_LONG lldiv_t lldiv(long long number, long long denom); -#endif /* Temporary files */ diff --git a/include/strings.h b/include/strings.h index a0590f946964a..d73f507fe707e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -92,16 +92,12 @@ int ffsl(long j); # define ffsl(j) (__builtin_ctzl(j) + 1) #endif -#ifdef CONFIG_HAVE_LONG_LONG - int ffsll(long long j); -# ifdef CONFIG_HAVE_BUILTIN_FFSLL -# define ffsll(j) __builtin_ffsll(j) -# elif defined (CONFIG_HAVE_BUILTIN_CTZ) -# define ffsll(j) (__builtin_ctzll(j) + 1) -# endif - +#ifdef CONFIG_HAVE_BUILTIN_FFSLL +# define ffsll(j) __builtin_ffsll(j) +#elif defined (CONFIG_HAVE_BUILTIN_CTZ) +# define ffsll(j) (__builtin_ctzll(j) + 1) #endif int fls(int j); @@ -118,10 +114,8 @@ int flsl(long j); int flsll(long long j); -#ifdef CONFIG_HAVE_LONG_LONG -# ifdef CONFIG_HAVE_BUILTIN_CLZ -# define flsll(j) ((8 * sizeof(long long)) - __builtin_clzll(j)) -# endif +#ifdef CONFIG_HAVE_BUILTIN_CLZ +# define flsll(j) ((8 * sizeof(long long)) - __builtin_clzll(j)) #endif unsigned int popcount(unsigned int j); diff --git a/include/sys/endian.h b/include/sys/endian.h index b127b681f9a78..6f37162b8d660 100644 --- a/include/sys/endian.h +++ b/include/sys/endian.h @@ -71,20 +71,18 @@ ((((uint32_t)(n)) & 0xff000000UL) >> 24)) #endif -#ifdef CONFIG_HAVE_LONG_LONG -# ifdef CONFIG_HAVE_BUILTIN_BSWAP64 -# define __swap_uint64(n) ((uint64_t)__builtin_bswap64(n)) -# else -# define __swap_uint64(n) \ - (uint64_t)(((((uint64_t)(n)) & 0x00000000000000ffULL) << 56) | \ - ((((uint64_t)(n)) & 0x000000000000ff00ULL) << 40) | \ - ((((uint64_t)(n)) & 0x0000000000ff0000ULL) << 24) | \ - ((((uint64_t)(n)) & 0x00000000ff000000ULL) << 8) | \ - ((((uint64_t)(n)) & 0x000000ff00000000ULL) >> 8) | \ - ((((uint64_t)(n)) & 0x0000ff0000000000ULL) >> 24) | \ - ((((uint64_t)(n)) & 0x00ff000000000000ULL) >> 40) | \ - ((((uint64_t)(n)) & 0xff00000000000000ULL) >> 56)) -# endif +#ifdef CONFIG_HAVE_BUILTIN_BSWAP64 +# define __swap_uint64(n) ((uint64_t)__builtin_bswap64(n)) +#else +# define __swap_uint64(n) \ + (uint64_t)(((((uint64_t)(n)) & 0x00000000000000ffULL) << 56) | \ + ((((uint64_t)(n)) & 0x000000000000ff00ULL) << 40) | \ + ((((uint64_t)(n)) & 0x0000000000ff0000ULL) << 24) | \ + ((((uint64_t)(n)) & 0x00000000ff000000ULL) << 8) | \ + ((((uint64_t)(n)) & 0x000000ff00000000ULL) >> 8) | \ + ((((uint64_t)(n)) & 0x0000ff0000000000ULL) >> 24) | \ + ((((uint64_t)(n)) & 0x00ff000000000000ULL) >> 40) | \ + ((((uint64_t)(n)) & 0xff00000000000000ULL) >> 56)) #endif /* Endian-specific definitions */ @@ -107,12 +105,10 @@ # define be32toh(n) ((uint32_t)(n)) # define le32toh(n) __swap_uint32(n) -# ifdef CONFIG_HAVE_LONG_LONG -# define htobe64(n) ((uint64_t)(n)) -# define htole64(n) __swap_uint64(n) -# define be64toh(n) ((uint64_t)(n)) -# define le64toh(n) __swap_uint64(n) -# endif +# define htobe64(n) ((uint64_t)(n)) +# define htole64(n) __swap_uint64(n) +# define be64toh(n) ((uint64_t)(n)) +# define le64toh(n) __swap_uint64(n) #else /* Little-endian byte order */ @@ -132,12 +128,10 @@ # define be32toh(n) __swap_uint32(n) # define le32toh(n) ((uint32_t)(n)) -# ifdef CONFIG_HAVE_LONG_LONG -# define htobe64(n) __swap_uint64(n) -# define htole64(n) ((uint64_t)(n)) -# define be64toh(n) __swap_uint64(n) -# define le64toh(n) ((uint64_t)(n)) -# endif +# define htobe64(n) __swap_uint64(n) +# define htole64(n) ((uint64_t)(n)) +# define be64toh(n) __swap_uint64(n) +# define le64toh(n) ((uint64_t)(n)) #endif /* OpenBSD style */ @@ -159,13 +153,11 @@ #define lemtoh32(x) letoh32(*(FAR uint32_t *)(x)) #define htolem32(x, v) (*(FAR uint32_t *)(x) = htole32(v)) -#ifdef CONFIG_HAVE_LONG_LONG -# define betoh64 be64toh -# define letoh64 le64toh -# define bemtoh64(x) betoh64(*(FAR uint64_t *)(x)) -# define htobem64(x, v) (*(FAR uint64_t *)(x) = htobe64(v)) -# define lemtoh64(x) letoh64(*(FAR uint64_t *)(x)) -# define htolem64(x, v) (*(FAR uint64_t *)(x) = htole64(v)) -#endif +#define betoh64 be64toh +#define letoh64 le64toh +#define bemtoh64(x) betoh64(*(FAR uint64_t *)(x)) +#define htobem64(x, v) (*(FAR uint64_t *)(x) = htobe64(v)) +#define lemtoh64(x) letoh64(*(FAR uint64_t *)(x)) +#define htolem64(x, v) (*(FAR uint64_t *)(x) = htole64(v)) #endif /* __INCLUDE_SYS_ENDIAN_H */ diff --git a/include/sys/epoll.h b/include/sys/epoll.h index 6147e9dce268d..45e0ac405c059 100644 --- a/include/sys/epoll.h +++ b/include/sys/epoll.h @@ -102,9 +102,7 @@ union epoll_data FAR void *ptr; int fd; uint32_t u32; -#ifdef CONFIG_HAVE_LONG_LONG uint64_t u64; -#endif }; typedef union epoll_data epoll_data_t; diff --git a/libs/libc/fixedmath/CMakeLists.txt b/libs/libc/fixedmath/CMakeLists.txt index ecf173eca05c2..99206d6a55060 100644 --- a/libs/libc/fixedmath/CMakeLists.txt +++ b/libs/libc/fixedmath/CMakeLists.txt @@ -20,5 +20,4 @@ # # ############################################################################## -target_sources(c PRIVATE lib_fixedmath.c lib_b16sin.c lib_b16cos.c - lib_b16atan2.c lib_ubsqrt.c) +target_sources(c PRIVATE lib_b16sin.c lib_b16cos.c lib_b16atan2.c lib_ubsqrt.c) diff --git a/libs/libc/fixedmath/Make.defs b/libs/libc/fixedmath/Make.defs index 8906cd05a7aeb..dc19097c17d59 100644 --- a/libs/libc/fixedmath/Make.defs +++ b/libs/libc/fixedmath/Make.defs @@ -22,7 +22,7 @@ # Add the fixed precision math C files to the build -CSRCS += lib_fixedmath.c lib_b16sin.c lib_b16cos.c lib_b16atan2.c +CSRCS += lib_b16sin.c lib_b16cos.c lib_b16atan2.c CSRCS += lib_ubsqrt.c # Add the fixed precision math directory to the build diff --git a/libs/libc/fixedmath/lib_fixedmath.c b/libs/libc/fixedmath/lib_fixedmath.c deleted file mode 100644 index 1aa33f74682b5..0000000000000 --- a/libs/libc/fixedmath/lib_fixedmath.c +++ /dev/null @@ -1,261 +0,0 @@ -/**************************************************************************** - * libs/libc/fixedmath/lib_fixedmath.c - * - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include -#include - -#ifndef CONFIG_HAVE_LONG_LONG - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Name: fixsign - ****************************************************************************/ - -static void fixsign(b16_t *parg1, b16_t *parg2, bool *pnegate) -{ - bool negate = false; - b16_t arg; - - arg = *parg1; - if (arg < 0) - { - *parg1 = -arg; - negate = true; - } - - arg = *parg2; - if (arg < 0) - { - *parg2 = -arg; - negate ^= true; - } - - *pnegate = negate; -} - -/**************************************************************************** - * Name: adjustsign - ****************************************************************************/ - -static b16_t adjustsign(b16_t result, bool negate) -{ - /* If the product is negative, then we overflowed */ - - if (result < 0) - { - if (result) - { - return b16MIN; - } - else - { - return b16MAX; - } - } - - /* correct the sign of the result */ - - if (negate) - { - return -result; - } - return result; -} - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: b16mulb16 - ****************************************************************************/ - -b16_t b16mulb16(b16_t m1, b16_t m2) -{ - bool negate; - b16_t product; - - fixsign(&m1, &m2, &negate); - product = (b16_t)ub16mulub16((ub16_t)m1, (ub16_t)m2); - return adjustsign(product, negate); -} - -/**************************************************************************** - * Name: ub16mulub16 - ****************************************************************************/ - -ub16_t ub16mulub16(ub16_t m1, ub16_t m2) -{ - /* Let: - * - * m1 = m1i*2**16 + m1f (b16) - * m2 = m2i*2**16 + m2f (b16) - * - * Then: - * - * m1*m2 = (m1i*m2i)*2**32 + (m1i*m2f + m2i*m1f)*2**16 + m1f*m2f (b32) - * = (m1i*m2i)*2**16 + (m1i*m2f + m2i*m1f) + m1f*m2f*2**-16 (b16) - * = a*2**16 + b + c*2**-16 - */ - - uint32_t m1i = ((uint32_t)m1 >> 16); - uint32_t m2i = ((uint32_t)m1 >> 16); - uint32_t m1f = ((uint32_t)m1 & 0x0000ffff); - uint32_t m2f = ((uint32_t)m2 & 0x0000ffff); - - return (m1i*m2i << 16) + m1i*m2f + m2i*m1f + (((m1f*m2f) + b16HALF) >> 16); -} - -/**************************************************************************** - * Name: b16sqr - ****************************************************************************/ - -b16_t b16sqr(b16_t a) -{ - b16_t sq; - - /* The result is always positive. Just take the absolute value */ - - if (a < 0) - { - a = -a; - } - - /* Overflow occurred if the result is negative */ - - sq = (b16_t)ub16sqr(a); - if (sq < 0) - { - sq = b16MAX; - } - - return sq; -} - -/**************************************************************************** - * Name: b16divb16 - ****************************************************************************/ - -ub16_t ub16sqr(ub16_t a) -{ - /* Let: - * - * m = mi*2**16 + mf (b16) - * - * Then: - * - * m*m = (mi*mi)*2**32 + 2*(m1*m2)*2**16 + mf*mf (b32) - * = (mi*mi)*2**16 + 2*(mi*mf) + mf*mf*2**-16 (b16) - */ - - uint32_t mi = ((uint32_t)a >> 16); - uint32_t mf = ((uint32_t)a & 0x0000ffff); - - return (mi*mi << 16) + (mi*mf << 1) + ((mf*mf + b16HALF) >> 16); -} - -/**************************************************************************** - * Name: b16divb16 - ****************************************************************************/ - -b16_t b16divb16(b16_t num, b16_t denom) -{ - bool negate; - b16_t quotient; - - fixsign(&num, &denom, &negate); - quotient = (b16_t)ub16divub16((ub16_t)num, (ub16_t)denom); - return adjustsign(quotient, negate); -} - -/**************************************************************************** - * Name: ub16divub16 - ****************************************************************************/ - -ub16_t ub16divub16(ub16_t num, ub16_t denom) -{ - uint32_t term1; - uint32_t numf; - uint32_t product; - - /* Let: - * - * num = numi*2**16 + numf (b16) - * den = deni*2**16 + denf (b16) - * - * Then: - * - * num/den = numi*2**16 / den + numf / den (b0) - * = numi*2**32 / den + numf*2**16 /den (b16) - */ - - /* Check for overflow in the first part of the quotient */ - - term1 = ((uint32_t)num & 0xffff0000) / denom; - if (term1 >= 0x00010000) - { - return ub16MAX; /* Will overflow */ - } - - /* Finish the division */ - - numf = num - term1 * denom; - term1 <<= 16; - product = term1 + (numf + (denom >> 1)) / denom; - - /* Check for overflow */ - - if (product < term1) - { - return ub16MAX; /* Overflowed */ - } - - return product; -} - -#endif diff --git a/libs/libc/fixedmath/lib_ubsqrt.c b/libs/libc/fixedmath/lib_ubsqrt.c index 94e4d213802ac..8db230150b57a 100644 --- a/libs/libc/fixedmath/lib_ubsqrt.c +++ b/libs/libc/fixedmath/lib_ubsqrt.c @@ -31,8 +31,6 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG - /**************************************************************************** * Name: ub32sqrtub16 * @@ -76,8 +74,6 @@ ub16_t ub32sqrtub16(ub32_t a) return (ub16_t)xk; } -#endif - /**************************************************************************** * Name: ub16sqrtub8 * diff --git a/libs/libc/inttypes/lib_strtoimax.c b/libs/libc/inttypes/lib_strtoimax.c index ea4d15c6da8de..44d239f0155c1 100644 --- a/libs/libc/inttypes/lib_strtoimax.c +++ b/libs/libc/inttypes/lib_strtoimax.c @@ -37,8 +37,6 @@ * available if long long types are supported. */ -#ifdef CONFIG_HAVE_LONG_LONG - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -113,4 +111,3 @@ intmax_t strtoimax(FAR const char *nptr, FAR char **endptr, int base) return (intmax_t)accum; } -#endif /* CONFIG_HAVE_LONG_LONG */ diff --git a/libs/libc/libc.csv b/libs/libc/libc.csv index 36627d9a7436a..4600f5329f96a 100644 --- a/libs/libc/libc.csv +++ b/libs/libc/libc.csv @@ -20,13 +20,9 @@ "atof","stdlib.h","defined(CONFIG_HAVE_DOUBLE)","double","FAR const char *" "atoi","stdlib.h","","int","FAR const char *" "atol","stdlib.h","","long","FAR const char *" -"atoll","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long","FAR const char *" -"b16atan2","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","b16_t","b16_t","b16_t" +"atoll","stdlib.h","","long long","FAR const char *" "b16cos","fixedmath.h","","b16_t","b16_t" -"b16divb16","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","b16_t","b16_t","b16_t" -"b16mulb16","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","b16_t","b16_t","b16_t" "b16sin","fixedmath.h","","b16_t","b16_t" -"b16sqr","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","b16_t","b16_t" "basename","libgen.h","","FAR char *","FAR char *" "bind_textdomain_codeset","libintl.h","defined(CONFIG_LIBC_LOCALE_GETTEXT)","FAR char *","FAR const char *","FAR const char *" "bindtextdomain","libintl.h","defined(CONFIG_LIBC_LOCALE_GETTEXT)","FAR char *","FAR const char *","FAR const char *" @@ -162,7 +158,7 @@ "lib_dumpbuffer","debug.h","","void","FAR const char *","FAR const uint8_t *","unsigned int" "lib_get_stream","nuttx/tls.h","","FAR struct file_struct *","int" "lio_listio","aio.h","defined(CONFIG_FS_AIO)","int","int","FAR struct aiocb * const []|FAR struct aiocb * const *","int","FAR struct sigevent *" -"llabs","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long int","long long int" +"llabs","stdlib.h","","long long int","long long int" "localtime","time.h","","struct tm *","const time_t *" "localtime_r","time.h","","FAR struct tm *","FAR const time_t *","FAR struct tm *" "mallinfo","malloc.h","","struct mallinfo","void" @@ -320,10 +316,10 @@ "strtok","string.h","","FAR char *","FAR char *","FAR const char *" "strtok_r","string.h","","FAR char *","FAR char *","FAR const char *","FAR char **" "strtol","stdlib.h","","long","FAR const char *","FAR char **","int" -"strtoll","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long","FAR const char *","FAR char **","int" +"strtoll","stdlib.h","","long long","FAR const char *","FAR char **","int" "strtoul","stdlib.h","","unsigned long","FAR const char *","FAR char **","int" "strtoull","stdlib.h","","unsigned long long int","FAR const char *","FAR char **","int" -"strtoull","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","unsigned long long","FAR const char *","FAR char **","int" +"strtoull","stdlib.h","","unsigned long long","FAR const char *","FAR char **","int" "strtoumax","inttypes.h","","uintmax_t","FAR const char *","FAR char **","int" "strxfrm","string.h","defined(CONFIG_LIBC_LOCALE)","size_t","FAR char *","FAR const char *","size_t" "swab","unistd.h","","void","FAR const void *","FAR void *","ssize_t" @@ -345,9 +341,6 @@ "towlower","wchar.h","","wint_t","wint_t" "towupper","wchar.h","","wint_t","wint_t" "truncate","unistd.h","!defined(CONFIG_DISABLE_MOUNTPOINT)","int","FAR const char *","off_t" -"ub16divub16","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","ub16_t","ub16_t","ub16_t" -"ub16mulub16","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","ub16_t","ub16_t","ub16_t" -"ub16sqr","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","ub16_t","ub16_t" "uname","sys/utsname.h","","int","FAR struct utsname *" "ungetc","stdio.h","defined(CONFIG_FILE_STREAM)","int","int","FAR FILE *" "ungetwc","wchar.h","defined(CONFIG_FILE_STREAM)","wint_t","wint_t","FAR FILE *" diff --git a/libs/libc/lzf/lzf_c.c b/libs/libc/lzf/lzf_c.c index a6c9112150910..83508a1cf2f9f 100644 --- a/libs/libc/lzf/lzf_c.c +++ b/libs/libc/lzf/lzf_c.c @@ -2,7 +2,8 @@ * libs/libc/lzf/lzf_c.c * * SPDX-License-Identifier: BSD-2-Clause - * SPDX-FileCopyrightText: 2000-2010 Marc Alexander Lehmann + * SPDX-FileCopyrightText: + * 2000-2010 Marc Alexander Lehmann * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -146,11 +147,7 @@ size_t lzf_compress(FAR const void *const in_data, * special workaround for it. */ -#ifdef CONFIG_HAVE_LONG_LONG uint64_t off; /* Workaround for missing POSIX compliance */ -#else - unsigned long off; -#endif unsigned int hval; int lit; diff --git a/libs/libc/misc/lib_crc64.c b/libs/libc/misc/lib_crc64.c index 8c4296d304665..be442cfeb5fd8 100644 --- a/libs/libc/misc/lib_crc64.c +++ b/libs/libc/misc/lib_crc64.c @@ -31,8 +31,6 @@ #include -#ifdef CONFIG_HAVE_LONG_LONG - /**************************************************************************** * Private Data ****************************************************************************/ @@ -290,4 +288,3 @@ uint64_t crc64(FAR const uint8_t *src, size_t len) return crc64part(src, len, CRC64_INIT) ^ CRC64_XOROUT; } -#endif /* CONFIG_HAVE_LONG_LONG */ diff --git a/libs/libc/misc/lib_crc64emac.c b/libs/libc/misc/lib_crc64emac.c index 731978c490b9c..9f2e43d2fc1d1 100644 --- a/libs/libc/misc/lib_crc64emac.c +++ b/libs/libc/misc/lib_crc64emac.c @@ -55,8 +55,6 @@ #include -#ifdef CONFIG_HAVE_LONG_LONG - /**************************************************************************** * Private Data ****************************************************************************/ @@ -289,4 +287,3 @@ uint64_t crc64emac(FAR const uint8_t *src, size_t len) return crc64emac_part(src, len, 0x0000000000000000ull); } -#endif /* CONFIG_HAVE_LONG_LONG */ diff --git a/libs/libc/stdlib/lib_atoll.c b/libs/libc/stdlib/lib_atoll.c index 300970cd914d8..026b290f3a2d1 100644 --- a/libs/libc/stdlib/lib_atoll.c +++ b/libs/libc/stdlib/lib_atoll.c @@ -30,9 +30,7 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG long long atoll(FAR const char *nptr) { return strtoll(nptr, NULL, 10); } -#endif diff --git a/libs/libc/stdlib/lib_llabs.c b/libs/libc/stdlib/lib_llabs.c index a2efd8d6d9524..5845f7aa2672f 100644 --- a/libs/libc/stdlib/lib_llabs.c +++ b/libs/libc/stdlib/lib_llabs.c @@ -32,7 +32,6 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG long long int llabs(long long int j) { if (j < 0) @@ -42,4 +41,3 @@ long long int llabs(long long int j) return j; } -#endif diff --git a/libs/libc/stdlib/lib_lldiv.c b/libs/libc/stdlib/lib_lldiv.c index b81944756d436..4efbf8b5fc561 100644 --- a/libs/libc/stdlib/lib_lldiv.c +++ b/libs/libc/stdlib/lib_lldiv.c @@ -45,8 +45,6 @@ #include -#if defined(CONFIG_HAVE_LONG_LONG) - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -80,4 +78,3 @@ lldiv_t lldiv(long long numer, long long denom) return f; } -#endif /* CONFIG_HAVE_LONG_LONG */ diff --git a/libs/libc/stdlib/lib_rand48.c b/libs/libc/stdlib/lib_rand48.c index a5a3f6e961d2c..9876d509a2283 100644 --- a/libs/libc/stdlib/lib_rand48.c +++ b/libs/libc/stdlib/lib_rand48.c @@ -50,7 +50,6 @@ static unsigned short int g_seed48[7] = * Private Functions ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG static uint64_t rand48_step(FAR unsigned short int *xi, FAR unsigned short int *lc) { @@ -66,7 +65,6 @@ static uint64_t rand48_step(FAR unsigned short int *xi, xi[2] = x >> 32; return x & 0xffffffffffffull; } -#endif /**************************************************************************** * Public Functions @@ -117,7 +115,6 @@ void lcong48(FAR unsigned short int p[7]) * ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG long jrand48(FAR unsigned short int s[3]) { return (long)(rand48_step(s, g_seed48 + 3) >> 16); @@ -201,4 +198,3 @@ double drand48(void) return erand48(g_seed48); } # endif -#endif diff --git a/libs/libc/stdlib/lib_strtold.c b/libs/libc/stdlib/lib_strtold.c index c09c5b885fda4..e03ba22e72a1a 100644 --- a/libs/libc/stdlib/lib_strtold.c +++ b/libs/libc/stdlib/lib_strtold.c @@ -76,13 +76,8 @@ # define ldbl_min_10_exp FLT_MIN_10_EXP #endif -#ifdef CONFIG_HAVE_LONG_LONG -# define long_long long long -# define llong_min LLONG_MIN -#else -# define long_long long -# define llong_min LONG_MIN -#endif +#define long_long long long +#define llong_min LLONG_MIN #define shgetc(f) (*(f)++) #define shunget(f) ((f)--) diff --git a/libs/libc/stdlib/lib_strtoll.c b/libs/libc/stdlib/lib_strtoll.c index 05dc917d1a8c8..3f423f694b378 100644 --- a/libs/libc/stdlib/lib_strtoll.c +++ b/libs/libc/stdlib/lib_strtoll.c @@ -32,8 +32,6 @@ #include "libc.h" -#ifdef CONFIG_HAVE_LONG_LONG - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -127,4 +125,3 @@ long long strtoll(FAR const char *nptr, FAR char **endptr, int base) return retval; } -#endif diff --git a/libs/libc/stdlib/lib_strtoull.c b/libs/libc/stdlib/lib_strtoull.c index e3ac64f920fab..75a8db2b69796 100644 --- a/libs/libc/stdlib/lib_strtoull.c +++ b/libs/libc/stdlib/lib_strtoull.c @@ -32,8 +32,6 @@ #include "libc.h" -#ifdef CONFIG_HAVE_LONG_LONG - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -139,4 +137,3 @@ unsigned long long strtoull(FAR const char *nptr, return accum; } -#endif diff --git a/libs/libc/stream/lib_libbsprintf.c b/libs/libc/stream/lib_libbsprintf.c index 520d15ecb1e69..6939dd76fed62 100644 --- a/libs/libc/stream/lib_libbsprintf.c +++ b/libs/libc/stream/lib_libbsprintf.c @@ -44,9 +44,7 @@ int lib_bsprintf(FAR struct lib_outstream_s *s, FAR const IPTR char *fmt, short int si; int i; long l; -#ifdef CONFIG_HAVE_LONG_LONG long long ll; -#endif intmax_t im; size_t sz; ptrdiff_t pd; @@ -97,13 +95,11 @@ int lib_bsprintf(FAR struct lib_outstream_s *s, FAR const IPTR char *fmt, offset += sizeof(var->im); ret += lib_sprintf(s, fmtstr, var->im); } -#ifdef CONFIG_HAVE_LONG_LONG else if (*(fmt - 2) == 'l' && *(fmt - 3) == 'l') { offset += sizeof(var->ll); ret += lib_sprintf(s, fmtstr, var->ll); } -#endif else if (*(fmt - 2) == 'l') { offset += sizeof(var->l); diff --git a/libs/libc/stream/lib_libvscanf.c b/libs/libc/stream/lib_libvscanf.c index c973e3a537f68..0100cd85eae18 100644 --- a/libs/libc/stream/lib_libvscanf.c +++ b/libs/libc/stream/lib_libvscanf.c @@ -40,10 +40,6 @@ * support long long types. */ -#ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_LIBC_LONG_LONG -#endif - #ifdef CONFIG_LIBC_SCANSET # define SCANSET_MODS "[" #else @@ -245,9 +241,7 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, int base = 10; char tmp[MAXLN]; -#ifdef CONFIG_HAVE_LONG_LONG FAR unsigned long long *plonglong = NULL; -#endif FAR unsigned long *plong = NULL; FAR unsigned int *pint = NULL; FAR unsigned short *pshort = NULL; @@ -345,7 +339,7 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, { modifier = L_MOD; } -#if defined(CONFIG_HAVE_LONG_LONG) && ULLONG_MAX != ULONG_MAX +#if ULLONG_MAX != ULONG_MAX else if (sizeof(size_t) == sizeof(unsigned long long)) { modifier = LL_MOD; @@ -353,13 +347,9 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, #endif else { - /* The only known cases that the default will be hit - * are (1) the eZ80 which has sizeof(size_t) = 3 which - * is the same as the sizeof(int). And (2) if - * CONFIG_HAVE_LONG_LONG - * is not enabled and sizeof(size_t) is equal to - * sizeof(unsigned long long). This latter case is an - * error. + /* The only known case that the default will be hit + * is the eZ80 which has sizeof(size_t) = 3 which is + * the same as the sizeof(int). * Treat as integer with no size qualifier. */ @@ -369,11 +359,8 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, else if (fmt_char(fmt) == 'j') { /* Same as long long if available. Otherwise, long. */ -#ifdef CONFIG_HAVE_LONG_LONG + modifier = LL_MOD; -#else - modifier = L_MOD; -#endif } else if (fmt_char(fmt) == 'h' || fmt_char(fmt) == 'H') { @@ -612,13 +599,11 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, *plong = 0; break; -#ifdef CONFIG_HAVE_LONG_LONG case LL_MOD: plonglong = next_arg(varg, vabuf, FAR unsigned long long *); *plonglong = 0; break; -#endif } } @@ -640,9 +625,8 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, bool stopconv; int errsave; unsigned long tmplong = 0; -#ifdef CONFIG_HAVE_LONG_LONG unsigned long long tmplonglong = 0; -#endif + /* Copy the real string into a temporary working buffer. */ if (!width || width > sizeof(tmp) - 1) @@ -858,9 +842,6 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, switch (modifier) { -#ifndef CONFIG_HAVE_LONG_LONG - case LL_MOD: -#endif case HH_MOD: case H_MOD: case NO_MOD: @@ -875,7 +856,6 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, } break; -#ifdef CONFIG_HAVE_LONG_LONG case LL_MOD: if (sign) { @@ -894,7 +874,6 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, # endif } break; -#endif } /* Check if the number was successfully converted */ @@ -926,18 +905,13 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, *pint = (unsigned int)tmplong; break; -#ifndef CONFIG_HAVE_LONG_LONG - case L_MOD: -#endif default: *plong = tmplong; break; -#ifdef CONFIG_HAVE_LONG_LONG case LL_MOD: *plonglong = tmplonglong; break; -#endif } assigncount++; @@ -1191,13 +1165,11 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, *plong = (unsigned long)nchars; break; -#ifdef CONFIG_HAVE_LONG_LONG case LL_MOD: plonglong = next_arg(varg, vabuf, FAR unsigned long long *); *plonglong = (unsigned long long)nchars; break; -#endif } } diff --git a/libs/libc/stream/lib_libvsprintf.c b/libs/libc/stream/lib_libvsprintf.c index 1f1d8c3622091..eb9123ff68eeb 100644 --- a/libs/libc/stream/lib_libvsprintf.c +++ b/libs/libc/stream/lib_libvsprintf.c @@ -61,10 +61,6 @@ * support long long types. */ -#ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_LIBC_LONG_LONG -#endif - #define stream_putc(c,stream) (total_len++, lib_stream_putc(stream, c)) #define stream_puts(buf, len, stream) \ (total_len += len, lib_stream_puts(stream, buf, len)) @@ -122,9 +118,7 @@ union arg_u { unsigned int u; unsigned long ul; -#ifdef CONFIG_HAVE_LONG_LONG unsigned long long ull; -#endif double d; FAR char *cp; }; @@ -400,7 +394,7 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, { c = 'l'; } -#if defined(CONFIG_HAVE_LONG_LONG) && ULLONG_MAX != ULONG_MAX +#if ULLONG_MAX != ULONG_MAX else if (sizeof(size_t) == sizeof(unsigned long long)) { c = 'l'; @@ -410,13 +404,9 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, #endif else { - /* The only known cases that the default will be hit are - * (1) the eZ80 which has sizeof(size_t) = 3 which is the - * same as the sizeof(int). And (2) if - * CONFIG_HAVE_LONG_LONG - * is not enabled and sizeof(size_t) is equal to - * sizeof(unsigned long long). This latter case is an - * error. + /* The only known case that the default will be hit is + * the eZ80 which has sizeof(size_t) = 3 which is the + * same as the sizeof(int). * Treat as integer with no size qualifier. */ @@ -428,9 +418,7 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, { /* Same as long long if available. Otherwise, long. */ -#ifdef CONFIG_HAVE_LONG_LONG flags |= FL_REPD_TYPE; -#endif flags |= FL_LONG; flags &= ~FL_SHORT; continue; @@ -482,13 +470,11 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, flags &= ~(FL_LONG | FL_REPD_TYPE); -#ifdef CONFIG_HAVE_LONG_LONG if (sizeof(FAR void *) == sizeof(unsigned long long)) { flags |= (FL_LONG | FL_REPD_TYPE); } else -#endif if (sizeof(FAR void *) == sizeof(unsigned long)) { flags |= FL_LONG; @@ -951,9 +937,6 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, if (c == 'd' || c == 'i') { -#ifndef CONFIG_HAVE_LONG_LONG - long x; -#else long long x; if ((flags & FL_LONG) != 0 && (flags & FL_REPD_TYPE) != 0) @@ -972,7 +955,6 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, #endif } else -#endif if ((flags & FL_LONG) != 0) { #ifdef CONFIG_LIBC_NUMBERED_ARGS @@ -1018,11 +1000,7 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, flags &= ~(FL_NEGATIVE | FL_ALT); if (x < 0) { -#ifndef CONFIG_HAVE_LONG_LONG - x = -(unsigned long)x; -#else x = -(unsigned long long)x; -#endif flags |= FL_NEGATIVE; } @@ -1032,7 +1010,7 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, } else { -#if !defined(CONFIG_LIBC_LONG_LONG) && defined(CONFIG_HAVE_LONG_LONG) +#if !defined(CONFIG_LIBC_LONG_LONG) DEBUGASSERT(x >= 0 && x <= ULONG_MAX); #endif c = __ultoa_invert(x, buf, 10) - buf; @@ -1041,9 +1019,6 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, else { int base; -#ifndef CONFIG_HAVE_LONG_LONG - unsigned long x; -#else unsigned long long x; if ((flags & FL_LONG) != 0 && (flags & FL_REPD_TYPE) != 0) @@ -1062,7 +1037,6 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, #endif } else -#endif if ((flags & FL_LONG) != 0) { #ifdef CONFIG_LIBC_NUMBERED_ARGS @@ -1218,7 +1192,7 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, } else { -#if !defined(CONFIG_LIBC_LONG_LONG) && defined(CONFIG_HAVE_LONG_LONG) +#if !defined(CONFIG_LIBC_LONG_LONG) DEBUGASSERT(x <= ULONG_MAX); #endif c = __ultoa_invert(x, buf, base) - buf; @@ -1355,10 +1329,8 @@ int lib_vsprintf(FAR struct lib_outstream_s *stream, switch (arglist.type[i]) { case TYPE_LONG_LONG: -#ifdef CONFIG_HAVE_LONG_LONG arglist.value[i].ull = va_arg(ap, unsigned long long); break; -#endif case TYPE_LONG: arglist.value[i].ul = va_arg(ap, unsigned long); diff --git a/libs/libc/stream/lib_ultoa_invert.h b/libs/libc/stream/lib_ultoa_invert.h index 8f7289ea99a4b..f5fb075dce305 100644 --- a/libs/libc/stream/lib_ultoa_invert.h +++ b/libs/libc/stream/lib_ultoa_invert.h @@ -50,10 +50,6 @@ * support long long types. */ -#ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_LIBC_LONG_LONG -#endif - /* Next flags are to use with `base'. Unused fields are reserved. */ #define XTOA_PREFIX 0x0100 /* Put prefix for octal or hex */ diff --git a/libs/libc/string/lib_ffsll.c b/libs/libc/string/lib_ffsll.c index ad7c4ba5c7643..2428109274e9f 100644 --- a/libs/libc/string/lib_ffsll.c +++ b/libs/libc/string/lib_ffsll.c @@ -30,8 +30,6 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG - /**************************************************************************** * Name: ffsll * @@ -67,4 +65,3 @@ int ffsll(long long j) return ret; } -#endif diff --git a/libs/libc/string/lib_flsll.c b/libs/libc/string/lib_flsll.c index 155cd65757cfc..fe3a9668d9c20 100644 --- a/libs/libc/string/lib_flsll.c +++ b/libs/libc/string/lib_flsll.c @@ -30,8 +30,6 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG - /**************************************************************************** * Name: flsll * @@ -67,4 +65,3 @@ int flsll(long long j) return ret; } -#endif diff --git a/libs/libc/string/lib_memset.c b/libs/libc/string/lib_memset.c index 26d3fd15823e9..d19ed89e42d1b 100644 --- a/libs/libc/string/lib_memset.c +++ b/libs/libc/string/lib_memset.c @@ -34,18 +34,6 @@ #include "libc.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Can't support CONFIG_LIBC_MEMSET_64BIT if the platform does not - * have 64-bit integer types. - */ - -#ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_LIBC_MEMSET_64BIT -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/libs/libc/string/lib_vikmemcpy.c b/libs/libc/string/lib_vikmemcpy.c index d2e1a1b22e6fc..fb6aa64e01b9f 100644 --- a/libs/libc/string/lib_vikmemcpy.c +++ b/libs/libc/string/lib_vikmemcpy.c @@ -45,14 +45,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Can't support CONFIG_LIBC_MEMCPY_64BIT if the platform does not have - * 64-bit integer types. - */ - -#ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_LIBC_MEMCPY_64BIT -#endif - /* Remove definitions when CONFIG_LIBC_MEMCPY_INDEXED_COPY is defined */ #ifdef CONFIG_LIBC_MEMCPY_INDEXED_COPY @@ -307,15 +299,31 @@ FAR void *memcpy(FAR void *dest, FAR const void *src, size_t count) switch ((((uintptr_t)src8) PRE_SWITCH_ADJUST) & (TYPE_WIDTH - 1)) { - case 0: COPY_NO_SHIFT(); break; - case 1: COPY_SHIFT(1); break; - case 2: COPY_SHIFT(2); break; - case 3: COPY_SHIFT(3); break; + case 0: + COPY_NO_SHIFT(); + break; + case 1: + COPY_SHIFT(1); + break; + case 2: + COPY_SHIFT(2); + break; + case 3: + COPY_SHIFT(3); + break; #if TYPE_WIDTH > 4 - case 4: COPY_SHIFT(4); break; - case 5: COPY_SHIFT(5); break; - case 6: COPY_SHIFT(6); break; - case 7: COPY_SHIFT(7); break; + case 4: + COPY_SHIFT(4); + break; + case 5: + COPY_SHIFT(5); + break; + case 6: + COPY_SHIFT(6); + break; + case 7: + COPY_SHIFT(7); + break; #endif } diff --git a/libs/libm/libm/lib_llround.c b/libs/libm/libm/lib_llround.c index c9d93ee5e1c26..d33ab08f0156c 100644 --- a/libs/libm/libm/lib_llround.c +++ b/libs/libm/libm/lib_llround.c @@ -33,11 +33,9 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG #ifdef CONFIG_HAVE_DOUBLE long long llround(double x) { return (long long)round(x); } #endif -#endif diff --git a/libs/libm/libm/lib_llroundf.c b/libs/libm/libm/lib_llroundf.c index 3b9a2ccdfbe5c..89a990b3833d8 100644 --- a/libs/libm/libm/lib_llroundf.c +++ b/libs/libm/libm/lib_llroundf.c @@ -33,9 +33,7 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG long long llroundf(float x) { return (long long)roundf(x); } -#endif diff --git a/libs/libm/libm/lib_llroundl.c b/libs/libm/libm/lib_llroundl.c index 6372a3ee81d24..ca03dab8a8ee0 100644 --- a/libs/libm/libm/lib_llroundl.c +++ b/libs/libm/libm/lib_llroundl.c @@ -33,11 +33,9 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_HAVE_LONG_LONG #ifdef CONFIG_HAVE_LONG_DOUBLE long long llroundl(long double x) { return (long long)roundl(x); } #endif -#endif diff --git a/sched/clock/clock.h b/sched/clock/clock.h index 4ea585f3ea257..003c9264546ed 100644 --- a/sched/clock/clock.h +++ b/sched/clock/clock.h @@ -35,24 +35,6 @@ #include #include -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Configuration ************************************************************/ - -/* If CONFIG_SYSTEM_TIME64 is selected and the CPU supports long long types, - * then a 64-bit system time will be used. - */ - -#ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_SYSTEM_TIME64 -#endif - -/**************************************************************************** - * Public Type Definitions - ****************************************************************************/ - /**************************************************************************** * Public Data ****************************************************************************/ diff --git a/sched/irq/irq_procfs.c b/sched/irq/irq_procfs.c index a56d93f851008..a260bb0e8b325 100644 --- a/sched/irq/irq_procfs.c +++ b/sched/irq/irq_procfs.c @@ -55,9 +55,8 @@ * IRQ HANDLER ARGUMENT COUNT RATE TIME * DDD XXXXXXXX XXXXXXXX DDDDDDDDDD DDDD.DDD DDDD * - * NOTE: This assumes that an address can be represented in 32-bits. In - * the typical configuration where CONFIG_HAVE_LONG_LONG=y, the COUNT field - * may not be wide enough. + * NOTE: This assumes that an address can be represented in 32-bits. The + * COUNT field may not be wide enough. */ #define HDR_FMT "IRQ HANDLER ARGUMENT COUNT RATE TIME\n" @@ -201,7 +200,6 @@ static int irq_callback(int irq, FAR struct irq_info_s *info, elapsed = now - copy.start; perf_convert(copy.time, &delta); -#ifdef CONFIG_HAVE_LONG_LONG /* elapsed = - , units=clock ticks * rate = * TICKS_PER_SEC / elapsed */ @@ -230,9 +228,6 @@ static int irq_callback(int irq, FAR struct irq_info_s *info, { count = (unsigned long)copy.count; } -#else -# error Missing logic -#endif /* Output information about this interrupt */ From c95d357574604b7a997563b6b8a50694b1522e25 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 3 May 2026 20:52:08 +0800 Subject: [PATCH 3/8] !libc/stream: remove CONFIG_LIBC_LONG_LONG and always support long long Long long support is now unconditional in printf/scanf and related helpers. Remove the Kconfig option, the conditional compilation in libvsprintf/libvscanf/ultoa_invert, the build-time #error in the rn2xx3 driver, and clean up CONFIG_LIBC_LONG_LONG entries from all board defconfigs. Signed-off-by: Xiang Xiao --- boards/arm/moxart/moxa/configs/nsh/defconfig | 1 - boards/arm/mps/mps3-an547/configs/ap/defconfig | 1 - boards/arm/mps/mps3-an547/configs/bl/defconfig | 1 - .../configs/sdc_nimble_cpunet/defconfig | 1 - .../configs/audiopack/defconfig | 1 - .../configs/composite/defconfig | 1 - .../configs/displaypack/defconfig | 1 - .../configs/enc28j60/defconfig | 1 - .../configs/lcd1602/defconfig | 1 - .../configs/nsh-flash/defconfig | 1 - .../adafruit-feather-rp2040/configs/nsh/defconfig | 1 - .../configs/nshsram/defconfig | 1 - .../adafruit-feather-rp2040/configs/smp/defconfig | 1 - .../configs/spisd/defconfig | 1 - .../configs/ssd1306/defconfig | 1 - .../configs/st7735/defconfig | 1 - .../configs/usbmsc/defconfig | 1 - .../configs/usbnsh/defconfig | 1 - .../configs/waveshare-lcd-1.14/defconfig | 1 - .../configs/waveshare-lcd-1.3/defconfig | 1 - .../adafruit-kb2040/configs/audiopack/defconfig | 1 - .../adafruit-kb2040/configs/composite/defconfig | 1 - .../adafruit-kb2040/configs/displaypack/defconfig | 1 - .../adafruit-kb2040/configs/enc28j60/defconfig | 1 - .../adafruit-kb2040/configs/lcd1602/defconfig | 1 - .../adafruit-kb2040/configs/nsh-flash/defconfig | 1 - .../rp2040/adafruit-kb2040/configs/nsh/defconfig | 1 - .../adafruit-kb2040/configs/nshsram/defconfig | 1 - .../rp2040/adafruit-kb2040/configs/smp/defconfig | 1 - .../adafruit-kb2040/configs/spisd/defconfig | 1 - .../adafruit-kb2040/configs/ssd1306/defconfig | 1 - .../adafruit-kb2040/configs/st7735/defconfig | 1 - .../adafruit-kb2040/configs/usbmsc/defconfig | 1 - .../adafruit-kb2040/configs/usbnsh/defconfig | 1 - .../configs/waveshare-lcd-1.14/defconfig | 1 - .../configs/waveshare-lcd-1.3/defconfig | 1 - .../pimoroni-tiny2040/configs/composite/defconfig | 1 - .../pimoroni-tiny2040/configs/gpio/defconfig | 1 - .../pimoroni-tiny2040/configs/nsh-flash/defconfig | 1 - .../pimoroni-tiny2040/configs/nsh/defconfig | 1 - .../pimoroni-tiny2040/configs/nshsram/defconfig | 1 - .../pimoroni-tiny2040/configs/smp/defconfig | 1 - .../pimoroni-tiny2040/configs/spisd/defconfig | 1 - .../pimoroni-tiny2040/configs/usbmsc/defconfig | 1 - .../pimoroni-tiny2040/configs/usbnsh/defconfig | 1 - .../configs/audiopack/defconfig | 1 - .../configs/composite/defconfig | 1 - .../configs/displaypack/defconfig | 1 - .../raspberrypi-pico-w/configs/enc28j60/defconfig | 1 - .../raspberrypi-pico-w/configs/lcd1602/defconfig | 1 - .../configs/nsh-flash/defconfig | 1 - .../raspberrypi-pico-w/configs/nsh/defconfig | 1 - .../raspberrypi-pico-w/configs/nshsram/defconfig | 1 - .../raspberrypi-pico-w/configs/smp/defconfig | 1 - .../raspberrypi-pico-w/configs/spisd/defconfig | 1 - .../raspberrypi-pico-w/configs/ssd1306/defconfig | 1 - .../raspberrypi-pico-w/configs/st7735/defconfig | 1 - .../raspberrypi-pico-w/configs/telnet/defconfig | 1 - .../raspberrypi-pico-w/configs/usbmsc/defconfig | 1 - .../raspberrypi-pico-w/configs/usbnsh/defconfig | 1 - .../configs/waveshare-lcd-1.14/defconfig | 1 - .../configs/waveshare-lcd-1.3/defconfig | 1 - .../raspberrypi-pico/configs/ads7046/defconfig | 1 - .../raspberrypi-pico/configs/audiopack/defconfig | 1 - .../raspberrypi-pico/configs/bmp280/defconfig | 1 - .../raspberrypi-pico/configs/composite/defconfig | 1 - .../configs/displaypack/defconfig | 1 - .../raspberrypi-pico/configs/enc28j60/defconfig | 1 - .../raspberrypi-pico/configs/lcd1602/defconfig | 1 - .../raspberrypi-pico/configs/nsh-flash/defconfig | 1 - .../rp2040/raspberrypi-pico/configs/nsh/defconfig | 1 - .../raspberrypi-pico/configs/nshsram/defconfig | 1 - .../configs/pico-restouch-lcd-2.8/defconfig | 1 - .../rp2040/raspberrypi-pico/configs/smp/defconfig | 1 - .../raspberrypi-pico/configs/spisd/defconfig | 1 - .../raspberrypi-pico/configs/ssd1306/defconfig | 1 - .../raspberrypi-pico/configs/st7735/defconfig | 1 - .../raspberrypi-pico/configs/tmp112/defconfig | 1 - .../raspberrypi-pico/configs/usbmsc/defconfig | 1 - .../raspberrypi-pico/configs/usbnsh/defconfig | 1 - .../configs/waveshare-lcd-1.14/defconfig | 1 - .../configs/waveshare-lcd-1.3/defconfig | 1 - .../seeed-xiao-rp2040/configs/gpio/defconfig | 1 - .../seeed-xiao-rp2040/configs/nsh/defconfig | 1 - .../seeed-xiao-rp2040/configs/usbnsh/defconfig | 1 - .../seeed-xiao-rp2040/configs/userleds/defconfig | 1 - .../w5500-evb-pico/configs/usbnsh/defconfig | 1 - .../configs/composite/defconfig | 1 - .../configs/fb/defconfig | 1 - .../configs/lvgl/defconfig | 1 - .../configs/nsh-flash/defconfig | 1 - .../configs/nsh/defconfig | 1 - .../configs/nshsram/defconfig | 1 - .../configs/smp/defconfig | 1 - .../configs/spisd/defconfig | 1 - .../configs/usbmsc/defconfig | 1 - .../configs/usbnsh/defconfig | 1 - .../waveshare-rp2040-zero/configs/gpio/defconfig | 1 - .../waveshare-rp2040-zero/configs/nsh/defconfig | 1 - .../configs/usbnsh/defconfig | 1 - .../configs/audiopack/defconfig | 1 - .../configs/composite/defconfig | 1 - .../pimoroni-pico-2-plus/configs/nsh/defconfig | 1 - .../configs/nshsram/defconfig | 1 - .../pimoroni-pico-2-plus/configs/smp/defconfig | 1 - .../pimoroni-pico-2-plus/configs/usbmsc/defconfig | 1 - .../pimoroni-pico-2-plus/configs/usbnsh/defconfig | 1 - .../configs/userled/defconfig | 1 - .../raspberrypi-pico-2/configs/nsh/defconfig | 1 - .../raspberrypi-pico-2/configs/smp/defconfig | 1 - .../raspberrypi-pico-2/configs/spisd/defconfig | 1 - .../raspberrypi-pico-2/configs/usbnsh/defconfig | 1 - .../raspberrypi-pico-2/configs/userled/defconfig | 1 - .../rp23xx/xiao-rp2350/configs/combo/defconfig | 1 - .../arm/rp23xx/xiao-rp2350/configs/nsh/defconfig | 1 - .../rp23xx/xiao-rp2350/configs/usbnsh/defconfig | 1 - .../configs/mcuboot-loader/defconfig | 1 - .../samv71-xult/configs/mcuboot-loader/defconfig | 1 - .../stm32/nucleo-f302r8/configs/highpri/defconfig | 1 - .../arm/stm32/nucleo-f302r8/configs/nsh/defconfig | 1 - .../stm32/nucleo-f302r8/configs/qenco/defconfig | 1 - .../arm/stm32/nucleo-f334r8/configs/adc/defconfig | 1 - .../stm32/nucleo-f334r8/configs/highpri/defconfig | 1 - .../arm/stm32/nucleo-f334r8/configs/nsh/defconfig | 1 - .../stm32/nucleo-f334r8/configs/spwm1/defconfig | 1 - .../stm32/nucleo-f334r8/configs/spwm2/defconfig | 1 - .../arm/stm32/nucleo-g431rb/configs/adc/defconfig | 1 - .../arm/stm32/nucleo-l152re/configs/lcd/defconfig | 1 - .../arm/stm32/nucleo-l152re/configs/nsh/defconfig | 1 - .../stm32/stm32f334-disco/configs/nsh/defconfig | 1 - .../stm32f4discovery/configs/max7219/defconfig | 1 - .../b-l072z-lrwan1/configs/adc/defconfig | 1 - .../b-l072z-lrwan1/configs/nsh/defconfig | 1 - .../b-l072z-lrwan1/configs/nxlines_oled/defconfig | 1 - .../b-l072z-lrwan1/configs/sx127x/defconfig | 1 - .../nucleo-c071rb/configs/adcscope/defconfig | 1 - .../nucleo-c071rb/configs/jumbo/defconfig | 1 - .../nucleo-c092rc/configs/jumbo/defconfig | 1 - .../nucleo-f091rc/configs/sx127x/defconfig | 1 - .../nucleo-g070rb/configs/nsh/defconfig | 1 - .../nucleo-g071rb/configs/nsh/defconfig | 1 - .../nucleo-g0b1re/configs/adc/defconfig | 1 - .../nucleo-g0b1re/configs/adc_dma/defconfig | 1 - .../nucleo-g0b1re/configs/nsh/defconfig | 1 - .../nucleo-l073rz/configs/nsh/defconfig | 1 - .../nucleo-l073rz/configs/sx127x/defconfig | 1 - .../stm32g071b-disco/configs/nsh/defconfig | 1 - .../stm32l0538-disco/configs/nsh/defconfig | 1 - .../arm/tiva/lm3s6432-s2e/configs/nsh/defconfig | 1 - .../tlsr82/tlsr8278adk80d/configs/nsh/defconfig | 1 - .../imx9/imx93-evk/configs/bootloader/defconfig | 1 - boards/misoc/lm32/misoc/configs/nsh/defconfig | 1 - .../risc-v/bl602/bl602evb/configs/dma/defconfig | 1 - .../raspberrypi-pico-2-rv/configs/nsh/defconfig | 1 - .../configs/usbnsh/defconfig | 1 - boards/sparc/bm3803/xx3803/configs/nsh/defconfig | 1 - .../s698pm/s698pm-dkit/configs/nsh/defconfig | 1 - .../s698pm/s698pm-dkit/configs/smp/defconfig | 1 - drivers/wireless/lpwan/rn2xx3/rn2xx3.c | 4 ---- libs/libc/stdio/Kconfig | 15 --------------- libs/libc/stream/lib_libvscanf.c | 12 ------------ libs/libc/stream/lib_libvsprintf.c | 14 -------------- libs/libc/stream/lib_ultoa_invert.c | 4 ---- libs/libc/stream/lib_ultoa_invert.h | 8 -------- 164 files changed, 215 deletions(-) diff --git a/boards/arm/moxart/moxa/configs/nsh/defconfig b/boards/arm/moxart/moxa/configs/nsh/defconfig index ec790c1c6cc80..df5dc3a01aa90 100644 --- a/boards/arm/moxart/moxa/configs/nsh/defconfig +++ b/boards/arm/moxart/moxa/configs/nsh/defconfig @@ -57,7 +57,6 @@ CONFIG_HAVE_CXX=y CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_NBUFFERS=24 CONFIG_LIBC_EXECFUNCS=y -CONFIG_LIBC_LONG_LONG=y CONFIG_LINE_MAX=80 CONFIG_NET=y CONFIG_NETUTILS_TELNETD=y diff --git a/boards/arm/mps/mps3-an547/configs/ap/defconfig b/boards/arm/mps/mps3-an547/configs/ap/defconfig index b8dc83fabeebe..9873ac263d836 100644 --- a/boards/arm/mps/mps3-an547/configs/ap/defconfig +++ b/boards/arm/mps/mps3-an547/configs/ap/defconfig @@ -107,7 +107,6 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_MEMFD_ERROR=y CONFIG_LIBC_STRERROR_ERRNUM=y CONFIG_LIBM_TOOLCHAIN=y diff --git a/boards/arm/mps/mps3-an547/configs/bl/defconfig b/boards/arm/mps/mps3-an547/configs/bl/defconfig index c515fc695af78..fa4340febbe6b 100644 --- a/boards/arm/mps/mps3-an547/configs/bl/defconfig +++ b/boards/arm/mps/mps3-an547/configs/bl/defconfig @@ -128,7 +128,6 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ELF=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_MEMFD_ERROR=y CONFIG_LIBC_STRERROR_ERRNUM=y CONFIG_LIBM_TOOLCHAIN=y diff --git a/boards/arm/nrf53/nrf5340-dk/configs/sdc_nimble_cpunet/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/sdc_nimble_cpunet/defconfig index 0b19475883a15..d9abaed7b99ca 100644 --- a/boards/arm/nrf53/nrf5340-dk/configs/sdc_nimble_cpunet/defconfig +++ b/boards/arm/nrf53/nrf5340-dk/configs/sdc_nimble_cpunet/defconfig @@ -40,7 +40,6 @@ CONFIG_EXPERIMENTAL=y CONFIG_FILE_STREAM=y CONFIG_INIT_ENTRYPOINT="nimble_main" CONFIG_INTELHEX_BINARY=y -CONFIG_LIBC_LONG_LONG=y CONFIG_MM_REGIONS=2 CONFIG_NET=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/audiopack/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/audiopack/defconfig index c19a5000ad7d1..aaa7210721391 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/audiopack/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/audiopack/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_AUDIO_FORMAT_MP3 is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/composite/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/composite/defconfig index 4a560a5ea7715..49476046b45d9 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/composite/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/composite/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/displaypack/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/displaypack/defconfig index d25ac469e766b..76eb6c0d30e19 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/displaypack/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/displaypack/defconfig @@ -7,7 +7,6 @@ # # CONFIG_DEV_CONSOLE is not set # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/enc28j60/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/enc28j60/defconfig index 0bcd6e6a43534..04b83d40bda76 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/enc28j60/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/enc28j60/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/lcd1602/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/lcd1602/defconfig index e1423c093a207..94d4e5615172c 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/lcd1602/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/lcd1602/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/nsh-flash/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/nsh-flash/defconfig index 32dff8bed3a37..a180d3b6cc64a 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/nsh-flash/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/nsh-flash/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/nsh/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/nsh/defconfig index f9b6e45314c78..79a353c6398a6 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/nsh/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/nshsram/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/nshsram/defconfig index 9e68d954b9036..56dfe2a9b9564 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/nshsram/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/nshsram/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEBUG_OPT_UNUSED_SECTIONS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/smp/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/smp/defconfig index 6d8d248160233..c00efe0de0965 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/smp/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/smp/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/spisd/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/spisd/defconfig index dbd78159b6d47..f20d1f51c0c3f 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/spisd/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/spisd/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/ssd1306/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/ssd1306/defconfig index 344331aeca883..8d12b015179c5 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/ssd1306/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/ssd1306/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/st7735/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/st7735/defconfig index 0594a90fc5b5c..6b91298d466e4 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/st7735/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/st7735/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/usbmsc/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/usbmsc/defconfig index 749b43b3e28d6..a0244ac541518 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/usbmsc/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/usbmsc/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/usbnsh/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/usbnsh/defconfig index 92701a33da5ae..01e2a36f83b94 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/waveshare-lcd-1.14/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/waveshare-lcd-1.14/defconfig index c8eeaa213c9a2..5f56cd0274f71 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/waveshare-lcd-1.14/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/waveshare-lcd-1.14/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/configs/waveshare-lcd-1.3/defconfig b/boards/arm/rp2040/adafruit-feather-rp2040/configs/waveshare-lcd-1.3/defconfig index 082d4f1cd7561..49c0015ad5f5b 100644 --- a/boards/arm/rp2040/adafruit-feather-rp2040/configs/waveshare-lcd-1.3/defconfig +++ b/boards/arm/rp2040/adafruit-feather-rp2040/configs/waveshare-lcd-1.3/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/audiopack/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/audiopack/defconfig index 8e27d58c14998..d9371a2905089 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/audiopack/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/audiopack/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_AUDIO_FORMAT_MP3 is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/composite/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/composite/defconfig index a06e3bb3d0716..6a1a3ba92eb96 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/composite/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/composite/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/displaypack/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/displaypack/defconfig index 774d8232c1945..34b6dd8c92453 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/displaypack/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/displaypack/defconfig @@ -7,7 +7,6 @@ # # CONFIG_DEV_CONSOLE is not set # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/enc28j60/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/enc28j60/defconfig index a915db7c2b3a9..4a06734703756 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/enc28j60/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/enc28j60/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/lcd1602/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/lcd1602/defconfig index 2a88c020c2090..5f23fa7c84add 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/lcd1602/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/lcd1602/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/nsh-flash/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/nsh-flash/defconfig index c3345f0e91b79..866a9d7ff5cf0 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/nsh-flash/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/nsh-flash/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/nsh/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/nsh/defconfig index 4e7272da41dad..99cdbffca63b0 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/nsh/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/nshsram/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/nshsram/defconfig index 340b88957bcca..8268a9ca1138d 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/nshsram/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/nshsram/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEBUG_OPT_UNUSED_SECTIONS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/smp/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/smp/defconfig index 9cb641d965bf7..e35439f5f5634 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/smp/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/smp/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/spisd/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/spisd/defconfig index f3a8dd42ef599..489c3478c9890 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/spisd/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/spisd/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/ssd1306/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/ssd1306/defconfig index 926e0a012e6f4..5359d47b4b035 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/ssd1306/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/ssd1306/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/st7735/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/st7735/defconfig index c7b2c7c489c04..0f7710d0b9223 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/st7735/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/st7735/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/usbmsc/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/usbmsc/defconfig index e81e2f16c82e7..27b45f4ebe5fc 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/usbmsc/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/usbmsc/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/usbnsh/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/usbnsh/defconfig index c6bbfb2456e31..73f8625f70910 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/waveshare-lcd-1.14/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/waveshare-lcd-1.14/defconfig index 013bf812c7e08..e1d22edf81a23 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/waveshare-lcd-1.14/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/waveshare-lcd-1.14/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/adafruit-kb2040/configs/waveshare-lcd-1.3/defconfig b/boards/arm/rp2040/adafruit-kb2040/configs/waveshare-lcd-1.3/defconfig index 8c013eece566d..6d4a084907987 100644 --- a/boards/arm/rp2040/adafruit-kb2040/configs/waveshare-lcd-1.3/defconfig +++ b/boards/arm/rp2040/adafruit-kb2040/configs/waveshare-lcd-1.3/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/composite/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/composite/defconfig index 15bc5aeb5be4d..1cec8976724a9 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/composite/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/composite/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/gpio/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/gpio/defconfig index 6633a9e4e424d..78e04d3c0f06a 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/gpio/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/gpio/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh-flash/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh-flash/defconfig index f3e309fbdb9a3..0c90edacb7d3e 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh-flash/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh-flash/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh/defconfig index 24c16ede087e6..c5e7a0fd4d9cb 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/nshsram/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/nshsram/defconfig index 46024c97ca067..654cc1264e0ec 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/nshsram/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/nshsram/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEBUG_OPT_UNUSED_SECTIONS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/smp/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/smp/defconfig index 87c94b07e6d51..2b630f81013ca 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/smp/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/smp/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/spisd/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/spisd/defconfig index 04bdc2cfe257a..3d67165975291 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/spisd/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/spisd/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/usbmsc/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/usbmsc/defconfig index a517a21f79feb..f95e9d6a1b736 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/usbmsc/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/usbmsc/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/usbnsh/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/usbnsh/defconfig index 4c0982dec6041..b7db14804334d 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/audiopack/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/audiopack/defconfig index a9f4798e112f8..09a2dd9f0a093 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/audiopack/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/audiopack/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_AUDIO_FORMAT_MP3 is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/composite/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/composite/defconfig index 3c08ab566dbe4..06d869e2f2068 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/composite/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/composite/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/displaypack/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/displaypack/defconfig index c6dbff874c692..25b1cdaa9621c 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/displaypack/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/displaypack/defconfig @@ -7,7 +7,6 @@ # # CONFIG_DEV_CONSOLE is not set # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/enc28j60/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/enc28j60/defconfig index 39696f5e3c9ac..98914233c5b53 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/enc28j60/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/enc28j60/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/lcd1602/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/lcd1602/defconfig index 4d3fb66bc7f2b..eafe690dd5d86 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/lcd1602/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/lcd1602/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/nsh-flash/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/nsh-flash/defconfig index 9e139d4d067a7..9d37464271277 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/nsh-flash/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/nsh-flash/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/nsh/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/nsh/defconfig index 259c36077be32..02d9d8c2dca5d 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/nsh/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/nshsram/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/nshsram/defconfig index fdc56d8cfff09..de17dcbf0fe2a 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/nshsram/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/nshsram/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEBUG_OPT_UNUSED_SECTIONS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/smp/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/smp/defconfig index ad1f5c735d654..794a24dc74bd9 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/smp/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/smp/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/spisd/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/spisd/defconfig index 3cf23240542d6..cc7e75ebe4d9b 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/spisd/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/spisd/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/ssd1306/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/ssd1306/defconfig index a322724b5d0c1..2bffcd0c7143c 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/ssd1306/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/ssd1306/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/st7735/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/st7735/defconfig index dc082600ad13f..c0fb0f1632f8e 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/st7735/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/st7735/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/telnet/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/telnet/defconfig index ec0cc39fe2909..939849ea18b6e 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/telnet/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/telnet/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/usbmsc/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/usbmsc/defconfig index 20ed10c0a3ba9..8d4785a88a31f 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/usbmsc/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/usbmsc/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/usbnsh/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/usbnsh/defconfig index 385f5e2eb4747..6358b96f6f352 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/waveshare-lcd-1.14/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/waveshare-lcd-1.14/defconfig index aa098fd6ceb22..f829378bbc527 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/waveshare-lcd-1.14/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/waveshare-lcd-1.14/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico-w/configs/waveshare-lcd-1.3/defconfig b/boards/arm/rp2040/raspberrypi-pico-w/configs/waveshare-lcd-1.3/defconfig index 31e64d1d14939..e2808f04d6702 100644 --- a/boards/arm/rp2040/raspberrypi-pico-w/configs/waveshare-lcd-1.3/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico-w/configs/waveshare-lcd-1.3/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/ads7046/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/ads7046/defconfig index 1407d6138e521..a0aecba4edb8e 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/ads7046/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/ads7046/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig index 130889eb4a8c2..e9743634944e2 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_AUDIO_FORMAT_MP3 is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/bmp280/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/bmp280/defconfig index e18fe74f06527..f0453086fc691 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/bmp280/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/bmp280/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig index 26f52539e2348..4bf78a7b9e2c0 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig index f81ffb552c295..88c1b902e7a1d 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig @@ -7,7 +7,6 @@ # # CONFIG_DEV_CONSOLE is not set # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig index b2e16372ee484..c38a2c04a928b 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig index e04dad8adc20f..c1535d06c8886 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/nsh-flash/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/nsh-flash/defconfig index f0fcde2f1a87b..e9b628b474e45 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/nsh-flash/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/nsh-flash/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig index fe798c8004b97..ea190bd35d723 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig index 133f7f08522ff..d47342614a437 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEBUG_OPT_UNUSED_SECTIONS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/pico-restouch-lcd-2.8/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/pico-restouch-lcd-2.8/defconfig index 2279b4a0d2801..77d12f43ccf49 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/pico-restouch-lcd-2.8/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/pico-restouch-lcd-2.8/defconfig @@ -7,7 +7,6 @@ # # CONFIG_DEV_CONSOLE is not set # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig index b776c472bfe08..e61b6a63ca561 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig index ae640b2867ec2..803d6be597fc6 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig index c63446f7c7eb5..57375f791fce8 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig index 2e1e41acc70e7..f1d89b282c99d 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/tmp112/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/tmp112/defconfig index 6930508543ada..0abe4a6be2edf 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/tmp112/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/tmp112/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig index f3f93a7efae96..6546563889b75 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig index 45594b766fa96..2720cdbf9adfb 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig index f5240453ba84f..078382c01dfbd 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig index 57a7218599c2a..5ae0106b1bdd6 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/seeed-xiao-rp2040/configs/gpio/defconfig b/boards/arm/rp2040/seeed-xiao-rp2040/configs/gpio/defconfig index f25eae2f64cd9..083f7fcc3f8e2 100644 --- a/boards/arm/rp2040/seeed-xiao-rp2040/configs/gpio/defconfig +++ b/boards/arm/rp2040/seeed-xiao-rp2040/configs/gpio/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/seeed-xiao-rp2040/configs/nsh/defconfig b/boards/arm/rp2040/seeed-xiao-rp2040/configs/nsh/defconfig index f2b3c60739a77..9108bba13d545 100644 --- a/boards/arm/rp2040/seeed-xiao-rp2040/configs/nsh/defconfig +++ b/boards/arm/rp2040/seeed-xiao-rp2040/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/seeed-xiao-rp2040/configs/usbnsh/defconfig b/boards/arm/rp2040/seeed-xiao-rp2040/configs/usbnsh/defconfig index b617867bca39d..c8549c6d521d9 100644 --- a/boards/arm/rp2040/seeed-xiao-rp2040/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/seeed-xiao-rp2040/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/seeed-xiao-rp2040/configs/userleds/defconfig b/boards/arm/rp2040/seeed-xiao-rp2040/configs/userleds/defconfig index 17cacbb5680d3..aaf2e50bd9ca2 100644 --- a/boards/arm/rp2040/seeed-xiao-rp2040/configs/userleds/defconfig +++ b/boards/arm/rp2040/seeed-xiao-rp2040/configs/userleds/defconfig @@ -7,7 +7,6 @@ # # CONFIG_ARCH_LEDS is not set # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/w5500-evb-pico/configs/usbnsh/defconfig b/boards/arm/rp2040/w5500-evb-pico/configs/usbnsh/defconfig index 903a28422c161..b1a999eb10ea1 100644 --- a/boards/arm/rp2040/w5500-evb-pico/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/w5500-evb-pico/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/composite/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/composite/defconfig index f9d160c523d7e..d1fb7907c2b9d 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/composite/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/composite/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/fb/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/fb/defconfig index a48ca78bca8c8..cb6a19a9deec1 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/fb/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/fb/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/lvgl/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/lvgl/defconfig index e82356b4ba84b..3216e7e826966 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/lvgl/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/lvgl/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nsh-flash/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nsh-flash/defconfig index e2e0a86052c26..4998f85e6a10c 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nsh-flash/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nsh-flash/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nsh/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nsh/defconfig index eeb0c35ccc54e..6e2bf325bed82 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nsh/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nshsram/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nshsram/defconfig index 2d9c31a9d3481..261e4f4983cd0 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nshsram/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/nshsram/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEBUG_OPT_UNUSED_SECTIONS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/smp/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/smp/defconfig index 406a22828efc0..698775958faca 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/smp/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/smp/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/spisd/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/spisd/defconfig index 7f76216453862..a8b43ba236294 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/spisd/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/spisd/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/usbmsc/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/usbmsc/defconfig index 08cde18d71d47..28142293e8665 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/usbmsc/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/usbmsc/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/usbnsh/defconfig b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/usbnsh/defconfig index acf7e8615275d..1dde2375401ae 100644 --- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-zero/configs/gpio/defconfig b/boards/arm/rp2040/waveshare-rp2040-zero/configs/gpio/defconfig index cc9ab24dd4c6c..4bfcaa9f12a1b 100644 --- a/boards/arm/rp2040/waveshare-rp2040-zero/configs/gpio/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-zero/configs/gpio/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-zero/configs/nsh/defconfig b/boards/arm/rp2040/waveshare-rp2040-zero/configs/nsh/defconfig index 7dc648dd5b96f..0758ad563063f 100644 --- a/boards/arm/rp2040/waveshare-rp2040-zero/configs/nsh/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-zero/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp2040/waveshare-rp2040-zero/configs/usbnsh/defconfig b/boards/arm/rp2040/waveshare-rp2040-zero/configs/usbnsh/defconfig index 2a57de58c984c..260fc1d40b5ee 100644 --- a/boards/arm/rp2040/waveshare-rp2040-zero/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/waveshare-rp2040-zero/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/audiopack/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/audiopack/defconfig index 756263d7a98f5..9c247dc6def51 100644 --- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/audiopack/defconfig +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/audiopack/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_AUDIO_FORMAT_MP3 is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/composite/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/composite/defconfig index bb95c5aa0d166..dcb2c6016a000 100644 --- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/composite/defconfig +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/composite/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nsh/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nsh/defconfig index b4144dcb1dab9..36d7894cfb364 100644 --- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nsh/defconfig +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig index 6620b983c879a..f567f8c3f9283 100644 --- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEBUG_OPT_UNUSED_SECTIONS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/smp/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/smp/defconfig index a363b10433afa..5ff7e23d67e61 100644 --- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/smp/defconfig +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/smp/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbmsc/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbmsc/defconfig index 4f04df4a4b579..09aee0dd297fd 100644 --- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbmsc/defconfig +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbmsc/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_HAVE_WRITEPROTECT is not set # CONFIG_NSH_ARGCAT is not set diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbnsh/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbnsh/defconfig index e5ede45c01813..42912c60893e5 100644 --- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbnsh/defconfig +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/userled/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/userled/defconfig index 1e8184574e9f8..393b0d68b0cb4 100644 --- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/userled/defconfig +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/userled/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_LEDS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/raspberrypi-pico-2/configs/nsh/defconfig b/boards/arm/rp23xx/raspberrypi-pico-2/configs/nsh/defconfig index a1c05e37ce46d..0659421dffa38 100644 --- a/boards/arm/rp23xx/raspberrypi-pico-2/configs/nsh/defconfig +++ b/boards/arm/rp23xx/raspberrypi-pico-2/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/raspberrypi-pico-2/configs/smp/defconfig b/boards/arm/rp23xx/raspberrypi-pico-2/configs/smp/defconfig index 9fb71a5868c6f..ccbe7905e1172 100644 --- a/boards/arm/rp23xx/raspberrypi-pico-2/configs/smp/defconfig +++ b/boards/arm/rp23xx/raspberrypi-pico-2/configs/smp/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/raspberrypi-pico-2/configs/spisd/defconfig b/boards/arm/rp23xx/raspberrypi-pico-2/configs/spisd/defconfig index bcba5d22c6231..890c77ed6778b 100644 --- a/boards/arm/rp23xx/raspberrypi-pico-2/configs/spisd/defconfig +++ b/boards/arm/rp23xx/raspberrypi-pico-2/configs/spisd/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/raspberrypi-pico-2/configs/usbnsh/defconfig b/boards/arm/rp23xx/raspberrypi-pico-2/configs/usbnsh/defconfig index eeab2e4674620..c3a848d50202f 100644 --- a/boards/arm/rp23xx/raspberrypi-pico-2/configs/usbnsh/defconfig +++ b/boards/arm/rp23xx/raspberrypi-pico-2/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/raspberrypi-pico-2/configs/userled/defconfig b/boards/arm/rp23xx/raspberrypi-pico-2/configs/userled/defconfig index a7cd663df31fb..0930dbf6113d5 100644 --- a/boards/arm/rp23xx/raspberrypi-pico-2/configs/userled/defconfig +++ b/boards/arm/rp23xx/raspberrypi-pico-2/configs/userled/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_LEDS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/xiao-rp2350/configs/combo/defconfig b/boards/arm/rp23xx/xiao-rp2350/configs/combo/defconfig index 8313fd8e2bc49..4a721a20278e8 100644 --- a/boards/arm/rp23xx/xiao-rp2350/configs/combo/defconfig +++ b/boards/arm/rp23xx/xiao-rp2350/configs/combo/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/xiao-rp2350/configs/nsh/defconfig b/boards/arm/rp23xx/xiao-rp2350/configs/nsh/defconfig index 0d4e4750c84de..9550530747102 100644 --- a/boards/arm/rp23xx/xiao-rp2350/configs/nsh/defconfig +++ b/boards/arm/rp23xx/xiao-rp2350/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/rp23xx/xiao-rp2350/configs/usbnsh/defconfig b/boards/arm/rp23xx/xiao-rp2350/configs/usbnsh/defconfig index b00a4bc44744b..103b877ea74cd 100644 --- a/boards/arm/rp23xx/xiao-rp2350/configs/usbnsh/defconfig +++ b/boards/arm/rp23xx/xiao-rp2350/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig b/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig index 45910222b1ab6..8dcf456bfee77 100644 --- a/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig +++ b/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DISABLE_MQUEUE_SYSV is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_SAMV7_UART2 is not set # CONFIG_SAMV7_UART4 is not set diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig index d910ef4ab1ac4..2c68c69b4af62 100644 --- a/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DISABLE_MQUEUE_SYSV is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_SAMV7_UART0 is not set # CONFIG_SAMV7_UART2 is not set # CONFIG_SAMV7_UART4 is not set diff --git a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig index 87db1d2a4133f..386f0a3d39965 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f302r8" CONFIG_ARCH_BOARD_NUCLEO_F302R8=y diff --git a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig index c03c2f9315de7..a1df51d77ca57 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_FPU is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_SYSTEM_DD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f302r8" diff --git a/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig index 399e8177a463d..1197a24f5e613 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig @@ -78,7 +78,6 @@ CONFIG_EXAMPLES_QENCODER_MAXPOS=8192 CONFIG_FILE_STREAM=y CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y -CONFIG_LIBC_LONG_LONG=y CONFIG_LIBM_TOOLCHAIN=y CONFIG_LINE_MAX=80 CONFIG_MQ_MAXMSGSIZE=5 diff --git a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig index d79086661b110..33656febfca35 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_FPU is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_SYSTEM_DD is not set CONFIG_ADC=y CONFIG_ANALOG=y diff --git a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig index 3eaaee9d59cfe..1866cd70f3cf7 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" CONFIG_ARCH_BOARD_NUCLEO_F334R8=y diff --git a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig index 5b15d043c40bb..2bb393ba17062 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_FPU is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_SYSTEM_DD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig index 0b6a66f894f16..37daa3d7509e5 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" CONFIG_ARCH_BOARD_NUCLEO_F334R8=y diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig index 1773bcac52757..d238c8b4564f3 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" CONFIG_ARCH_BOARD_NUCLEO_F334R8=y diff --git a/boards/arm/stm32/nucleo-g431rb/configs/adc/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/adc/defconfig index 6d2ba84ddac0a..143878d3afd82 100644 --- a/boards/arm/stm32/nucleo-g431rb/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-g431rb/configs/adc/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_FPU is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_SYSTEM_DD is not set CONFIG_ADC=y CONFIG_ANALOG=y diff --git a/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig b/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig index 5008116599eb6..5695f7ee012f2 100644 --- a/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig +++ b/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NX_DISABLE_16BPP is not set CONFIG_ARCH="arm" diff --git a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig index 507825cb01fb3..4232102fb6154 100644 --- a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l152re" diff --git a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig index c2bb6dfa98db2..db3bc11cbbb2d 100644 --- a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_FPU is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_SYSTEM_DD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f334-disco" diff --git a/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig index 88741ebb797a7..9be5d50f0b3ce 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig @@ -61,7 +61,6 @@ CONFIG_LCD=y CONFIG_LCD_FRAMEBUFFER=y CONFIG_LCD_MAX7219=y CONFIG_LCD_NOGETRUN=y -CONFIG_LIBC_LONG_LONG=y CONFIG_MAX7219_NHORIZONTALBLKS=4 CONFIG_MM_REGIONS=2 CONFIG_MQ_MAXMSGSIZE=64 diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig index 4462d03ab5630..29a75f2172428 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ADC=y CONFIG_ANALOG=y diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig index c75f19dac4117..5fd878ff4ff73 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l072z-lrwan1" diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig index 535105ac3231c..bd5efbbb3c5ac 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NX_DISABLE_1BPP is not set CONFIG_ARCH="arm" diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig index c68b956af1e9a..7ed1d73f33808 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l072z-lrwan1" diff --git a/boards/arm/stm32f0l0g0/nucleo-c071rb/configs/adcscope/defconfig b/boards/arm/stm32f0l0g0/nucleo-c071rb/configs/adcscope/defconfig index 54dc06b209bb6..c2ff70981676b 100644 --- a/boards/arm/stm32f0l0g0/nucleo-c071rb/configs/adcscope/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-c071rb/configs/adcscope/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_SYSTEM_DD is not set CONFIG_ADC=y CONFIG_ANALOG=y diff --git a/boards/arm/stm32f0l0g0/nucleo-c071rb/configs/jumbo/defconfig b/boards/arm/stm32f0l0g0/nucleo-c071rb/configs/jumbo/defconfig index 493d9479f9c00..3509e2d484856 100644 --- a/boards/arm/stm32f0l0g0/nucleo-c071rb/configs/jumbo/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-c071rb/configs/jumbo/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ADC=y CONFIG_ANALOG=y diff --git a/boards/arm/stm32f0l0g0/nucleo-c092rc/configs/jumbo/defconfig b/boards/arm/stm32f0l0g0/nucleo-c092rc/configs/jumbo/defconfig index b360b8a8630e4..0bf1c6c009a14 100644 --- a/boards/arm/stm32f0l0g0/nucleo-c092rc/configs/jumbo/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-c092rc/configs/jumbo/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ADC=y CONFIG_ANALOG=y diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig index a33db3856a49f..6637887a09c0c 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f091rc" diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig index 2fc1ae312753c..2f5e5cf0859f3 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-g070rb" diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig index f2476b19d345c..ee39c1d282180 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-g071rb" diff --git a/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/adc/defconfig b/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/adc/defconfig index 4bb6f38f054e4..d56da04bd24d0 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/adc/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/adc/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ADC=y CONFIG_ANALOG=y diff --git a/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/adc_dma/defconfig b/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/adc_dma/defconfig index 1674e14770265..e85080bc6dd61 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/adc_dma/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/adc_dma/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ADC=y CONFIG_ADC_FIFOSIZE=64 diff --git a/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/nsh/defconfig index 91820b00a29dc..5ac96442f86b0 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g0b1re/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-g0b1re" diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig index fa0a29dd49513..3daccc627d569 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l073rz" diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig index bfdca3049be00..085ba16e7d1f2 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l073rz" diff --git a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig index 0751ed9b3e8d8..3835900807616 100644 --- a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_LEDS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32g071b-disco" diff --git a/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig index 4000764bfbdf4..4510918393862 100644 --- a/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_SYSTEM_DD_STATS is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32l0538-disco" diff --git a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig index 9543471635886..86a3bdafa7d8e 100644 --- a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set CONFIG_ARCH="arm" diff --git a/boards/arm/tlsr82/tlsr8278adk80d/configs/nsh/defconfig b/boards/arm/tlsr82/tlsr8278adk80d/configs/nsh/defconfig index ff3c4a890b84c..aaf6a79db3d52 100644 --- a/boards/arm/tlsr82/tlsr8278adk80d/configs/nsh/defconfig +++ b/boards/arm/tlsr82/tlsr8278adk80d/configs/nsh/defconfig @@ -58,7 +58,6 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_FILE_STREAM=y CONFIG_FS_PROCFS=y CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_RAND_ORDER=0 CONFIG_LIBM=y CONFIG_LINE_MAX=80 diff --git a/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig b/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig index 4056ccfb934cb..1334a733c7c1c 100644 --- a/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig @@ -86,7 +86,6 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_INLINE_QUEUE=y -CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_STRERROR_ERRNUM=y CONFIG_LIBM_TOOLCHAIN=y CONFIG_LINE_MAX=80 diff --git a/boards/misoc/lm32/misoc/configs/nsh/defconfig b/boards/misoc/lm32/misoc/configs/nsh/defconfig index 55256918705db..861ea11d59637 100644 --- a/boards/misoc/lm32/misoc/configs/nsh/defconfig +++ b/boards/misoc/lm32/misoc/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="misoc" CONFIG_ARCH_BOARD="misoc" diff --git a/boards/risc-v/bl602/bl602evb/configs/dma/defconfig b/boards/risc-v/bl602/bl602evb/configs/dma/defconfig index b3dc660ff21a1..ef69f87fa686a 100644 --- a/boards/risc-v/bl602/bl602evb/configs/dma/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/dma/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_LIBC_FLOATINGPOINT is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NDEBUG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_DISABLE_LOSMART is not set diff --git a/boards/risc-v/rp23xx-rv/raspberrypi-pico-2-rv/configs/nsh/defconfig b/boards/risc-v/rp23xx-rv/raspberrypi-pico-2-rv/configs/nsh/defconfig index 9641d87ecc3fc..85c48d36f4109 100644 --- a/boards/risc-v/rp23xx-rv/raspberrypi-pico-2-rv/configs/nsh/defconfig +++ b/boards/risc-v/rp23xx-rv/raspberrypi-pico-2-rv/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/risc-v/rp23xx-rv/raspberrypi-pico-2-rv/configs/usbnsh/defconfig b/boards/risc-v/rp23xx-rv/raspberrypi-pico-2-rv/configs/usbnsh/defconfig index 4aaadfbbc4b13..91bbda7cf490c 100644 --- a/boards/risc-v/rp23xx-rv/raspberrypi-pico-2-rv/configs/usbnsh/defconfig +++ b/boards/risc-v/rp23xx-rv/raspberrypi-pico-2-rv/configs/usbnsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/sparc/bm3803/xx3803/configs/nsh/defconfig b/boards/sparc/bm3803/xx3803/configs/nsh/defconfig index 3f4802978829c..9595de41683c6 100644 --- a/boards/sparc/bm3803/xx3803/configs/nsh/defconfig +++ b/boards/sparc/bm3803/xx3803/configs/nsh/defconfig @@ -7,7 +7,6 @@ # # CONFIG_ARCH_LEDS is not set # CONFIG_ARCH_RAMFUNCS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/sparc/s698pm/s698pm-dkit/configs/nsh/defconfig b/boards/sparc/s698pm/s698pm-dkit/configs/nsh/defconfig index 0ac9a17350cd8..d157ee0a5c0e1 100644 --- a/boards/sparc/s698pm/s698pm-dkit/configs/nsh/defconfig +++ b/boards/sparc/s698pm/s698pm-dkit/configs/nsh/defconfig @@ -7,7 +7,6 @@ # # CONFIG_ARCH_LEDS is not set # CONFIG_ARCH_RAMFUNCS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/boards/sparc/s698pm/s698pm-dkit/configs/smp/defconfig b/boards/sparc/s698pm/s698pm-dkit/configs/smp/defconfig index c69f2dc19b533..6296c6df9c76b 100644 --- a/boards/sparc/s698pm/s698pm-dkit/configs/smp/defconfig +++ b/boards/sparc/s698pm/s698pm-dkit/configs/smp/defconfig @@ -7,7 +7,6 @@ # # CONFIG_ARCH_LEDS is not set # CONFIG_ARCH_RAMFUNCS is not set -# CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_DATE is not set diff --git a/drivers/wireless/lpwan/rn2xx3/rn2xx3.c b/drivers/wireless/lpwan/rn2xx3/rn2xx3.c index 1b670695908d9..bc3ea4754b22d 100644 --- a/drivers/wireless/lpwan/rn2xx3/rn2xx3.c +++ b/drivers/wireless/lpwan/rn2xx3/rn2xx3.c @@ -52,10 +52,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_LIBC_LONG_LONG -#error "CONFIG_LIBC_LONG_LONG must be enabled for this driver" -#endif - /* Duration of maximum MAC layer pause in milliseconds */ #define MAC_PAUSE_DUR "4294967245" diff --git a/libs/libc/stdio/Kconfig b/libs/libc/stdio/Kconfig index 28dcfa270286e..ff25cacb61938 100644 --- a/libs/libc/stdio/Kconfig +++ b/libs/libc/stdio/Kconfig @@ -60,21 +60,6 @@ config LIBC_FLOATINGPOINT By default, floating point support in printf, sscanf, etc. is disabled. This option will enable floating point support. -config LIBC_LONG_LONG - bool "Enable long long support in printf" - default !DEFAULT_SMALL - ---help--- - Enables support for long long formats in printf, sscanf, etc. is - enabled. This is enabled by default but if you are trying to - reduce the FLASH footprint, then disabling this feature is one - option. The FLASH saves comes not from disabling the long long - formats, but rather from omitting the large long long arithmetic - libraries that will be drawn into the build if long long support - is enabled. - - NOTE: This setting has no effect if the underlying architecture - cannot support long long types - config LIBC_NUMBERED_ARGS bool "Enable numbered arguments in printf" default n diff --git a/libs/libc/stream/lib_libvscanf.c b/libs/libc/stream/lib_libvscanf.c index 0100cd85eae18..d4a369d6e4feb 100644 --- a/libs/libc/stream/lib_libvscanf.c +++ b/libs/libc/stream/lib_libvscanf.c @@ -36,10 +36,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_LIBC_LONG_LONG is not a valid selection of the compiler does not - * support long long types. - */ - #ifdef CONFIG_LIBC_SCANSET # define SCANSET_MODS "[" #else @@ -859,19 +855,11 @@ static int vscanf_internal(FAR struct lib_instream_s *stream, FAR int *lastc, case LL_MOD: if (sign) { -# ifdef CONFIG_LIBC_LONG_LONG tmplonglong = strtoll(tmp, &endptr, base); -# else - tmplonglong = strtol(tmp, &endptr, base); -# endif } else { -# ifdef CONFIG_LIBC_LONG_LONG tmplonglong = strtoull(tmp, &endptr, base); -# else - tmplonglong = strtoul(tmp, &endptr, base); -# endif } break; } diff --git a/libs/libc/stream/lib_libvsprintf.c b/libs/libc/stream/lib_libvsprintf.c index eb9123ff68eeb..ddbf9296ee94d 100644 --- a/libs/libc/stream/lib_libvsprintf.c +++ b/libs/libc/stream/lib_libvsprintf.c @@ -57,10 +57,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_LIBC_LONG_LONG is not a valid selection of the compiler does not - * support long long types. - */ - #define stream_putc(c,stream) (total_len++, lib_stream_putc(stream, c)) #define stream_puts(buf, len, stream) \ (total_len += len, lib_stream_puts(stream, buf, len)) @@ -159,11 +155,7 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, int prec; union { -#if defined (CONFIG_LIBC_LONG_LONG) || (ULONG_MAX > 4294967295UL) char __buf[22]; /* Size for -1 in octal, without '\0' */ -#else - char __buf[11]; /* Size for -1 in octal, without '\0' */ -#endif #ifdef CONFIG_LIBC_FLOATINGPOINT struct dtoa_s __dtoa; #endif @@ -1010,9 +1002,6 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, } else { -#if !defined(CONFIG_LIBC_LONG_LONG) - DEBUGASSERT(x >= 0 && x <= ULONG_MAX); -#endif c = __ultoa_invert(x, buf, 10) - buf; } } @@ -1192,9 +1181,6 @@ static int vsprintf_internal(FAR struct lib_outstream_s *stream, } else { -#if !defined(CONFIG_LIBC_LONG_LONG) - DEBUGASSERT(x <= ULONG_MAX); -#endif c = __ultoa_invert(x, buf, base) - buf; } diff --git a/libs/libc/stream/lib_ultoa_invert.c b/libs/libc/stream/lib_ultoa_invert.c index eaad31f97563f..bc246fcb403a1 100644 --- a/libs/libc/stream/lib_ultoa_invert.c +++ b/libs/libc/stream/lib_ultoa_invert.c @@ -43,11 +43,7 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_LIBC_LONG_LONG FAR char *__ultoa_invert(unsigned long long val, FAR char *str, int base) -#else -FAR char *__ultoa_invert(unsigned long val, FAR char *str, int base) -#endif { int upper = 0; diff --git a/libs/libc/stream/lib_ultoa_invert.h b/libs/libc/stream/lib_ultoa_invert.h index f5fb075dce305..e3b04d19ac37e 100644 --- a/libs/libc/stream/lib_ultoa_invert.h +++ b/libs/libc/stream/lib_ultoa_invert.h @@ -46,10 +46,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_LIBC_LONG_LONG is not a valid selection of the compiler does not - * support long long types. - */ - /* Next flags are to use with `base'. Unused fields are reserved. */ #define XTOA_PREFIX 0x0100 /* Put prefix for octal or hex */ @@ -61,10 +57,6 @@ /* Internal function for use from `printf'. */ -#ifdef CONFIG_LIBC_LONG_LONG FAR char *__ultoa_invert(unsigned long long val, FAR char *str, int base); -#else -FAR char *__ultoa_invert(unsigned long val, FAR char *str, int base); -#endif #endif /* __LIBS_LIBC_STREAM_LIB_ULTOA_INVERT_H */ From 1c0c8c9d1185d507eeea6524ce27ba909603dd28 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 3 May 2026 15:54:17 +0800 Subject: [PATCH 4/8] !sched/clock: remove CONFIG_SYSTEM_TIME64 and always use 64-bit time The 32-bit system clock has a limited range (~497 days) and the configuration knob is no longer worth the complexity given that practically every modern target already enables it. Make 64-bit time_t/clock_t/sclock_t/nuttx_time_t the only supported flavor. Specifically: - Drop the SYSTEM_TIME64 Kconfig option and its dependent PERF_OVERFLOW_CORRECTION/HRTIMER guards in sched/Kconfig. - Remove every #ifdef CONFIG_SYSTEM_TIME64 branch in headers (include/{sys/types.h,limits.h,inttypes.h,nuttx/clock.h, nuttx/fs/hostfs.h}) and core code paths (sched/clock/clock.h, drivers/power/pm/pm_procfs.c, drivers/rpmsg/rpmsg_ping.c, fs/procfs/fs_procfsuptime.c, libs/libc/wqueue/work_usrthread.c, arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c). - Strip CONFIG_SYSTEM_TIME64=y from every board defconfig. - Update Documentation/guides/rust.rst accordingly. Signed-off-by: Xiang Xiao --- Documentation/guides/rust.rst | 1 - arch/arm/src/armv7-a/arm_perf.c | 2 +- arch/arm/src/armv7-m/arm_perf.c | 2 +- arch/arm/src/armv7-r/arm_perf.c | 2 +- arch/arm/src/armv8-m/arm_perf.c | 2 +- arch/arm/src/armv8-r/arm_perf.c | 2 +- arch/arm/src/cxd56xx/cxd56_cisif.c | 2 +- arch/arm/src/cxd56xx/cxd56_nxaudio.c | 8 ++--- arch/arm/src/cxd56xx/cxd56_rtc.c | 2 +- arch/arm/src/efm32/efm32_rtc_burtc.c | 2 +- arch/arm/src/imxrt/imxrt_tickless.c | 2 +- arch/arm/src/lc823450/lc823450_dvfs2.c | 2 +- arch/arm/src/lc823450/lc823450_timer.c | 2 +- arch/arm/src/lpc31xx/lpc31_timerisr.c | 2 +- arch/arm/src/lpc43xx/lpc43_rit.c | 8 ++--- arch/arm/src/lpc54xx/lpc54_tickless.c | 4 +-- arch/arm/src/sam34/sam4cm_oneshot.c | 4 +-- arch/arm/src/sama5/sam_oneshot.c | 6 ++-- arch/arm/src/samd5e5/sam_oneshot.c | 3 +- arch/arm/src/samv7/sam_oneshot.c | 4 +-- arch/arm/src/stm32/stm32_oneshot.c | 4 +-- arch/arm/src/stm32/stm32_rtcounter.c | 2 +- arch/arm/src/stm32/stm32_tickless.c | 4 +-- arch/arm/src/stm32f7/stm32_tickless.c | 6 ++-- arch/arm/src/stm32h7/stm32_oneshot.c | 4 +-- arch/arm/src/stm32h7/stm32_tickless.c | 6 ++-- arch/arm/src/stm32l4/stm32l4_oneshot.c | 4 +-- arch/arm/src/stm32wb/stm32wb_oneshot.c | 4 +-- arch/arm/src/stm32wb/stm32wb_tickless.c | 4 +-- arch/arm/src/xmc4/xmc4_tickless.c | 4 +-- .../src/avrdx/avrdx_timerisr_tickless_alarm.c | 3 +- arch/mips/src/pic32mz/pic32mz_oneshot.c | 6 ++-- .../src/pic32mz/pic32mz_timer_lowerhalf.c | 2 +- .../src/bl602/bl602_oneshot_lowerhalf.c | 2 +- arch/risc-v/src/common/espressif/esp_i2c.c | 4 +-- arch/risc-v/src/common/espressif/esp_rtc.c | 2 +- .../src/common/espressif/esp_tickless.c | 4 +-- arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c | 4 +-- .../src/esp32c3-legacy/esp32c3_oneshot.c | 6 ++-- arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c | 4 +-- arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c | 2 +- .../src/esp32c3-legacy/esp32c3_tickless.c | 4 +-- .../esp32c3-legacy/esp32c3_tim_lowerhalf.c | 2 +- .../src/esp32c3-legacy/esp32c3_wifi_adapter.c | 2 +- arch/risc-v/src/esp32c3/esp_ble_adapter.c | 4 +-- arch/risc-v/src/esp32c3/esp_coex_adapter.c | 2 +- arch/risc-v/src/esp32c6/esp_coex_adapter.c | 2 +- arch/risc-v/src/litex/litex_tickless.c | 4 +-- arch/sparc/src/bm3803/bm3803_freerun.c | 4 +-- arch/sparc/src/bm3803/bm3803_oneshot.c | 6 ++-- arch/x86_64/src/intel64/intel64_oneshot.c | 6 ++-- arch/x86_64/src/intel64/intel64_perf.c | 2 +- arch/xtensa/src/common/espressif/esp_rtc.c | 2 +- arch/xtensa/src/common/xtensa_oneshot.c | 4 +-- arch/xtensa/src/common/xtensa_perf.c | 2 +- arch/xtensa/src/esp32/esp32_i2c.c | 4 +-- arch/xtensa/src/esp32/esp32_oneshot.c | 6 ++-- arch/xtensa/src/esp32/esp32_psram.c | 2 +- arch/xtensa/src/esp32/esp32_tickless.c | 4 +-- arch/xtensa/src/esp32/esp32_tim_lowerhalf.c | 2 +- arch/xtensa/src/esp32/esp32_wifi_adapter.c | 2 +- arch/xtensa/src/esp32s2/esp32s2_i2c.c | 4 +-- arch/xtensa/src/esp32s2/esp32s2_oneshot.c | 6 ++-- .../src/esp32s2/esp32s2_tim_lowerhalf.c | 2 +- .../xtensa/src/esp32s2/esp32s2_wifi_adapter.c | 2 +- arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c | 4 +-- arch/xtensa/src/esp32s3/esp32s3_i2c.c | 4 +-- arch/xtensa/src/esp32s3/esp32s3_oneshot.c | 6 ++-- arch/xtensa/src/esp32s3/esp32s3_tickless.c | 4 +-- .../src/esp32s3/esp32s3_tim_lowerhalf.c | 2 +- .../xtensa/src/esp32s3/esp32s3_wifi_adapter.c | 2 +- .../drivers/audio/cxd56_audio_analog.c | 10 +++---- .../fvp-armv8r-aarch32/configs/nsh/defconfig | 1 - .../lc823450-xgevk/configs/audio/defconfig | 1 - .../lc823450-xgevk/configs/bt/defconfig | 1 - .../lc823450-xgevk/configs/knsh/defconfig | 1 - .../lc823450-xgevk/configs/kostest/defconfig | 1 - .../lc823450-xgevk/configs/krndis/defconfig | 1 - .../lc823450-xgevk/configs/nsh/defconfig | 1 - .../lc823450-xgevk/configs/rndis/defconfig | 1 - .../lc823450-xgevk/configs/usb/defconfig | 1 - .../arm/stm32/b-g474e-dpow1/src/stm32_smps.c | 4 +-- .../stm32/nucleo-f302r8/configs/can/defconfig | 1 - .../olimexino-stm32/configs/can/defconfig | 1 - .../configs/composite/defconfig | 1 - .../olimexino-stm32/configs/nsh/defconfig | 1 - .../stm32/stm32f334-disco/src/stm32_smps.c | 4 +-- .../stm32f4discovery/configs/canard/defconfig | 1 - .../a527/avaota-a1/configs/nsh/defconfig | 1 - .../arm64/a64/pinephone/configs/lcd/defconfig | 1 - .../a64/pinephone/configs/lvgl/defconfig | 1 - .../arm64/a64/pinephone/configs/nsh/defconfig | 1 - .../a64/pinephone/configs/sensor/defconfig | 1 - .../raspberrypi-4b/configs/cgol/defconfig | 1 - .../raspberrypi-4b/configs/coremark/defconfig | 1 - .../raspberrypi-4b/configs/fb/defconfig | 1 - .../raspberrypi-4b/configs/lvgl/defconfig | 1 - .../raspberrypi-4b/configs/nsh/defconfig | 1 - .../raspberrypi-4b/configs/ostest/defconfig | 1 - .../raspberrypi-4b/configs/sd/defconfig | 1 - .../fvp-armv8r/configs/citest/defconfig | 1 - .../fvp-armv8r/configs/citest_smp/defconfig | 1 - .../fvp-v8r/fvp-armv8r/configs/nsh/defconfig | 1 - .../fvp-armv8r/configs/nsh_smp/defconfig | 1 - .../fvp-v8r/fvp-armv8r/configs/pnsh/defconfig | 1 - .../fvp-armv8r/configs/pnsh_smp/defconfig | 1 - .../imx8/imx8qm-mek/configs/nsh/defconfig | 1 - .../imx93-evk/configs/bootloader/defconfig | 1 - .../imx9/imx93-evk/configs/knsh/defconfig | 1 - .../imx9/imx93-evk/configs/koptee/defconfig | 1 - .../imx9/imx93-evk/configs/nsh/defconfig | 1 - .../imx9/imx93-evk/configs/optee/defconfig | 1 - .../imx9/imx95-a55-evk/configs/emmc/defconfig | 1 - .../imx9/imx95-a55-evk/configs/nsh/defconfig | 1 - .../qemu/qemu-armv8a/configs/citest/defconfig | 1 - .../qemu-armv8a/configs/citest_smp/defconfig | 1 - .../qemu-armv8a/configs/fastboot/defconfig | 1 - .../qemu/qemu-armv8a/configs/fb/defconfig | 1 - .../qemu-armv8a/configs/gdbstub/defconfig | 1 - .../qemu/qemu-armv8a/configs/knsh/defconfig | 1 - .../qemu/qemu-armv8a/configs/mte/defconfig | 1 - .../qemu/qemu-armv8a/configs/netnsh/defconfig | 1 - .../qemu-armv8a/configs/netnsh_hv/defconfig | 1 - .../qemu-armv8a/configs/netnsh_smp/defconfig | 1 - .../configs/netnsh_smp_hv/defconfig | 1 - .../qemu/qemu-armv8a/configs/nsh/defconfig | 1 - .../qemu-armv8a/configs/nsh_fiq/defconfig | 1 - .../qemu-armv8a/configs/nsh_gicv2/defconfig | 1 - .../qemu-armv8a/configs/nsh_smp/defconfig | 1 - .../configs/nsh_smp_tickless/defconfig | 1 - .../qemu-armv8a/configs/rpproxy/defconfig | 1 - .../qemu-armv8a/configs/rpserver/defconfig | 1 - .../qemu/qemu-armv8a/configs/sotest/defconfig | 1 - .../qemu-armv8a/configs/sw_tags/defconfig | 1 - .../qemu-armv8a/configs/xedge_demo/defconfig | 1 - .../rk3399/nanopi_m4/configs/nsh/defconfig | 1 - .../rk3399/pinephonepro/configs/nsh/defconfig | 1 - .../zynq-mpsoc/zcu111/configs/jtag/defconfig | 1 - .../zcu111/configs/netjtag/defconfig | 1 - .../zcu111/configs/netnsh/defconfig | 1 - .../zynq-mpsoc/zcu111/configs/nsh/defconfig | 1 - .../c906/smartl-c906/configs/sotest/defconfig | 1 - .../arty_a7/configs/knsh-tickless/defconfig | 1 - .../mpfs/icicle/configs/hwtest/defconfig | 1 - .../risc-v/mpfs/icicle/configs/knsh/defconfig | 1 - .../risc-v/mpfs/icicle/configs/nsh/defconfig | 1 - .../mpfs/icicle/configs/opensbi/defconfig | 1 - .../risc-v/mpfs/icicle/configs/pnsh/defconfig | 1 - .../mpfs/icicle/configs/rpmsg-ch1/defconfig | 1 - .../mpfs/icicle/configs/rpmsg-ch2/defconfig | 1 - .../mpfs/icicle/configs/rpmsg-sbi/defconfig | 1 - .../mpfs/m100pfsevp/configs/nsh/defconfig | 1 - .../rv-virt/configs/citest64/defconfig | 1 - boards/sim/sim/sim/configs/matter/defconfig | 1 - boards/sim/sim/sim/configs/ostest/defconfig | 1 - boards/sim/sim/sim/configs/rtptools/defconfig | 1 - .../sim/sim/sim/configs/tcpblaster/defconfig | 1 - boards/sim/sim/sim/configs/windows/defconfig | 1 - .../sim/sim/sim/configs/windows64/defconfig | 1 - .../a2g-tc397-5v-tft/configs/nsh/defconfig | 1 - .../triboard_tc4x9_com/configs/nsh/defconfig | 1 - .../qemu-intel64/configs/earlyfb/defconfig | 1 - .../qemu/qemu-intel64/configs/fb/defconfig | 1 - .../qemu/qemu-intel64/configs/jumbo/defconfig | 1 - .../qemu-intel64/configs/knsh_romfs/defconfig | 1 - .../configs/knsh_romfs_pci/defconfig | 1 - .../qemu/qemu-intel64/configs/lvgl/defconfig | 1 - .../qemu/qemu-intel64/configs/nsh/defconfig | 1 - .../qemu-intel64/configs/nsh_pci/defconfig | 1 - .../configs/nsh_pci_smp/defconfig | 1 - .../qemu-intel64/configs/ostest/defconfig | 1 - .../esp32s3-devkit/configs/python/defconfig | 1 - drivers/audio/audio_fake.c | 4 +-- drivers/note/noteram_driver.c | 4 +-- drivers/note/notesnap_driver.c | 6 ++-- drivers/power/pm/pm_procfs.c | 18 ++++------- drivers/rpmsg/rpmsg_ping.c | 4 --- drivers/timers/arch_timer.c | 2 +- fs/procfs/fs_procfscritmon.c | 2 +- fs/procfs/fs_procfsuptime.c | 9 ------ include/inttypes.h | 30 ------------------- include/limits.h | 6 +--- include/nuttx/clock.h | 7 +---- include/nuttx/fs/hostfs.h | 4 --- include/sys/types.h | 5 ---- libs/libc/wqueue/work_usrthread.c | 6 +--- sched/Kconfig | 17 +---------- 187 files changed, 147 insertions(+), 338 deletions(-) diff --git a/Documentation/guides/rust.rst b/Documentation/guides/rust.rst index 0656b1bca6875..643ef9998d0c6 100644 --- a/Documentation/guides/rust.rst +++ b/Documentation/guides/rust.rst @@ -57,7 +57,6 @@ Please ensure that you have a working NuttX build environment, and with the foll Please enable the following configurations in your NuttX configuration: -- CONFIG_SYSTEM_TIME64 - CONFIG_FS_LARGEFILE - CONFIG_TLS_NELEM = 16 - CONFIG_DEV_URANDOM diff --git a/arch/arm/src/armv7-a/arm_perf.c b/arch/arm/src/armv7-a/arm_perf.c index f06785f8c98b4..4337cb0600c2e 100644 --- a/arch/arm/src/armv7-a/arm_perf.c +++ b/arch/arm/src/armv7-a/arm_perf.c @@ -95,6 +95,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif diff --git a/arch/arm/src/armv7-m/arm_perf.c b/arch/arm/src/armv7-m/arm_perf.c index a8b58c5ea9447..6e30e33c7ed7a 100644 --- a/arch/arm/src/armv7-m/arm_perf.c +++ b/arch/arm/src/armv7-m/arm_perf.c @@ -76,6 +76,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif diff --git a/arch/arm/src/armv7-r/arm_perf.c b/arch/arm/src/armv7-r/arm_perf.c index 7f96b6b00754c..bcd6aa2d6e806 100644 --- a/arch/arm/src/armv7-r/arm_perf.c +++ b/arch/arm/src/armv7-r/arm_perf.c @@ -91,7 +91,7 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif /* CONFIG_BUILD_FLAT || __KERNEL__ */ diff --git a/arch/arm/src/armv8-m/arm_perf.c b/arch/arm/src/armv8-m/arm_perf.c index 826d4a31d4ed3..842d3b8c96be6 100644 --- a/arch/arm/src/armv8-m/arm_perf.c +++ b/arch/arm/src/armv8-m/arm_perf.c @@ -76,6 +76,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif diff --git a/arch/arm/src/armv8-r/arm_perf.c b/arch/arm/src/armv8-r/arm_perf.c index 5123562d458e6..28c8fdfe36160 100644 --- a/arch/arm/src/armv8-r/arm_perf.c +++ b/arch/arm/src/armv8-r/arm_perf.c @@ -87,6 +87,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif /* CONFIG_ARCH_PERF_EVENTS */ diff --git a/arch/arm/src/cxd56xx/cxd56_cisif.c b/arch/arm/src/cxd56xx/cxd56_cisif.c index fbe72da17fb2b..7a2c2df11f9bd 100644 --- a/arch/arm/src/cxd56xx/cxd56_cisif.c +++ b/arch/arm/src/cxd56xx/cxd56_cisif.c @@ -288,7 +288,7 @@ static uint64_t cisif_get_msec_time(void) clock_systime_timespec(&tp); - return (((uint64_t)tp.tv_sec) * 1000 + tp.tv_nsec / 1000000); + return tp.tv_sec * 1000 + tp.tv_nsec / 1000000; } static void cisif_trace_time_start(void) diff --git a/arch/arm/src/cxd56xx/cxd56_nxaudio.c b/arch/arm/src/cxd56xx/cxd56_nxaudio.c index 75b2d6d300725..80a7e63e778a9 100644 --- a/arch/arm/src/cxd56xx/cxd56_nxaudio.c +++ b/arch/arm/src/cxd56xx/cxd56_nxaudio.c @@ -2096,8 +2096,8 @@ static int cxd56_power_on_micbias(struct cxd56_dev_s *dev) clock_systime_timespec(&start); - dev->mic_boot_start = (uint64_t)start.tv_sec * 1000 + - (uint64_t)start.tv_nsec / 1000000; + dev->mic_boot_start = start.tv_sec * 1000 + + start.tv_nsec / 1000000; return OK; } @@ -2951,8 +2951,8 @@ static int cxd56_start(struct audio_lowerhalf_s *lower) clock_systime_timespec(&end); - uint64_t time = (uint64_t)end.tv_sec * 1000 + - (uint64_t)end.tv_nsec / 1000000 - + uint64_t time = end.tv_sec * 1000 + + end.tv_nsec / 1000000 - priv->mic_boot_start; if (time < CXD56_MIC_BOOT_WAIT) diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c index 6dd84cd98ea02..35da54eea50fe 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc.c +++ b/arch/arm/src/cxd56xx/cxd56_rtc.c @@ -481,7 +481,7 @@ int up_rtc_settime(const struct timespec *tp) /* Only save the difference from HW raw value */ count = SEC_TO_CNT(tp->tv_sec) | NSEC_TO_PRECNT(tp->tv_nsec); - g_rtc_save->offset = (int64_t)count - (int64_t)cxd56_rtc_count(); + g_rtc_save->offset = count - cxd56_rtc_count(); #endif cxd56_update_basetime(&g_basetime); diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c index e1dc0a7165b1a..dd86566dfcda7 100644 --- a/arch/arm/src/efm32/efm32_rtc_burtc.c +++ b/arch/arm/src/efm32/efm32_rtc_burtc.c @@ -466,7 +466,7 @@ int up_rtc_settime(const struct timespec *tp) /* Compute Burtc offset because we cannot reset counter */ - val = (((uint64_t)tp->tv_sec) * CONFIG_RTC_FREQUENCY) + \ + val = (tp->tv_sec * CONFIG_RTC_FREQUENCY) + \ (tp->tv_nsec / (NSEC_PER_SEC / CONFIG_RTC_FREQUENCY)); if (val < cnt_reg) diff --git a/arch/arm/src/imxrt/imxrt_tickless.c b/arch/arm/src/imxrt/imxrt_tickless.c index fee0870f387fd..74bae869d5fbe 100644 --- a/arch/arm/src/imxrt/imxrt_tickless.c +++ b/arch/arm/src/imxrt/imxrt_tickless.c @@ -501,7 +501,7 @@ int up_timer_gettime(struct timespec *ts) int up_alarm_start(const struct timespec *ts) { size_t offset = 1; - uint64_t tm = ((uint64_t)ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / + uint64_t tm = (ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / NSEC_PER_TICK; irqstate_t flags; uint32_t regval; diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.c b/arch/arm/src/lc823450/lc823450_dvfs2.c index 66db5119f320d..d3a6515cf57da 100644 --- a/arch/arm/src/lc823450/lc823450_dvfs2.c +++ b/arch/arm/src/lc823450/lc823450_dvfs2.c @@ -131,7 +131,7 @@ static uint64_t _get_current_time64(void) struct timespec ts; clock_systime_timespec(&ts); - return (uint64_t)ts.tv_sec * NSEC_PER_SEC + (uint64_t)ts.tv_nsec; + return ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec; } /**************************************************************************** diff --git a/arch/arm/src/lc823450/lc823450_timer.c b/arch/arm/src/lc823450/lc823450_timer.c index 192b8c2344344..6dd954afa6a9f 100644 --- a/arch/arm/src/lc823450/lc823450_timer.c +++ b/arch/arm/src/lc823450/lc823450_timer.c @@ -706,7 +706,7 @@ int up_rtc_gettime(struct timespec *tp) /* Get the elapsed time */ - elapsed = NSEC_PER_TICK * (uint64_t)clock_systime_ticks(); + elapsed = NSEC_PER_TICK * clock_systime_ticks(); /* Add the timer fraction in nanoseconds */ diff --git a/arch/arm/src/lpc31xx/lpc31_timerisr.c b/arch/arm/src/lpc31xx/lpc31_timerisr.c index b2fe50aaa0b20..4e5e99ec6d211 100644 --- a/arch/arm/src/lpc31xx/lpc31_timerisr.c +++ b/arch/arm/src/lpc31xx/lpc31_timerisr.c @@ -111,7 +111,7 @@ void up_timer_initialize(void) freq >>= 4; } - load = ((freq * (uint64_t)10000) / 1000000); + load = ((freq * 10000) / 1000000); putreg32((uint32_t)load, LPC31_TIMER0_LOAD); /* Set periodic mode */ diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c index f7e788672f1b2..9400a9a6b839f 100644 --- a/arch/arm/src/lpc43xx/lpc43_rit.c +++ b/arch/arm/src/lpc43xx/lpc43_rit.c @@ -81,7 +81,7 @@ static int lpc43_rit_isr(int irq, void *context, void *arg) putreg32(RIT_CTRL_INT, LPC43_RIT_CTRL); - g_internal_timer += (uint64_t)RIT_TIMER_RESOLUTION; + g_internal_timer += RIT_TIMER_RESOLUTION; if (g_alarm > 0 && g_internal_timer >= g_alarm) { /* handle expired alarm */ @@ -228,8 +228,7 @@ int up_alarm_start(const struct timespec *ts) * coded. */ - g_alarm = (uint64_t)ts->tv_sec * (uint64_t)1000000000 + - (uint64_t)ts->tv_nsec; + g_alarm = ts->tv_sec * 1000000000 + ts->tv_nsec; return OK; } @@ -252,8 +251,7 @@ int up_timer_start(const struct timespec *ts) */ g_alarm = g_internal_timer; - g_alarm += (uint64_t)ts->tv_sec * (uint64_t)1000000000 + - (uint64_t)ts->tv_nsec; + g_alarm += ts->tv_sec * 1000000000 + ts->tv_nsec; return OK; } diff --git a/arch/arm/src/lpc54xx/lpc54_tickless.c b/arch/arm/src/lpc54xx/lpc54_tickless.c index 2ef0d16d91131..fa3b6d94cdf57 100644 --- a/arch/arm/src/lpc54xx/lpc54_tickless.c +++ b/arch/arm/src/lpc54xx/lpc54_tickless.c @@ -273,8 +273,8 @@ static void lpc54_ts_sub(const struct timespec *ts1, static inline uint64_t lpc54_ts2tick(const struct timespec *ts) { - return ((uint64_t)ts->tv_sec * LPC54_CCLK + - ((uint64_t)ts->tv_nsec / g_min_nsec * g_min_ticks)); + return (ts->tv_sec * LPC54_CCLK + + (ts->tv_nsec / g_min_nsec * g_min_ticks)); } static uint64_t lpc54_tick2ts(uint64_t ticks, struct timespec *ts, diff --git a/arch/arm/src/sam34/sam4cm_oneshot.c b/arch/arm/src/sam34/sam4cm_oneshot.c index d6396e3586b68..6c31b6d42ab9a 100644 --- a/arch/arm/src/sam34/sam4cm_oneshot.c +++ b/arch/arm/src/sam34/sam4cm_oneshot.c @@ -289,8 +289,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/sama5/sam_oneshot.c b/arch/arm/src/sama5/sam_oneshot.c index 9003efe9ce1a2..04c35719e7938 100644 --- a/arch/arm/src/sama5/sam_oneshot.c +++ b/arch/arm/src/sama5/sam_oneshot.c @@ -299,8 +299,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * - USEC_PER_SEC + (uint64_t)(ts->tv_nsec / + usec = ts->tv_sec * + USEC_PER_SEC + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts @@ -311,7 +311,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, * = (usecs * frequency) / USEC_PER_SEC; */ - regval = (usec * (uint64_t)sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC; + regval = (usec * sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC; tmrinfo("usec=%llu regval=%08llx\n", usec, regval); DEBUGASSERT(regval <= UINT32_MAX); diff --git a/arch/arm/src/samd5e5/sam_oneshot.c b/arch/arm/src/samd5e5/sam_oneshot.c index b8f9c720b3b37..cb5911fb6bb42 100644 --- a/arch/arm/src/samd5e5/sam_oneshot.c +++ b/arch/arm/src/samd5e5/sam_oneshot.c @@ -233,8 +233,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + (uint64_t)(ts->tv_nsec / - NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine * the number of counts need to achieve the requested delay. diff --git a/arch/arm/src/samv7/sam_oneshot.c b/arch/arm/src/samv7/sam_oneshot.c index 564212828b981..1052435b40954 100644 --- a/arch/arm/src/samv7/sam_oneshot.c +++ b/arch/arm/src/samv7/sam_oneshot.c @@ -300,8 +300,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts * needed to achieve the requested delay. diff --git a/arch/arm/src/stm32/stm32_oneshot.c b/arch/arm/src/stm32/stm32_oneshot.c index 0675ce0558f22..95a507b76195a 100644 --- a/arch/arm/src/stm32/stm32_oneshot.c +++ b/arch/arm/src/stm32/stm32_oneshot.c @@ -283,8 +283,8 @@ int stm32_oneshot_start(struct stm32_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32/stm32_rtcounter.c b/arch/arm/src/stm32/stm32_rtcounter.c index c39097c39a298..aed4639477343 100644 --- a/arch/arm/src/stm32/stm32_rtcounter.c +++ b/arch/arm/src/stm32/stm32_rtcounter.c @@ -296,7 +296,7 @@ static void stm32_rtc_breakout(const struct timespec *tp, * our use */ - frac = ((uint64_t)tp->tv_nsec * CONFIG_RTC_FREQUENCY) / 1000000000; + frac = (tp->tv_nsec * CONFIG_RTC_FREQUENCY) / 1000000000; cnt = (tp->tv_sec << RTC_CLOCKS_SHIFT) | ((uint32_t)frac & (CONFIG_RTC_FREQUENCY - 1)); ovf = (tp->tv_sec >> (32 - RTC_CLOCKS_SHIFT)); diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c index 4109cf446f23d..7ddd226cd8dac 100644 --- a/arch/arm/src/stm32/stm32_tickless.c +++ b/arch/arm/src/stm32/stm32_tickless.c @@ -929,8 +929,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32f7/stm32_tickless.c b/arch/arm/src/stm32f7/stm32_tickless.c index 9e429ea644b4c..bf0c10d350e8b 100644 --- a/arch/arm/src/stm32f7/stm32_tickless.c +++ b/arch/arm/src/stm32f7/stm32_tickless.c @@ -973,8 +973,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. @@ -1021,7 +1021,7 @@ int up_timer_start(const struct timespec *ts) int up_alarm_start(const struct timespec *ts) { size_t offset = 1; - uint64_t tm = ((uint64_t)ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / + uint64_t tm = (ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / NSEC_PER_TICK; irqstate_t flags; diff --git a/arch/arm/src/stm32h7/stm32_oneshot.c b/arch/arm/src/stm32h7/stm32_oneshot.c index 58bd226939bc0..fe56cfdbe58a6 100644 --- a/arch/arm/src/stm32h7/stm32_oneshot.c +++ b/arch/arm/src/stm32h7/stm32_oneshot.c @@ -286,8 +286,8 @@ int stm32_oneshot_start(struct stm32_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32h7/stm32_tickless.c b/arch/arm/src/stm32h7/stm32_tickless.c index 4fbda7e2605b9..06d4651ba13f1 100644 --- a/arch/arm/src/stm32h7/stm32_tickless.c +++ b/arch/arm/src/stm32h7/stm32_tickless.c @@ -947,8 +947,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. @@ -995,7 +995,7 @@ int up_timer_start(const struct timespec *ts) int up_alarm_start(const struct timespec *ts) { size_t offset = 1; - uint64_t tm = ((uint64_t)ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / + uint64_t tm = (ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / NSEC_PER_TICK; irqstate_t flags; diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.c b/arch/arm/src/stm32l4/stm32l4_oneshot.c index 69c7362fb1800..70b41f1ed11ee 100644 --- a/arch/arm/src/stm32l4/stm32l4_oneshot.c +++ b/arch/arm/src/stm32l4/stm32l4_oneshot.c @@ -284,8 +284,8 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32wb/stm32wb_oneshot.c b/arch/arm/src/stm32wb/stm32wb_oneshot.c index 56efd2e027507..d9356f01b32dc 100644 --- a/arch/arm/src/stm32wb/stm32wb_oneshot.c +++ b/arch/arm/src/stm32wb/stm32wb_oneshot.c @@ -284,8 +284,8 @@ int stm32wb_oneshot_start(struct stm32wb_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32wb/stm32wb_tickless.c b/arch/arm/src/stm32wb/stm32wb_tickless.c index 2fa23b986c0de..00769c2ba8585 100644 --- a/arch/arm/src/stm32wb/stm32wb_tickless.c +++ b/arch/arm/src/stm32wb/stm32wb_tickless.c @@ -795,8 +795,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/xmc4/xmc4_tickless.c b/arch/arm/src/xmc4/xmc4_tickless.c index b54b7221865e5..a15241254d8ab 100644 --- a/arch/arm/src/xmc4/xmc4_tickless.c +++ b/arch/arm/src/xmc4/xmc4_tickless.c @@ -429,8 +429,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Compute periods of the timers to match delay to wait */ diff --git a/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c b/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c index 7f5a2f62a8656..927069b0ce807 100644 --- a/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c +++ b/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c @@ -301,8 +301,7 @@ static void avrdx_check_alarm_expired(uint8_t context) /* Note about data types - struct timespec is defined * in include/time.h, tv_sec is of type time_t which is defined - * in include/sys/types.h as uint32_t or uint64_t based - * on CONFIG_SYSTEM_TIME64 + * in include/sys/types.h as uint64_t. * * tv_nsec is defined as long, signed value */ diff --git a/arch/mips/src/pic32mz/pic32mz_oneshot.c b/arch/mips/src/pic32mz/pic32mz_oneshot.c index 7530c2fc7b176..e845875b7358f 100644 --- a/arch/mips/src/pic32mz/pic32mz_oneshot.c +++ b/arch/mips/src/pic32mz/pic32mz_oneshot.c @@ -302,10 +302,10 @@ int pic32mz_oneshot_start(struct pic32mz_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); - period = (usec * (uint64_t)oneshot->freq) / USEC_PER_SEC; + period = (usec * oneshot->freq) / USEC_PER_SEC; tmrinfo("usec=%llu period=%08llx\n", usec, period); DEBUGASSERT(period <= ((1ull << oneshot->width) - 1ul)); diff --git a/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c b/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c index 67b9a9b10ff4b..0b383b383f46a 100644 --- a/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c +++ b/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c @@ -199,7 +199,7 @@ static uint32_t pic32mz_usec2ticks(struct pic32mz_lowerhalf_s *priv, { uint64_t bigticks; - bigticks = ((uint64_t)usecs * (uint64_t)priv->freq) / 1000000; + bigticks = (usecs * priv->freq) / 1000000; if (bigticks > UINT32_MAX) { diff --git a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c index d918309202bb1..a3a67f8a784ff 100644 --- a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c +++ b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c @@ -124,7 +124,7 @@ static inline uint64_t bl602_get_nsec(void) up_timer_gettime(&ts); - return (uint64_t)ts.tv_nsec + (uint64_t)ts.tv_sec * NSEC_PER_SEC; + return ts.tv_nsec + ts.tv_sec * NSEC_PER_SEC; } /**************************************************************************** diff --git a/arch/risc-v/src/common/espressif/esp_i2c.c b/arch/risc-v/src/common/espressif/esp_i2c.c index fbc39b3da3f9a..68707e10a58e5 100644 --- a/arch/risc-v/src/common/espressif/esp_i2c.c +++ b/arch/risc-v/src/common/espressif/esp_i2c.c @@ -1510,7 +1510,7 @@ static void esp_i2c_tracedump(struct esp_i2c_priv_s *priv) struct esp_trace_s *trace; int i; - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", (clock_systime_ticks() - priv->start_time)); for (i = 0; i < priv->tndx; i++) @@ -1518,7 +1518,7 @@ static void esp_i2c_tracedump(struct esp_i2c_priv_s *priv) trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/risc-v/src/common/espressif/esp_rtc.c b/arch/risc-v/src/common/espressif/esp_rtc.c index 6c36b1ff77b61..0896312e1f83e 100644 --- a/arch/risc-v/src/common/espressif/esp_rtc.c +++ b/arch/risc-v/src/common/espressif/esp_rtc.c @@ -775,7 +775,7 @@ int up_rtc_settime(const struct timespec *ts) flags = spin_lock_irqsave(&g_rtc_lowerhalf.lock); - now_us = ((uint64_t) ts->tv_sec) * USEC_PER_SEC + + now_us = ts->tv_sec * USEC_PER_SEC + ts->tv_nsec / NSEC_PER_USEC; #ifdef CONFIG_RTC_DRIVER diff --git a/arch/risc-v/src/common/espressif/esp_tickless.c b/arch/risc-v/src/common/espressif/esp_tickless.c index fa6769f38f0ec..b8dd1f869ae71 100644 --- a/arch/risc-v/src/common/espressif/esp_tickless.c +++ b/arch/risc-v/src/common/espressif/esp_tickless.c @@ -359,8 +359,8 @@ int IRAM_ATTR up_timer_start(const struct timespec *ts) up_timer_cancel(NULL); } - target_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + target_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); alarm_ticks = systimer_hal_get_counter_value(&systimer_hal, SYSTIMER_COUNTER_OS_TICK); diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c index b81cbef477b4f..72f0f81618ec1 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c @@ -1281,7 +1281,7 @@ static void esp32c3_i2c_tracedump(struct esp32c3_i2c_priv_s *priv) struct esp32c3_trace_s *trace; int i; - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", (clock_systime_ticks() - priv->start_time)); for (i = 0; i < priv->tndx; i++) @@ -1289,7 +1289,7 @@ static void esp32c3_i2c_tracedump(struct esp32c3_i2c_priv_s *priv) trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c index 98f9f54f2d4e7..7b799a49b6270 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c @@ -283,8 +283,8 @@ int esp32c3_oneshot_start(struct esp32c3_oneshot_s *oneshot, /* Retrieve the duration from timespec in microsecond */ - timeout_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + timeout_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Verify if it is a multiple of the configured resolution. * In case it isn't, warn the user. @@ -452,7 +452,7 @@ int esp32c3_oneshot_current(struct esp32c3_oneshot_s *oneshot, ESP32C3_TIM_GETCTR(oneshot->tim, usec); - *usec = *usec * (uint64_t)oneshot->resolution; + *usec = *usec * oneshot->resolution; return OK; } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c index 220f4383a3f9b..5a2a8ef406a95 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c @@ -444,8 +444,8 @@ static uint32_t IRAM_ATTR esp32c3_get_power_down_flags(void) static void IRAM_ATTR esp32c3_timer_wakeup_prepare(void) { int64_t ticks; - int64_t sleep_duration = (int64_t)s_config.sleep_duration - - (int64_t) s_config.sleep_time_adjustment; + int64_t sleep_duration = s_config.sleep_duration - + s_config.sleep_time_adjustment; if (sleep_duration < 0) { sleep_duration = 0; diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c index f632e4a5c0020..8c48f8f5a6094 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c @@ -3136,7 +3136,7 @@ int up_rtc_settime(const struct timespec *ts) DEBUGASSERT(ts != NULL && ts->tv_nsec < NSEC_PER_SEC); flags = spin_lock_irqsave(&g_rtc_lock); - now_us = ((uint64_t) ts->tv_sec) * USEC_PER_SEC + + now_us = ts->tv_sec * USEC_PER_SEC + ts->tv_nsec / NSEC_PER_USEC; if (g_rt_timer_enabled == true) { diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c index d16ea6308fee1..eb0a37a925407 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c @@ -453,8 +453,8 @@ int IRAM_ATTR up_timer_start(const struct timespec *ts) up_timer_cancel(NULL); } - cpu_ticks = SEC_2_CTICK((uint64_t)ts->tv_sec) + - NSEC_2_CTICK((uint64_t)ts->tv_nsec); + cpu_ticks = SEC_2_CTICK(ts->tv_sec) + + NSEC_2_CTICK(ts->tv_nsec); up_tmr_setcounter(cpu_ticks); g_timer_started = true; diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c index d5d7939ac1cc1..fde26f800558f 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c @@ -386,7 +386,7 @@ static int esp32c3_timer_settimeout(struct timer_lowerhalf_s *lower, /* Set the timeout */ - ESP32C3_TIM_SETALRVL(priv->tim, (uint64_t)timeout); + ESP32C3_TIM_SETALRVL(priv->tim, timeout); return ret; } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c index 498f4afb188ea..51a6bea4110f8 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c @@ -2926,7 +2926,7 @@ static void wifi_rtc_disable_iso(void) int64_t esp_timer_get_time(void) { - return (int64_t)rt_timer_time_us(); + return rt_timer_time_us(); } /**************************************************************************** diff --git a/arch/risc-v/src/esp32c3/esp_ble_adapter.c b/arch/risc-v/src/esp32c3/esp_ble_adapter.c index 6ebc6dacec5cd..282b41863b1a7 100644 --- a/arch/risc-v/src/esp32c3/esp_ble_adapter.c +++ b/arch/risc-v/src/esp32c3/esp_ble_adapter.c @@ -1585,7 +1585,7 @@ static uint32_t IRAM_ATTR btdm_lpcycles_2_hus(uint32_t cycles, uint64_t local_error_corr; uint64_t res; - local_error_corr = (error_corr == NULL) ? 0 : (uint64_t)(*error_corr); + local_error_corr = (error_corr == NULL) ? 0 : (*error_corr); res = (uint64_t)g_btdm_lpcycle_us * cycles * 2; local_error_corr += res; @@ -2981,7 +2981,7 @@ static void coex_bt_wakeup_request_end(void) static IRAM_ATTR int64_t get_time_us_wrapper(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/risc-v/src/esp32c3/esp_coex_adapter.c b/arch/risc-v/src/esp32c3/esp_coex_adapter.c index 8d7cb537d0485..52c7a19267f0e 100644 --- a/arch/risc-v/src/esp32c3/esp_coex_adapter.c +++ b/arch/risc-v/src/esp32c3/esp_coex_adapter.c @@ -117,7 +117,7 @@ coex_adapter_funcs_t g_coex_adapter_funcs = static IRAM_ATTR int64_t esp_coex_esp_timer_get_time_wrapper(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/risc-v/src/esp32c6/esp_coex_adapter.c b/arch/risc-v/src/esp32c6/esp_coex_adapter.c index a0f9b3d091f2c..49b7693513d75 100644 --- a/arch/risc-v/src/esp32c6/esp_coex_adapter.c +++ b/arch/risc-v/src/esp32c6/esp_coex_adapter.c @@ -114,7 +114,7 @@ coex_adapter_funcs_t g_coex_adapter_funcs = static IRAM_ATTR int64_t esp_coex_esp_timer_get_time_wrapper(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/risc-v/src/litex/litex_tickless.c b/arch/risc-v/src/litex/litex_tickless.c index 48b6c6228f780..23fbd569ea9c0 100644 --- a/arch/risc-v/src/litex/litex_tickless.c +++ b/arch/risc-v/src/litex/litex_tickless.c @@ -302,8 +302,8 @@ int up_timer_start(const struct timespec *ts) litex_timer_cancel(); - cpu_ticks = SEC_2_LITEX_TICK((uint64_t)ts->tv_sec) + - NSEC_2_LITEX_TICK((uint64_t)ts->tv_nsec); + cpu_ticks = SEC_2_LITEX_TICK(ts->tv_sec) + + NSEC_2_LITEX_TICK(ts->tv_nsec); DEBUGASSERT(cpu_ticks <= UINT32_MAX); diff --git a/arch/sparc/src/bm3803/bm3803_freerun.c b/arch/sparc/src/bm3803/bm3803_freerun.c index c020d6b4087d4..aa10a9370ba72 100644 --- a/arch/sparc/src/bm3803/bm3803_freerun.c +++ b/arch/sparc/src/bm3803/bm3803_freerun.c @@ -232,8 +232,8 @@ int bm3803_freerun_counter(struct bm3803_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%u, %lu)\n", - usec, ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%lld, %ld)\n", + usec, ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/sparc/src/bm3803/bm3803_oneshot.c b/arch/sparc/src/bm3803/bm3803_oneshot.c index 956814ff07acd..89b9589c1856f 100644 --- a/arch/sparc/src/bm3803/bm3803_oneshot.c +++ b/arch/sparc/src/bm3803/bm3803_oneshot.c @@ -229,8 +229,8 @@ int bm3803_oneshot_start(struct bm3803_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. @@ -240,7 +240,7 @@ int bm3803_oneshot_start(struct bm3803_oneshot_s *oneshot, * = (usecs * frequency) / USEC_PER_SEC; */ - period = (usec * (uint64_t)oneshot->frequency) / USEC_PER_SEC; + period = (usec * oneshot->frequency) / USEC_PER_SEC; tmrinfo("usec=%llu period=%08llx\n", usec, period); DEBUGASSERT(period <= UINT24_MAX); diff --git a/arch/x86_64/src/intel64/intel64_oneshot.c b/arch/x86_64/src/intel64/intel64_oneshot.c index b5fb3936230bd..d9f3da5b517dc 100644 --- a/arch/x86_64/src/intel64/intel64_oneshot.c +++ b/arch/x86_64/src/intel64/intel64_oneshot.c @@ -315,8 +315,8 @@ int intel64_oneshot_start(struct intel64_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* HPET use free running up-counter and a comparators which generate events * only on a equal event. This can results in event miss if we set too @@ -337,7 +337,7 @@ int intel64_oneshot_start(struct intel64_oneshot_s *oneshot, * = (usecs * frequency) / USEC_PER_SEC; */ - compare = (usec * (uint64_t)oneshot->frequency) / USEC_PER_SEC; + compare = (usec * oneshot->frequency) / USEC_PER_SEC; #ifndef CONFIG_INTEL64_HPET_FSB /* Set up to receive the callback when the interrupt occurs */ diff --git a/arch/x86_64/src/intel64/intel64_perf.c b/arch/x86_64/src/intel64/intel64_perf.c index cd0c281372853..67954bfe9034f 100644 --- a/arch/x86_64/src/intel64/intel64_perf.c +++ b/arch/x86_64/src/intel64/intel64_perf.c @@ -64,7 +64,7 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_x86_64_timer_freq; left = elapsed - ts->tv_sec * g_x86_64_timer_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_x86_64_timer_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_x86_64_timer_freq; } #endif diff --git a/arch/xtensa/src/common/espressif/esp_rtc.c b/arch/xtensa/src/common/espressif/esp_rtc.c index ec27e5a8bbf1e..2683e118f4aa3 100644 --- a/arch/xtensa/src/common/espressif/esp_rtc.c +++ b/arch/xtensa/src/common/espressif/esp_rtc.c @@ -774,7 +774,7 @@ int up_rtc_settime(const struct timespec *ts) flags = spin_lock_irqsave(&g_rtc_lowerhalf.lock); - now_us = ((uint64_t) ts->tv_sec) * USEC_PER_SEC + + now_us = ts->tv_sec * USEC_PER_SEC + ts->tv_nsec / NSEC_PER_USEC; #ifdef CONFIG_RTC_DRIVER diff --git a/arch/xtensa/src/common/xtensa_oneshot.c b/arch/xtensa/src/common/xtensa_oneshot.c index 577314a753857..4ae1a56fafdf7 100644 --- a/arch/xtensa/src/common/xtensa_oneshot.c +++ b/arch/xtensa/src/common/xtensa_oneshot.c @@ -102,8 +102,8 @@ static int xtensa_oneshot_start(struct oneshot_lowerhalf_s *lower_, flags = spin_lock_irqsave(&lower->lock); - count = sec_to_count((uint64_t)ts->tv_sec, lower->freq) + - nsec_to_count((uint64_t)ts->tv_nsec, lower->freq); + count = sec_to_count(ts->tv_sec, lower->freq) + + nsec_to_count(ts->tv_nsec, lower->freq); count = xtensa_getcount() + count; xtensa_setcompare(count); diff --git a/arch/xtensa/src/common/xtensa_perf.c b/arch/xtensa/src/common/xtensa_perf.c index 9898337afd74c..ef48fdb4593da 100644 --- a/arch/xtensa/src/common/xtensa_perf.c +++ b/arch/xtensa/src/common/xtensa_perf.c @@ -63,6 +63,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif diff --git a/arch/xtensa/src/esp32/esp32_i2c.c b/arch/xtensa/src/esp32/esp32_i2c.c index 5be6a0ea0fd77..ee0cf7642639f 100644 --- a/arch/xtensa/src/esp32/esp32_i2c.c +++ b/arch/xtensa/src/esp32/esp32_i2c.c @@ -1279,7 +1279,7 @@ static void esp32_i2c_tracedump(struct esp32_i2c_priv_s *priv) struct esp32_trace_s *trace; int i; - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", (clock_systime_ticks() - priv->start_time)); for (i = 0; i < priv->tndx; i++) @@ -1287,7 +1287,7 @@ static void esp32_i2c_tracedump(struct esp32_i2c_priv_s *priv) trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/xtensa/src/esp32/esp32_oneshot.c b/arch/xtensa/src/esp32/esp32_oneshot.c index 9c2f19e14a7dd..d182188e55b99 100644 --- a/arch/xtensa/src/esp32/esp32_oneshot.c +++ b/arch/xtensa/src/esp32/esp32_oneshot.c @@ -274,8 +274,8 @@ int esp32_oneshot_start(struct esp32_oneshot_s *oneshot, /* Retrieve the duration from timespec in microsecond */ - timeout_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + timeout_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Verify if it is a multiple of the configured resolution. * In case it isn't, warn the user. @@ -443,7 +443,7 @@ int esp32_oneshot_current(struct esp32_oneshot_s *oneshot, uint64_t *usec) ESP32_TIM_GETCTR(oneshot->tim, usec); - *usec = *usec * (uint64_t)oneshot->resolution; + *usec = *usec * oneshot->resolution; return OK; } diff --git a/arch/xtensa/src/esp32/esp32_psram.c b/arch/xtensa/src/esp32/esp32_psram.c index c45b9879cbc88..d334e94880de5 100644 --- a/arch/xtensa/src/esp32/esp32_psram.c +++ b/arch/xtensa/src/esp32/esp32_psram.c @@ -993,7 +993,7 @@ static void psram_read_id(uint64_t *dev_id) psram_cmd_recv_start(spi_num, ps_cmd.rx_data, ps_cmd.rx_data_bit_len / 8, PSRAM_CMD_SPI); psram_cmd_end(spi_num); - *dev_id = (uint64_t)(((uint64_t)psram_id[1] << 32) | psram_id[0]); + *dev_id = (((uint64_t)psram_id[1] << 32) | psram_id[0]); } /* enter QPI mode */ diff --git a/arch/xtensa/src/esp32/esp32_tickless.c b/arch/xtensa/src/esp32/esp32_tickless.c index 3e6a0fa228ec2..68570681a7b90 100644 --- a/arch/xtensa/src/esp32/esp32_tickless.c +++ b/arch/xtensa/src/esp32/esp32_tickless.c @@ -449,8 +449,8 @@ int IRAM_ATTR up_timer_start(const struct timespec *ts) up_timer_cancel(NULL); } - cpu_ticks = SEC_2_CTICK((uint64_t)ts->tv_sec) + - NSEC_2_CTICK((uint64_t)ts->tv_nsec); + cpu_ticks = SEC_2_CTICK(ts->tv_sec) + + NSEC_2_CTICK(ts->tv_nsec); up_tmr_setcount(cpu_ticks); diff --git a/arch/xtensa/src/esp32/esp32_tim_lowerhalf.c b/arch/xtensa/src/esp32/esp32_tim_lowerhalf.c index 6396190a5b94f..522159e665282 100644 --- a/arch/xtensa/src/esp32/esp32_tim_lowerhalf.c +++ b/arch/xtensa/src/esp32/esp32_tim_lowerhalf.c @@ -408,7 +408,7 @@ static int esp32_timer_settimeout(struct timer_lowerhalf_s *lower, /* Set the timeout */ - ESP32_TIM_SETALRVL(priv->tim, (uint64_t)timeout); + ESP32_TIM_SETALRVL(priv->tim, timeout); return ret; } diff --git a/arch/xtensa/src/esp32/esp32_wifi_adapter.c b/arch/xtensa/src/esp32/esp32_wifi_adapter.c index fddae265cc089..6d372ab30070d 100644 --- a/arch/xtensa/src/esp32/esp32_wifi_adapter.c +++ b/arch/xtensa/src/esp32/esp32_wifi_adapter.c @@ -2263,7 +2263,7 @@ static void wifi_rtc_disable_iso(void) int64_t esp32_timer_get_time(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/xtensa/src/esp32s2/esp32s2_i2c.c b/arch/xtensa/src/esp32s2/esp32s2_i2c.c index 2d31ef6eb66bc..1ae4cbdc645a7 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_i2c.c +++ b/arch/xtensa/src/esp32s2/esp32s2_i2c.c @@ -1452,7 +1452,7 @@ static void i2c_traceevent(struct esp32s2_i2c_priv_s *priv, #ifdef CONFIG_I2C_TRACE static void i2c_tracedump(struct esp32s2_i2c_priv_s *priv) { - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", clock_systime_ticks() - priv->start_time); for (int i = 0; i < priv->tndx; i++) @@ -1460,7 +1460,7 @@ static void i2c_tracedump(struct esp32s2_i2c_priv_s *priv) struct esp32s2_trace_s *trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/xtensa/src/esp32s2/esp32s2_oneshot.c b/arch/xtensa/src/esp32s2/esp32s2_oneshot.c index d85e252147cfe..2ee16c5722e4d 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_oneshot.c +++ b/arch/xtensa/src/esp32s2/esp32s2_oneshot.c @@ -288,8 +288,8 @@ int esp32s2_oneshot_start(struct esp32s2_oneshot_s *oneshot, /* Retrieve the duration from timespec in microsecond */ - timeout_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + timeout_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Verify if it is a multiple of the configured resolution. * In case it isn't, warn the user. @@ -459,7 +459,7 @@ int esp32s2_oneshot_current(struct esp32s2_oneshot_s *oneshot, ESP32S2_TIM_GETCTR(oneshot->tim, usec); - *usec = *usec * (uint64_t)oneshot->resolution; + *usec = *usec * oneshot->resolution; return OK; } diff --git a/arch/xtensa/src/esp32s2/esp32s2_tim_lowerhalf.c b/arch/xtensa/src/esp32s2/esp32s2_tim_lowerhalf.c index 06454ddfa8002..ff60dfbdb77ca 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_tim_lowerhalf.c +++ b/arch/xtensa/src/esp32s2/esp32s2_tim_lowerhalf.c @@ -405,7 +405,7 @@ static int esp32s2_timer_settimeout(struct timer_lowerhalf_s *lower, /* Set the timeout */ - ESP32S2_TIM_SETALRVL(priv->tim, (uint64_t)timeout); + ESP32S2_TIM_SETALRVL(priv->tim, timeout); return ret; } diff --git a/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c b/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c index bb8a3deb8aa6b..bd8a24a4cbb01 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c +++ b/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c @@ -2081,7 +2081,7 @@ static void wifi_clock_disable(void) int64_t esp32s2_timer_get_time(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c b/arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c index 9ee9a4af75278..cf91149530d5d 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c +++ b/arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c @@ -1569,7 +1569,7 @@ static uint32_t IRAM_ATTR btdm_lpcycles_2_hus(uint32_t cycles, uint64_t local_error_corr; uint64_t res; - local_error_corr = (error_corr == NULL) ? 0 : (uint64_t)(*error_corr); + local_error_corr = (error_corr == NULL) ? 0 : (*error_corr); res = (uint64_t)g_btdm_lpcycle_us * cycles * 2; local_error_corr += res; @@ -2967,7 +2967,7 @@ static void coex_bt_wakeup_request_end(void) static IRAM_ATTR int64_t get_time_us_wrapper(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/xtensa/src/esp32s3/esp32s3_i2c.c b/arch/xtensa/src/esp32s3/esp32s3_i2c.c index 963d86cf9fe59..6a77aa195af5f 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_i2c.c +++ b/arch/xtensa/src/esp32s3/esp32s3_i2c.c @@ -1484,7 +1484,7 @@ static void i2c_traceevent(struct esp32s3_i2c_priv_s *priv, #ifdef CONFIG_I2C_TRACE static void i2c_tracedump(struct esp32s3_i2c_priv_s *priv) { - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", clock_systime_ticks() - priv->start_time); for (int i = 0; i < priv->tndx; i++) @@ -1492,7 +1492,7 @@ static void i2c_tracedump(struct esp32s3_i2c_priv_s *priv) struct esp32s3_trace_s *trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/xtensa/src/esp32s3/esp32s3_oneshot.c b/arch/xtensa/src/esp32s3/esp32s3_oneshot.c index 7d88841a42e4e..ba45b5e2fdeda 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_oneshot.c +++ b/arch/xtensa/src/esp32s3/esp32s3_oneshot.c @@ -288,8 +288,8 @@ int esp32s3_oneshot_start(struct esp32s3_oneshot_s *oneshot, /* Retrieve the duration from timespec in microsecond */ - timeout_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + timeout_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Verify if it is a multiple of the configured resolution. * In case it isn't, warn the user. @@ -459,7 +459,7 @@ int esp32s3_oneshot_current(struct esp32s3_oneshot_s *oneshot, ESP32S3_TIM_GETCTR(oneshot->tim, usec); - *usec = *usec * (uint64_t)oneshot->resolution; + *usec = *usec * oneshot->resolution; return OK; } diff --git a/arch/xtensa/src/esp32s3/esp32s3_tickless.c b/arch/xtensa/src/esp32s3/esp32s3_tickless.c index aaff1ddeedcaf..d2dffcc9f2b44 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_tickless.c +++ b/arch/xtensa/src/esp32s3/esp32s3_tickless.c @@ -430,8 +430,8 @@ int IRAM_ATTR up_timer_start(const struct timespec *ts) up_timer_cancel(NULL); } - cpu_ticks = SEC_2_CTICK((uint64_t)ts->tv_sec) + - NSEC_2_CTICK((uint64_t)ts->tv_nsec); + cpu_ticks = SEC_2_CTICK(ts->tv_sec) + + NSEC_2_CTICK(ts->tv_nsec); tickless_setcounter(cpu_ticks); g_timer_started = true; diff --git a/arch/xtensa/src/esp32s3/esp32s3_tim_lowerhalf.c b/arch/xtensa/src/esp32s3/esp32s3_tim_lowerhalf.c index 0e2bf34951f9c..5c2ae985870f8 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_tim_lowerhalf.c +++ b/arch/xtensa/src/esp32s3/esp32s3_tim_lowerhalf.c @@ -410,7 +410,7 @@ static int timer_lh_settimeout(struct timer_lowerhalf_s *lower, /* Set the timeout */ - ESP32S3_TIM_SETALRVL(priv->tim, (uint64_t)timeout); + ESP32S3_TIM_SETALRVL(priv->tim, timeout); return ret; } diff --git a/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c b/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c index 3d9d5339b5382..6c615e8e3886d 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c +++ b/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c @@ -2253,7 +2253,7 @@ static void wifi_rtc_disable_iso(void) int64_t esp32s3_timer_get_time(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c index eef34739072ca..7e8cbb06b4561 100644 --- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c +++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c @@ -65,8 +65,8 @@ static void set_mic_boot_time(void) { struct timespec start; clock_systime_timespec(&start); - g_mic_boot_start_time = (uint64_t)start.tv_sec * 1000 + - (uint64_t)start.tv_nsec / 1000000; + g_mic_boot_start_time = start.tv_sec * 1000 + + start.tv_nsec / 1000000; } static void wait_mic_boot_finish(void) @@ -75,9 +75,9 @@ static void wait_mic_boot_finish(void) { struct timespec end; clock_systime_timespec(&end); - uint64_t time = (uint64_t)end.tv_sec * 1000 + - (uint64_t)end.tv_nsec / 1000000 - - g_mic_boot_start_time; + uint64_t time = end.tv_sec * 1000 + + end.tv_nsec / 1000000 - + g_mic_boot_start_time; if (time < CXD56_AUDIO_MIC_BOOT_WAIT) { diff --git a/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/configs/nsh/defconfig b/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/configs/nsh/defconfig index d99e9b33ec3cf..92ce3988974a4 100644 --- a/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/configs/nsh/defconfig +++ b/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/configs/nsh/defconfig @@ -52,7 +52,6 @@ CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_BASE=0x9c090000 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig index adf52de04c5af..7e36119e126dc 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig @@ -113,7 +113,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_SYSTEM_USBMSC=y CONFIG_SYSTEM_USBMSC_DEVMINOR1=0 CONFIG_SYSTEM_USBMSC_DEVMINOR2=1 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig index d81e4268415bf..48d48e15dd555 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig @@ -137,7 +137,6 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig index efe67a92d9a00..78167997634b8 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig @@ -103,7 +103,6 @@ CONFIG_START_MONTH=10 CONFIG_START_YEAR=2013 CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_UART0_RXBUFSIZE=512 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig index caa220773e9b2..e005fea76b46f 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig @@ -39,7 +39,6 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=10 CONFIG_START_YEAR=2013 CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=2048 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index 8fef690d90b9c..95857dd792f35 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig @@ -161,7 +161,6 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TESTING_OSTEST=y CONFIG_UART0_RXBUFSIZE=512 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig index f93d8d15c2207..a7340dd6948c0 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig @@ -106,7 +106,6 @@ CONFIG_START_MONTH=10 CONFIG_START_YEAR=2013 CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index b8be2a142a9da..2de0028368b46 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig @@ -161,7 +161,6 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig index 77b72fd6da3e2..dab36f173a20b 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig @@ -109,7 +109,6 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_SYSTEM_USBMSC=y CONFIG_SYSTEM_USBMSC_DEVMINOR1=0 CONFIG_SYSTEM_USBMSC_DEVMINOR2=1 diff --git a/boards/arm/stm32/b-g474e-dpow1/src/stm32_smps.c b/boards/arm/stm32/b-g474e-dpow1/src/stm32_smps.c index 9d06a98c8b673..b2496a63d859b 100644 --- a/boards/arm/stm32/b-g474e-dpow1/src/stm32_smps.c +++ b/boards/arm/stm32/b-g474e-dpow1/src/stm32_smps.c @@ -466,7 +466,7 @@ static int smps_start(struct smps_dev_s *dev) { pwrerr("ERROR: Can not achieve timc pwm " "freq=%" PRIu32 " if fclk=%" PRIu64 "\n", - (uint32_t)TIMC_PWM_FREQ, (uint64_t)fclk); + (uint32_t)TIMC_PWM_FREQ, fclk); ret = -EINVAL; goto errout; } @@ -483,7 +483,7 @@ static int smps_start(struct smps_dev_s *dev) { pwrerr("ERROR: Can not achieve timd pwm " "freq=%" PRIu32 " if fclk=%" PRIu64 "\n", - (uint32_t)TIMD_PWM_FREQ, (uint64_t)fclk); + (uint32_t)TIMD_PWM_FREQ, fclk); ret = -EINVAL; goto errout; } diff --git a/boards/arm/stm32/nucleo-f302r8/configs/can/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/can/defconfig index aef827a25b355..def904eba3da8 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/can/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/can/defconfig @@ -50,6 +50,5 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART2=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig index 2dacd83148cda..d02669c55029d 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig @@ -92,7 +92,6 @@ CONFIG_STM32_TIM3_PARTIAL_REMAP=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig index 8730ba5bd2919..ce360b21b9464 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig @@ -116,7 +116,6 @@ CONFIG_STM32_USB=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_COMPOSITE=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig index 0b3b3bf0d448b..7fac8d7932b9f 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig @@ -104,7 +104,6 @@ CONFIG_STM32_USART1=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c index a78e0dcd46842..8c42a9c23cba9 100644 --- a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c +++ b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c @@ -447,7 +447,7 @@ static int smps_start(struct smps_dev_s *dev) { pwrerr("ERROR: Can not achieve tima pwm " "freq=%" PRIu32 " if fclk=%" PRIu64 "\n", - (uint32_t)TIMA_PWM_FREQ, (uint64_t)fclk); + (uint32_t)TIMA_PWM_FREQ, fclk); ret = -EINVAL; goto errout; } @@ -464,7 +464,7 @@ static int smps_start(struct smps_dev_s *dev) { pwrerr("ERROR: Can not achieve timb pwm " "freq=%" PRIu32 " if fclk=%" PRIu64 "\n", - (uint32_t)TIMB_PWM_FREQ, (uint64_t)fclk); + (uint32_t)TIMB_PWM_FREQ, fclk); ret = -EINVAL; goto errout; } diff --git a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig index df4e5da38404c..553cc77d00240 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig @@ -47,7 +47,6 @@ CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y CONFIG_STM32_USART2=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 diff --git a/boards/arm64/a527/avaota-a1/configs/nsh/defconfig b/boards/arm64/a527/avaota-a1/configs/nsh/defconfig index 2a3ea4ff43948..bb19b8e8c960f 100644 --- a/boards/arm64/a527/avaota-a1/configs/nsh/defconfig +++ b/boards/arm64/a527/avaota-a1/configs/nsh/defconfig @@ -100,7 +100,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y diff --git a/boards/arm64/a64/pinephone/configs/lcd/defconfig b/boards/arm64/a64/pinephone/configs/lcd/defconfig index b41ef5838d6b4..fe7dcbb5b9ace 100644 --- a/boards/arm64/a64/pinephone/configs/lcd/defconfig +++ b/boards/arm64/a64/pinephone/configs/lcd/defconfig @@ -56,7 +56,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/a64/pinephone/configs/lvgl/defconfig b/boards/arm64/a64/pinephone/configs/lvgl/defconfig index 3b4ea8b478b24..0ef07654d0373 100644 --- a/boards/arm64/a64/pinephone/configs/lvgl/defconfig +++ b/boards/arm64/a64/pinephone/configs/lvgl/defconfig @@ -74,7 +74,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/a64/pinephone/configs/nsh/defconfig b/boards/arm64/a64/pinephone/configs/nsh/defconfig index d0ab13e1872f8..6e0c3e871e643 100644 --- a/boards/arm64/a64/pinephone/configs/nsh/defconfig +++ b/boards/arm64/a64/pinephone/configs/nsh/defconfig @@ -55,7 +55,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/a64/pinephone/configs/sensor/defconfig b/boards/arm64/a64/pinephone/configs/sensor/defconfig index 4f37be269d71f..3f47ffff44789 100644 --- a/boards/arm64/a64/pinephone/configs/sensor/defconfig +++ b/boards/arm64/a64/pinephone/configs/sensor/defconfig @@ -60,7 +60,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/cgol/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/cgol/defconfig index c2541e404d3e1..d035f7ec0dc7e 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/cgol/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/cgol/defconfig @@ -57,7 +57,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 CONFIG_USERLED=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/coremark/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/coremark/defconfig index d8132365166f0..f0a578581d182 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/coremark/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/coremark/defconfig @@ -50,6 +50,5 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y -CONFIG_SYSTEM_TIME64=y CONFIG_USEC_PER_TICK=1000 CONFIG_USERLED=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/fb/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/fb/defconfig index 59751ea74f043..e541de7ba6c67 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/fb/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/fb/defconfig @@ -52,7 +52,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 CONFIG_USERLED=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/lvgl/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/lvgl/defconfig index 15cb9dd21fb0e..e113198d8824d 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/lvgl/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/lvgl/defconfig @@ -61,7 +61,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_USEC_PER_TICK=1000 CONFIG_USERLED=y CONFIG_VIDEO_FB=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/nsh/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/nsh/defconfig index 2be27f4611243..1e204002e9950 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/nsh/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/nsh/defconfig @@ -53,7 +53,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/ostest/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/ostest/defconfig index 3834e257aa3ab..a78275b19add9 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/ostest/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/ostest/defconfig @@ -49,7 +49,6 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_LOOPS=5 CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/sd/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/sd/defconfig index 44e65724129b0..6ae41febc3a10 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/sd/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/sd/defconfig @@ -70,7 +70,6 @@ CONFIG_SYSLOG_INTBUFFER=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SD_STRESS=y diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig index 1b3f233182063..168dc7bf97572 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig @@ -54,7 +54,6 @@ CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_BASE=0x9c090000 diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig index d9c9cc00e0f58..773349ed853ea 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig @@ -54,7 +54,6 @@ CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig index df3fac0fde64d..a8c96f21b0d2d 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig @@ -54,7 +54,6 @@ CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_BASE=0x9c090000 diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig index ca05a63b0735c..033070feb9470 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig @@ -56,7 +56,6 @@ CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh/defconfig index 9e59d24629aed..3a788a27b33e6 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh/defconfig @@ -63,7 +63,6 @@ CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh_smp/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh_smp/defconfig index 116ccd08d7c02..2dcebe9a1b703 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh_smp/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh_smp/defconfig @@ -65,7 +65,6 @@ CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y diff --git a/boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig b/boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig index 7be578bad8a7e..d5107d92e5ad4 100644 --- a/boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig +++ b/boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig @@ -52,7 +52,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_SERIAL_CONSOLE=y diff --git a/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig b/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig index 1334a733c7c1c..75c82169d0e7b 100644 --- a/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig @@ -120,6 +120,5 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig b/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig index fbe97a26410c6..eb90f69198d86 100644 --- a/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig @@ -166,6 +166,5 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TLS_LOG2_MAXSTACK=15 diff --git a/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig b/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig index 4cf697e75f2d9..18a8e405efb94 100644 --- a/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig @@ -171,6 +171,5 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TLS_LOG2_MAXSTACK=15 diff --git a/boards/arm64/imx9/imx93-evk/configs/nsh/defconfig b/boards/arm64/imx9/imx93-evk/configs/nsh/defconfig index e624827cadff1..a7bbeb876d35b 100644 --- a/boards/arm64/imx9/imx93-evk/configs/nsh/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/nsh/defconfig @@ -107,6 +107,5 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SPITOOL=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/imx9/imx93-evk/configs/optee/defconfig b/boards/arm64/imx9/imx93-evk/configs/optee/defconfig index 96033d349a23e..1766363008610 100644 --- a/boards/arm64/imx9/imx93-evk/configs/optee/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/optee/defconfig @@ -105,4 +105,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y diff --git a/boards/arm64/imx9/imx95-a55-evk/configs/emmc/defconfig b/boards/arm64/imx9/imx95-a55-evk/configs/emmc/defconfig index 7dde565cc412d..a519a761de8fc 100644 --- a/boards/arm64/imx9/imx95-a55-evk/configs/emmc/defconfig +++ b/boards/arm64/imx9/imx95-a55-evk/configs/emmc/defconfig @@ -75,6 +75,5 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/imx9/imx95-a55-evk/configs/nsh/defconfig b/boards/arm64/imx9/imx95-a55-evk/configs/nsh/defconfig index 3ee6ff9fa35ab..89c643468cfc8 100644 --- a/boards/arm64/imx9/imx95-a55-evk/configs/nsh/defconfig +++ b/boards/arm64/imx9/imx95-a55-evk/configs/nsh/defconfig @@ -62,6 +62,5 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig index 66c8a52ae9478..0702bcc47494d 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig @@ -56,7 +56,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SETLOGMASK=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_KASAN=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig index 19889d26648e6..213b047905bb2 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig @@ -53,7 +53,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SETLOGMASK=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig index 3b84dbcab3db5..d73d4758121fd 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig @@ -102,7 +102,6 @@ CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_POPEN=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig index f9a11164c19a3..c0f92f0d220f2 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig @@ -69,7 +69,6 @@ CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_FDTDUMP=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/gdbstub/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/gdbstub/defconfig index 93a62e7025c79..c3f725a61af5f 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/gdbstub/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/gdbstub/defconfig @@ -69,7 +69,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_GPROF=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/knsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/knsh/defconfig index 20f9f27d3fd89..a4eb364ffaf57 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/knsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/knsh/defconfig @@ -96,7 +96,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/mte/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/mte/defconfig index f44759c8ea678..1b7ef28de0fd8 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/mte/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/mte/defconfig @@ -65,7 +65,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_GPROF=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig index 34e9281a5155f..1f075e6fed4bc 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig @@ -106,7 +106,6 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig index 7f687ee47d376..7e6243f10651e 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig @@ -97,7 +97,6 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig index 7ed8642c99ac8..f914b4df73520 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig @@ -96,7 +96,6 @@ CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig index 755ebe35b3e97..bc97cc7b674a7 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig @@ -97,7 +97,6 @@ CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig index 9a11093c1e97f..c0c4cf8069bf3 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig @@ -65,7 +65,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_GPROF=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_fiq/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_fiq/defconfig index 8ba76bdfa43f3..dc310319e48ba 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_fiq/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_fiq/defconfig @@ -60,7 +60,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig index a5ae5397910f9..3f491cd8e9e03 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig @@ -55,7 +55,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig index 813e8aa0e4fa3..307125d9648ff 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig @@ -71,7 +71,6 @@ CONFIG_SYSTEM_GCOV=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig index 2bf39e46812a0..1da7968ef3424 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig @@ -53,7 +53,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig index 3189faed2ff9a..304beb7e1b304 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig @@ -110,7 +110,6 @@ CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_CUTERM=y CONFIG_SYSTEM_DUMPSTACK=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_UART1_BASE=0x9000000 CONFIG_UART1_IRQ=33 CONFIG_UART1_PL011=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/rpserver/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/rpserver/defconfig index 2516372d31ef0..c44322e4f39f6 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/rpserver/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/rpserver/defconfig @@ -111,7 +111,6 @@ CONFIG_SYSTEM_CUTERM=y CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE="/dev/ttyproxy" CONFIG_SYSTEM_DUMPSTACK=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_UART1_BASE=0x9000000 CONFIG_UART1_IRQ=33 CONFIG_UART1_PL011=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/sotest/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/sotest/defconfig index 48c18d5210b0b..400009d93baf6 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/sotest/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/sotest/defconfig @@ -68,7 +68,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/sw_tags/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/sw_tags/defconfig index 984fb0fc8643c..b1278a6541fa5 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/sw_tags/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/sw_tags/defconfig @@ -62,7 +62,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_KASAN=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/xedge_demo/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/xedge_demo/defconfig index 68c4633b1d4eb..95be379c162d4 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/xedge_demo/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/xedge_demo/defconfig @@ -106,7 +106,6 @@ CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/rk3399/nanopi_m4/configs/nsh/defconfig b/boards/arm64/rk3399/nanopi_m4/configs/nsh/defconfig index fcbb75e1dc8c9..cd9d6e9a5af37 100644 --- a/boards/arm64/rk3399/nanopi_m4/configs/nsh/defconfig +++ b/boards/arm64/rk3399/nanopi_m4/configs/nsh/defconfig @@ -59,7 +59,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART2_BAUD=1500000 diff --git a/boards/arm64/rk3399/pinephonepro/configs/nsh/defconfig b/boards/arm64/rk3399/pinephonepro/configs/nsh/defconfig index c490398a7c828..c71dd3e0b8ac6 100644 --- a/boards/arm64/rk3399/pinephonepro/configs/nsh/defconfig +++ b/boards/arm64/rk3399/pinephonepro/configs/nsh/defconfig @@ -58,7 +58,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig b/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig index 1d054bd056110..a4e15d4ddcd4d 100644 --- a/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig +++ b/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig @@ -65,7 +65,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/netjtag/defconfig b/boards/arm64/zynq-mpsoc/zcu111/configs/netjtag/defconfig index fd7389d5e6601..6509b22d8ce69 100644 --- a/boards/arm64/zynq-mpsoc/zcu111/configs/netjtag/defconfig +++ b/boards/arm64/zynq-mpsoc/zcu111/configs/netjtag/defconfig @@ -97,7 +97,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/netnsh/defconfig b/boards/arm64/zynq-mpsoc/zcu111/configs/netnsh/defconfig index d4f3b29970ba1..fc05df39186b5 100644 --- a/boards/arm64/zynq-mpsoc/zcu111/configs/netnsh/defconfig +++ b/boards/arm64/zynq-mpsoc/zcu111/configs/netnsh/defconfig @@ -91,7 +91,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig b/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig index 7a387d34159f5..176f15698e110 100644 --- a/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig +++ b/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig @@ -64,7 +64,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig b/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig index 800ff3aa6a749..9e5caac9e0d08 100644 --- a/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig +++ b/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig @@ -59,7 +59,6 @@ CONFIG_START_DAY=7 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/litex/arty_a7/configs/knsh-tickless/defconfig b/boards/risc-v/litex/arty_a7/configs/knsh-tickless/defconfig index 8f734427482dd..c45bab704f5c7 100644 --- a/boards/risc-v/litex/arty_a7/configs/knsh-tickless/defconfig +++ b/boards/risc-v/litex/arty_a7/configs/knsh-tickless/defconfig @@ -81,7 +81,6 @@ CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_CLE=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig index eb81a2f9a9e51..83a0ad53bfe5d 100644 --- a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig @@ -114,7 +114,6 @@ CONFIG_SYSTEM_COLOR_CLE=y CONFIG_SYSTEM_MDIO=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig index 60de58df5f367..069db7380ac0d 100644 --- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig @@ -98,7 +98,6 @@ CONFIG_START_YEAR=2021 CONFIG_SYSTEM_CLE_CMD_HISTORY=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_CXXTEST=y CONFIG_TLS_NELEM=4 CONFIG_UART1_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig index ef1553cbbc63b..2be999dccb573 100644 --- a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig @@ -62,7 +62,6 @@ CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_CLE_CMD_HISTORY=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig index 37ab62086e7b4..4157f76c3778e 100644 --- a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig @@ -60,6 +60,5 @@ CONFIG_STACK_COLORATION=y CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig b/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig index b05818d418447..0547f894477d3 100644 --- a/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig @@ -69,7 +69,6 @@ CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_CLE_CMD_HISTORY=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig index e5ad790b50199..48abe3e9ea777 100644 --- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig @@ -92,6 +92,5 @@ CONFIG_STACK_COLORATION=y CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART1_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig index 012d84a04c54c..1d85850a7678c 100644 --- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig @@ -91,6 +91,5 @@ CONFIG_STACK_COLORATION=y CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART2_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig index a30310550d082..5f82b5ca4662c 100644 --- a/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig @@ -69,6 +69,5 @@ CONFIG_STACK_COLORATION=y CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig index 01f66baea01a2..c395a2758b623 100644 --- a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig @@ -63,7 +63,6 @@ CONFIG_SYSLOG_COLOR_OUTPUT=y CONFIG_SYSTEM_CLE_CMD_HISTORY=y CONFIG_SYSTEM_COLOR_CLE=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig index 2117caf6d915e..90c9cb6b48269 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig @@ -79,7 +79,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_POPEN=y CONFIG_SYSTEM_POPEN_STACKSIZE=3072 CONFIG_SYSTEM_SETLOGMASK=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_HEAP=y CONFIG_TESTING_OSTEST=y diff --git a/boards/sim/sim/sim/configs/matter/defconfig b/boards/sim/sim/sim/configs/matter/defconfig index 6af80c8d20958..5d41be8ff1a08 100644 --- a/boards/sim/sim/sim/configs/matter/defconfig +++ b/boards/sim/sim/sim/configs/matter/defconfig @@ -118,7 +118,6 @@ CONFIG_SYSTEM_PING6=y CONFIG_SYSTEM_PING6_STACKSIZE=4096 CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_PING_STACKSIZE=4096 -CONFIG_SYSTEM_TIME64=y CONFIG_TLS_NELEM=4 CONFIG_TLS_TASK_NELEM=4 CONFIG_UART_BTH4=y diff --git a/boards/sim/sim/sim/configs/ostest/defconfig b/boards/sim/sim/sim/configs/ostest/defconfig index 039e387bda1a8..823979e2aed56 100644 --- a/boards/sim/sim/sim/configs/ostest/defconfig +++ b/boards/sim/sim/sim/configs/ostest/defconfig @@ -34,7 +34,6 @@ CONFIG_SIM_WALLTIME_SIGNAL=y CONFIG_START_DAY=27 CONFIG_START_MONTH=2 CONFIG_START_YEAR=2007 -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_LOOPS=5 CONFIG_TESTING_OSTEST_POWEROFF=y diff --git a/boards/sim/sim/sim/configs/rtptools/defconfig b/boards/sim/sim/sim/configs/rtptools/defconfig index 12e71d8a88bd2..4e73f76b9881c 100644 --- a/boards/sim/sim/sim/configs/rtptools/defconfig +++ b/boards/sim/sim/sim/configs/rtptools/defconfig @@ -103,7 +103,6 @@ CONFIG_SYSTEM_PING6=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TELNET_CLIENT=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=32 CONFIG_TELNET_TXBUFFER_SIZE=64 CONFIG_TLS_NCLEANUP=2 diff --git a/boards/sim/sim/sim/configs/tcpblaster/defconfig b/boards/sim/sim/sim/configs/tcpblaster/defconfig index 0308a5e9deebd..b21851917af0a 100644 --- a/boards/sim/sim/sim/configs/tcpblaster/defconfig +++ b/boards/sim/sim/sim/configs/tcpblaster/defconfig @@ -102,7 +102,6 @@ CONFIG_SYSTEM_PING6=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TELNET_CLIENT=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=32 CONFIG_TELNET_TXBUFFER_SIZE=64 CONFIG_TLS_NCLEANUP=2 diff --git a/boards/sim/sim/sim/configs/windows/defconfig b/boards/sim/sim/sim/configs/windows/defconfig index f734204fbec51..43dedf3e25e70 100644 --- a/boards/sim/sim/sim/configs/windows/defconfig +++ b/boards/sim/sim/sim/configs/windows/defconfig @@ -62,5 +62,4 @@ CONFIG_SIM_HOSTFS=y CONFIG_SIM_STACKSIZE_ADJUSTMENT=10240 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y diff --git a/boards/sim/sim/sim/configs/windows64/defconfig b/boards/sim/sim/sim/configs/windows64/defconfig index 26a7968ad2847..f4bfe5a1b6500 100644 --- a/boards/sim/sim/sim/configs/windows64/defconfig +++ b/boards/sim/sim/sim/configs/windows64/defconfig @@ -61,5 +61,4 @@ CONFIG_SIM_HOSTFS=y CONFIG_SIM_STACKSIZE_ADJUSTMENT=10240 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig b/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig index 45dae69b73fb7..fe5e74cabecf5 100644 --- a/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig +++ b/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig @@ -55,4 +55,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_SCHED_EVENTS=y CONFIG_HRTIMER=y -CONFIG_SYSTEM_TIME64=y \ No newline at end of file diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig b/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig index 06a255ac82fbc..bc98db1f0cc7c 100644 --- a/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig +++ b/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig @@ -55,4 +55,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_SCHED_EVENTS=y -CONFIG_SYSTEM_TIME64=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig index c0aa44d8e4581..1ce0f942b373d 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig @@ -57,5 +57,4 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_CLE=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig index 7d0635ec26eda..d83a14e4564d1 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig @@ -65,7 +65,6 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig index 8304a6b9eb865..9529e78e60b25 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig @@ -140,7 +140,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NXMBCLIENT=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_TCPDUMP=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_TESTING_SMP=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs/defconfig index b9c40fb6080d7..ffa2d9cc29fa4 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs/defconfig @@ -80,7 +80,6 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs_pci/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs_pci/defconfig index 3b9793d9fcbea..99dec6f481372 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs_pci/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs_pci/defconfig @@ -85,7 +85,6 @@ CONFIG_START_YEAR=2011 CONFIG_SYSLOG_DEVPATH="/dev/S1" CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig index b63e95cf7bba3..14f4331fa3bdb 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig @@ -62,7 +62,6 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig index dea7aa3295f6e..770fa588fbd37 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig @@ -56,7 +56,6 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig index b212905677e55..2afbc73360bdc 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig @@ -59,5 +59,4 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSLOG_DEVPATH="/dev/S1" CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig index c9cabb9144ea5..12db1a147a302 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig @@ -63,7 +63,6 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSLOG_DEVPATH="/dev/S1" CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_TESTING_SMP=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/ostest/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/ostest/defconfig index 0bc21e0db044b..71da13062aa7d 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/ostest/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/ostest/defconfig @@ -48,7 +48,6 @@ CONFIG_SIG_DEFAULT=y CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig index be1838f78a641..85404bfaadce6 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig @@ -110,7 +110,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_SYSTEM_STACKSIZE=4096 -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TIMER=y CONFIG_TIMER_FD=y diff --git a/drivers/audio/audio_fake.c b/drivers/audio/audio_fake.c index 628093820d819..dd8ad907bfe2a 100644 --- a/drivers/audio/audio_fake.c +++ b/drivers/audio/audio_fake.c @@ -422,8 +422,8 @@ static int audio_fake_process_buffer(FAR struct audio_lowerhalf_s *dev, frame_time = ((int64_t)apb->nbytes * 1000 * 1000) / priv->scaler; - diff_time = (int64_t)tv2.tv_sec * 1000000 + tv2.tv_usec - - ((int64_t)tv1.tv_sec * 1000000 + tv1.tv_usec); + diff_time = tv2.tv_sec * 1000000 + tv2.tv_usec - + (tv1.tv_sec * 1000000 + tv1.tv_usec); if (diff_time >= frame_time) { diff --git a/drivers/note/noteram_driver.c b/drivers/note/noteram_driver.c index e9d6a43c5fcb4..e64a48e6d472d 100644 --- a/drivers/note/noteram_driver.c +++ b/drivers/note/noteram_driver.c @@ -817,9 +817,9 @@ static int noteram_dump_header(FAR struct lib_outstream_s *s, int cpu = 0; #endif - ret = lib_sprintf(s, "%8s-%-3u [%d] %3" PRIu64 ".%09lu: ", + ret = lib_sprintf(s, "%8s-%-3u [%d] %3" PRIu64 ".%09ld: ", note_get_taskname(pid, buf, TASK_NAME_SIZE), - get_pid(pid), cpu, (uint64_t)ts.tv_sec, ts.tv_nsec); + get_pid(pid), cpu, ts.tv_sec, ts.tv_nsec); return ret; } diff --git a/drivers/note/notesnap_driver.c b/drivers/note/notesnap_driver.c index 441992fa152fc..47762ef0e45d2 100644 --- a/drivers/note/notesnap_driver.c +++ b/drivers/note/notesnap_driver.c @@ -398,13 +398,13 @@ void notesnap_dump_with_stream(FAR struct lib_outstream_s *stream) perf_convert(note->count, &time); lib_sprintf(stream, - "snapshoot: [%" PRIu64 ".%09u] " + "snapshoot: [%" PRIu64 ".%09ld] " #ifdef CONFIG_SMP "[CPU%d] " #endif "[%d] %-16s %#" PRIxPTR "\n", - (uint64_t)time.tv_sec, - (unsigned)time.tv_nsec, + time.tv_sec, + time.tv_nsec, #ifdef CONFIG_SMP note->cpu, #endif diff --git a/drivers/power/pm/pm_procfs.c b/drivers/power/pm/pm_procfs.c index 7487f0587e1a2..36b5f1095e81b 100644 --- a/drivers/power/pm/pm_procfs.c +++ b/drivers/power/pm/pm_procfs.c @@ -50,19 +50,11 @@ #define PFHDR "CALLBACKS IDLE STANDBY SLEEP\n" #define WAHDR "DOMAIN%-2d STATE COUNT TIME\n" -#ifdef CONFIG_SYSTEM_TIME64 -# define STFMT "%-18s %8" PRIu64 "s %3" PRIu64 "%% %8" PRIu64 "s %3" \ - PRIu64 "%% %8" PRIu64 "s %3" PRIu64 "%%\n" -# define PFFMT "%-18p %8" PRIu64 "s %3" PRIu64 "%% %8" PRIu64 "s %3" \ - PRIu64 "%% %8" PRIu64 "s %3" PRIu64 "%%\n" -# define WAFMT "%-25s %-14s %-14" PRIu32 " %" PRIu64 "s\n" -#else -# define STFMT "%-18s %8" PRIu32 "s %3" PRIu32 "%% %8" PRIu32 "s %3" \ - PRIu32 "%% %8" PRIu32 "s %3" PRIu32 "%%\n" -# define PFFMT "%-18p %8" PRIu32 "s %3" PRIu32 "%% %8" PRIu32 "s %3" \ - PRIu32 "%% %8" PRIu32 "s %3" PRIu32 "%%\n" -# define WAFMT "%-25s %-14s %-14" PRIu32 " %" PRIu32 "s\n" -#endif +#define STFMT "%-18s %8" PRIu64 "s %3" PRIu64 "%% %8" PRIu64 "s %3" \ + PRIu64 "%% %8" PRIu64 "s %3" PRIu64 "%%\n" +#define PFFMT "%-18p %8" PRIu64 "s %3" PRIu64 "%% %8" PRIu64 "s %3" \ + PRIu64 "%% %8" PRIu64 "s %3" PRIu64 "%%\n" +#define WAFMT "%-25s %-14s %-14" PRIu32 " %" PRIu64 "s\n" /* Determines the size of an intermediate buffer that must be large enough * to handle the longest line generated by this logic (plus a couple of diff --git a/drivers/rpmsg/rpmsg_ping.c b/drivers/rpmsg/rpmsg_ping.c index 8e315ee89a1be..e837e8bf94d81 100644 --- a/drivers/rpmsg/rpmsg_ping.c +++ b/drivers/rpmsg/rpmsg_ping.c @@ -189,11 +189,7 @@ static void rpmsg_ping_logout(FAR const char *s, clock_t value) perf_convert(value, &ts); -#ifdef CONFIG_SYSTEM_TIME64 syslog(LOG_EMERG, "%s: %" PRIu64 " s, %ld ns\n", s, ts.tv_sec, ts.tv_nsec); -#else - syslog(LOG_EMERG, "%s: %" PRIu32 " s, %ld ns\n", s, ts.tv_sec, ts.tv_nsec); -#endif } static void rpmsg_ping_logout_rate(uint64_t len, clock_t avg) diff --git a/drivers/timers/arch_timer.c b/drivers/timers/arch_timer.c index be343dc154cd4..c3cf4f83d060d 100644 --- a/drivers/timers/arch_timer.c +++ b/drivers/timers/arch_timer.c @@ -114,7 +114,7 @@ static uint64_t current_usec(void) } while (timebase != g_timer.timebase); - return TICK2USEC((uint64_t)timebase) + + return TICK2USEC(timebase) + (status.timeout - status.timeleft); } diff --git a/fs/procfs/fs_procfscritmon.c b/fs/procfs/fs_procfscritmon.c index ba743bc1104f4..e2681b48f38e0 100644 --- a/fs/procfs/fs_procfscritmon.c +++ b/fs/procfs/fs_procfscritmon.c @@ -330,7 +330,7 @@ static ssize_t critmon_read_cpu(FAR struct critmon_file_s *attr, } elapsed = clock() * CONFIG_USEC_PER_TICK; - rate = (uint64_t)(all_time.tv_sec * 1000000 + all_time.tv_nsec / 1000) * + rate = (all_time.tv_sec * 1000000 + all_time.tv_nsec / 1000) * 1000000 / elapsed; /* Generate output for all busywait time to enter csection(get spinlock) */ diff --git a/fs/procfs/fs_procfsuptime.c b/fs/procfs/fs_procfsuptime.c index 99b866e2f7175..248c8dedb9d6b 100644 --- a/fs/procfs/fs_procfsuptime.c +++ b/fs/procfs/fs_procfsuptime.c @@ -195,11 +195,7 @@ static ssize_t uptime_read(FAR struct file *filep, FAR char *buffer, #if defined(CONFIG_HAVE_DOUBLE) && defined(CONFIG_LIBC_FLOATINGPOINT) double now; #else -# if defined(CONFIG_SYSTEM_TIME64) uint64_t sec; -# else - uint32_t sec; -# endif unsigned int remainder; unsigned int csec; #endif @@ -250,13 +246,8 @@ static ssize_t uptime_read(FAR struct file *filep, FAR char *buffer, /* Convert the seconds + hundredths of seconds to a string */ -#ifdef CONFIG_SYSTEM_TIME64 linesize = procfs_snprintf(attr->line, UPTIME_LINELEN, "%7" PRIu64 ".%02u\n", sec, csec); -#else - linesize = procfs_snprintf(attr->line, UPTIME_LINELEN, - "%7" PRIu32 ".%02u\n", sec, csec); -#endif #endif /* Save the linesize in case we are re-entered with f_pos > 0 */ diff --git a/include/inttypes.h b/include/inttypes.h index b0dedee7f5e12..6111de0f8fabf 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -338,36 +338,6 @@ #define SCNxOFF SCNx32 #endif -/* time_t */ - -#ifdef CONFIG_SYSTEM_TIME64 -#define PRIdTM PRId64 -#define PRIiTM PRIi64 -#define PRIoTM PRIo64 -#define PRIuTM PRIu64 -#define PRIxTM PRIx64 -#define PRIXTM PRIX64 - -#define SCNdTM SCNd64 -#define SCNiTM SCNi64 -#define SCNoTM SCNo64 -#define SCNuTM SCNu64 -#define SCNxTM SCNx64 -#else -#define PRIdTM PRId32 -#define PRIiTM PRIi32 -#define PRIoTM PRIo32 -#define PRIuTM PRIu32 -#define PRIxTM PRIx32 -#define PRIXTM PRIX32 - -#define SCNdTM SCNd32 -#define SCNiTM SCNi32 -#define SCNoTM SCNo32 -#define SCNuTM SCNu32 -#define SCNxTM SCNx32 -#endif - /**************************************************************************** * Type Definitions ****************************************************************************/ diff --git a/include/limits.h b/include/limits.h index 4cf2644161443..df58833c20a11 100644 --- a/include/limits.h +++ b/include/limits.h @@ -236,11 +236,7 @@ #define TIMER_MAX _POSIX_TIMER_MAX #define CLOCKRES_MIN _POSIX_CLOCKRES_MIN -#ifdef CONFIG_SYSTEM_TIME64 -# define CLOCK_MAX UINT64_MAX -#else -# define CLOCK_MAX UINT32_MAX -#endif +#define CLOCK_MAX UINT64_MAX /* Other invariant values */ diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h index 3485e5568cb80..f55b341ca6072 100644 --- a/include/nuttx/clock.h +++ b/include/nuttx/clock.h @@ -225,8 +225,7 @@ #define NSEC2MSEC(nsec) div_const(nsec, (uint32_t)NSEC_PER_MSEC) -#if defined(CONFIG_DEBUG_SCHED) && defined(CONFIG_SYSTEM_TIME64) && \ - !defined(CONFIG_SCHED_TICKLESS) +#if defined(CONFIG_DEBUG_SCHED) && !defined(CONFIG_SCHED_TICKLESS) /* Initial system timer ticks value close to maximum 32-bit value, to test * 64-bit system-timer after going over 32-bit value. This is to make errors * of casting 64-bit system-timer to 32-bit variables more visible. @@ -307,11 +306,7 @@ struct cpuload_s * should be used only within the OS proper and not by portable applications. */ -#ifdef CONFIG_SYSTEM_TIME64 typedef int64_t sclock_t; -#else -typedef int32_t sclock_t; -#endif /**************************************************************************** * Public Data diff --git a/include/nuttx/fs/hostfs.h b/include/nuttx/fs/hostfs.h index fbf1e8bca180c..fba49f3efbfbd 100644 --- a/include/nuttx/fs/hostfs.h +++ b/include/nuttx/fs/hostfs.h @@ -136,11 +136,7 @@ typedef int nuttx_fsid_t[2]; /* These must match the definition in include/time.h */ -# ifdef CONFIG_SYSTEM_TIME64 typedef uint64_t nuttx_time_t; -# else -typedef uint32_t nuttx_time_t; -# endif struct nuttx_timespec { diff --git a/include/sys/types.h b/include/sys/types.h index 51b190ae322dd..93a62d167ed1e 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -251,13 +251,8 @@ typedef uint16_t sa_family_t; * unsigned type is used to support the full range of the internal clock. */ -#ifdef CONFIG_SYSTEM_TIME64 typedef uint64_t clock_t; typedef uint64_t time_t; /* Holds time in seconds */ -#else -typedef uint32_t clock_t; -typedef uint32_t time_t; /* Holds time in seconds */ -#endif typedef int clockid_t; /* Identifies one time base source */ typedef FAR void *timer_t; /* Represents one POSIX timer */ diff --git a/libs/libc/wqueue/work_usrthread.c b/libs/libc/wqueue/work_usrthread.c index 80748b23482a4..f4a3663ab1049 100644 --- a/libs/libc/wqueue/work_usrthread.c +++ b/libs/libc/wqueue/work_usrthread.c @@ -45,11 +45,7 @@ * Pre-processor Definitions ****************************************************************************/ -#ifdef CONFIG_SYSTEM_TIME64 -# define WORK_DELAY_MAX UINT64_MAX -#else -# define WORK_DELAY_MAX UINT32_MAX -#endif +#define WORK_DELAY_MAX UINT64_MAX /**************************************************************************** * Private Types diff --git a/sched/Kconfig b/sched/Kconfig index 8f07859d397a2..a2c6fbff12f9c 100644 --- a/sched/Kconfig +++ b/sched/Kconfig @@ -167,20 +167,6 @@ config SYSTEMTICK_HOOK endif # !SCHED_TICKLESS -config SYSTEM_TIME64 - bool "64-bit system clock" - default n - ---help--- - The system timer is incremented at the rate determined by - USEC_PER_TICK, typically at 100Hz. The count at any given time is - then the "uptime" in units of system timer ticks. By default, the - system time is 32-bits wide. Those defaults provide a range of about - 497 days which is probably a sufficient range for "uptime". - - However, if the system timer rate is significantly higher than 100Hz - and/or if a very long "uptime" is required, then this option can be - selected to support a 64-bit wide timer. - config ARCH_HAVE_ADJTIME bool default n @@ -272,7 +258,7 @@ config PREALLOC_TIMERS config PERF_OVERFLOW_CORRECTION bool "Compensate perf count overflow" - depends on SYSTEM_TIME64 && (ALARM_ARCH || TIMER_ARCH || ARCH_PERF_EVENTS) + depends on ALARM_ARCH || TIMER_ARCH || ARCH_PERF_EVENTS default n ---help--- If this option is enabled, then the perf event will be enabled @@ -2088,7 +2074,6 @@ config CUSTOM_SEMAPHORE_MAXVALUE config HRTIMER bool "High resolution timer support" - depends on SYSTEM_TIME64 default n ---help--- Enable to support high resolution timer From 9516674b5d61fb5c28a9c7dedcec008144a27176 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 3 May 2026 16:48:08 +0800 Subject: [PATCH 5/8] !sys/types.h: change time_t and clock_t to int64_t to align with other OSes POSIX leaves the signedness of time_t and clock_t unspecified, but mainstream implementations (Linux glibc/musl, the BSDs, macOS, RTEMS, Zephyr's POSIX layer, Windows _time64) expose time_t as signed 64-bit. NuttX has historically used uint64_t only because it was tied to the CONFIG_SYSTEM_TIME64 knob; with that gone, switch: time_t : uint64_t -> int64_t clock_t : uint64_t -> int64_t CLOCK_MAX: UINT64_MAX -> INT64_MAX This lets (time_t)-1 sentinels, negative tick deltas, and host-side headers behave as on every other POSIX system without source churn. Headers updated: - include/sys/types.h, include/limits.h, include/nuttx/clock.h - include/nuttx/fs/hostfs.h (nuttx_time_t alias) - include/nuttx/{mqueue.h,wdog.h,wqueue.h,timers/clkcnt.h} Because clock_t is now signed 64-bit, the NuttX-internal sclock_t alias becomes redundant: every sclock_t/SCLOCK_MAX use is folded back to clock_t/CLOCK_MAX (notably in sched/wdog, sched/mqueue, sched/sched, sched/clock, sched/timer, libs/libc/time, fs/vfs and the drivers/arch consumers below). Tick/period constants (NSEC_PER_SEC, USEC_PER_SEC, MSEC_PER_SEC, SEC_PER_MIN, ...) in include/nuttx/clock.h are retyped from "long" literals to INT64_C(...) so that 64-bit arithmetic no longer depends on the host's long width. Strip now-redundant (time_t)/(clock_t)/(unsigned long) casts and unsigned-only branches across the tree: - arch RTC / oneshot / tickless lowerhalfs: arm: cxd56xx, efm32, imxrt, lc823450, max326xx, sam34, sama5, samd5e5, samv7, stm32, stm32f7, stm32h7, stm32l4, stm32wb, xmc4 mips: pic32mz sparc: bm3803 x86_64: intel64 risc-v/xtensa: espressif (esp_i2c[_slave], esp_rtc, esp32c3{_i2c,_rtc,_wifi_adapter}, esp32{,s2,s3}_*), mpfs_perf - drivers: audio/tone, input/aw86225, power/pm/{activity, stability}_governor, rpmsg/rpmsg_ping, timers/{ds3231,mcp794xx,pcf85263,rx8010}, wireless/ieee80211/bcm43xxx, wireless/spirit/spirit_spi - core: fs/vfs/{fs_poll,fs_timerfd}, mm/iob/iob_alloc, libs/libc/{netdb/lib_dnscache,time/{lib_calendar2utc, lib_time}}, net/icmp/icmp_pmtu, net/icmpv6/icmpv6_pmtu, net/ipfrag, net/tcp/{tcp.h,tcp_timer}, net/utils/net_snoop, net/mld/mld_query (drop the now-dead mld_mrc2mrd helper since signed math handles it directly), sched/clock/{clock,clock_initialize}, sched/sched/{sched_profil,sched_setparam,sched_setscheduler}, sched/pthread/pthread_create, sched/wdog/{wd_gettime,wd_start,wdog.h}, sched/timer/timer_gettime, sched/mqueue/* Flip the few in-tree printf format strings that assumed an unsigned 64-bit tv_sec: * drivers/rpmsg/rpmsg_ping.c PRIu64 -> PRId64 * arch/xtensa/src/esp32{,s2,s3}/esp32*_oneshot_lowerhalf.c PRIu32 (already wrong) -> PRId64 Signed-off-by: Xiang Xiao --- arch/arm/src/cxd56xx/cxd56_rtc.c | 2 +- arch/arm/src/efm32/efm32_rtc_burtc.c | 2 +- arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c | 2 +- arch/arm/src/lc823450/lc823450_rtc.c | 2 +- arch/arm/src/lc823450/lc823450_timer.c | 4 +- .../max326xx/common/max326_rtc_lowerhalf.c | 2 +- arch/arm/src/sam34/sam4cm_oneshot.c | 4 +- arch/arm/src/sam34/sam4cm_oneshot_lowerhalf.c | 4 +- arch/arm/src/sama5/sam_oneshot.c | 4 +- arch/arm/src/sama5/sam_oneshot_lowerhalf.c | 4 +- arch/arm/src/samd5e5/sam_oneshot.c | 4 +- arch/arm/src/samd5e5/sam_oneshot_lowerhalf.c | 4 +- arch/arm/src/samv7/sam_oneshot.c | 4 +- arch/arm/src/samv7/sam_oneshot_lowerhalf.c | 4 +- arch/arm/src/stm32/stm32_oneshot.c | 4 +- arch/arm/src/stm32/stm32_oneshot_lowerhalf.c | 4 +- arch/arm/src/stm32/stm32_tickless.c | 6 +- arch/arm/src/stm32f7/stm32_tickless.c | 6 +- .../arm/src/stm32h7/stm32_oneshot_lowerhalf.c | 4 +- arch/arm/src/stm32h7/stm32_tickless.c | 6 +- arch/arm/src/stm32l4/stm32l4_oneshot.c | 4 +- .../src/stm32l4/stm32l4_oneshot_lowerhalf.c | 4 +- arch/arm/src/stm32wb/stm32wb_oneshot.c | 4 +- .../src/stm32wb/stm32wb_oneshot_lowerhalf.c | 4 +- arch/arm/src/stm32wb/stm32wb_tickless.c | 6 +- arch/arm/src/xmc4/xmc4_tickless.c | 4 +- .../src/avrdx/avrdx_timerisr_tickless_alarm.c | 2 +- arch/mips/src/pic32mz/pic32mz_oneshot.c | 4 +- .../src/pic32mz/pic32mz_oneshot_lowerhalf.c | 4 +- arch/risc-v/src/common/espressif/esp_i2c.c | 2 +- .../src/common/espressif/esp_i2c_slave.c | 2 +- arch/risc-v/src/common/espressif/esp_rtc.c | 2 +- arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c | 2 +- arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c | 2 +- .../src/esp32c3-legacy/esp32c3_wifi_adapter.c | 4 +- arch/risc-v/src/mpfs/mpfs_perf.c | 2 +- arch/sparc/src/bm3803/bm3803_oneshot.c | 4 +- .../src/bm3803/bm3803_oneshot_lowerhalf.c | 4 +- arch/x86_64/src/intel64/intel64_oneshot.c | 4 +- .../src/common/espressif/esp_i2c_slave.c | 2 +- arch/xtensa/src/common/espressif/esp_rtc.c | 2 +- .../src/esp32/esp32_oneshot_lowerhalf.c | 2 +- arch/xtensa/src/esp32/esp32_wifi_adapter.c | 4 +- .../src/esp32s2/esp32s2_oneshot_lowerhalf.c | 2 +- .../xtensa/src/esp32s2/esp32s2_wifi_adapter.c | 4 +- .../src/esp32s3/esp32s3_oneshot_lowerhalf.c | 2 +- .../xtensa/src/esp32s3/esp32s3_wifi_adapter.c | 4 +- drivers/audio/tone.c | 16 ++-- drivers/input/aw86225.c | 2 +- drivers/power/pm/activity_governor.c | 8 +- drivers/power/pm/stability_governor.c | 2 +- drivers/rpmsg/rpmsg_ping.c | 2 +- drivers/timers/ds3231.c | 2 +- drivers/timers/mcp794xx.c | 2 +- drivers/timers/pcf85263.c | 2 +- drivers/timers/rx8010.c | 2 +- .../wireless/ieee80211/bcm43xxx/bcmf_driver.h | 2 +- drivers/wireless/spirit/lib/spirit_spi.c | 10 +-- fs/vfs/fs_poll.c | 2 +- fs/vfs/fs_timerfd.c | 4 +- include/limits.h | 2 +- include/nuttx/clock.h | 87 +++++++++---------- include/nuttx/fs/hostfs.h | 2 +- include/nuttx/mqueue.h | 4 +- include/nuttx/timers/clkcnt.h | 4 +- include/nuttx/wdog.h | 6 +- include/nuttx/wqueue.h | 2 +- include/sys/types.h | 9 +- libs/libc/netdb/lib_dnscache.c | 11 +-- libs/libc/time/lib_calendar2utc.c | 2 +- libs/libc/time/lib_time.c | 2 +- mm/iob/iob_alloc.c | 2 +- net/icmp/icmp_pmtu.c | 8 +- net/icmpv6/icmpv6_pmtu.c | 6 +- net/ipfrag/ipfrag.c | 2 +- net/mld/mld_query.c | 38 +------- net/tcp/tcp.h | 2 +- net/tcp/tcp_timer.c | 6 +- net/utils/net_snoop.c | 2 +- sched/clock/clock.c | 6 +- sched/clock/clock_initialize.c | 2 +- sched/mqueue/mq_rcvinternal.c | 2 +- sched/mqueue/mq_receive.c | 4 +- sched/mqueue/mq_send.c | 4 +- sched/mqueue/mq_sndinternal.c | 2 +- sched/mqueue/mqueue.h | 4 +- sched/pthread/pthread_create.c | 4 +- sched/sched/sched_profil.c | 2 +- sched/sched/sched_setparam.c | 4 +- sched/sched/sched_setscheduler.c | 4 +- sched/timer/timer_gettime.c | 2 +- sched/wdog/wd_gettime.c | 6 +- sched/wdog/wd_start.c | 2 +- sched/wdog/wdog.h | 6 +- 94 files changed, 207 insertions(+), 262 deletions(-) diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c index 35da54eea50fe..cd7e4338992bf 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc.c +++ b/arch/arm/src/cxd56xx/cxd56_rtc.c @@ -394,7 +394,7 @@ time_t up_rtc_time(void) count += g_rtc_save->offset; count >>= 15; /* convert to 1sec resolution */ - return (time_t)count / CONFIG_RTC_FREQUENCY; + return count / CONFIG_RTC_FREQUENCY; } #endif diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c index dd86566dfcda7..c3f8a128cbd05 100644 --- a/arch/arm/src/efm32/efm32_rtc_burtc.c +++ b/arch/arm/src/efm32/efm32_rtc_burtc.c @@ -398,7 +398,7 @@ int up_rtc_initialize(void) #ifndef CONFIG_RTC_HIRES time_t up_rtc_time(void) { - return (time_t)efm32_get_burtc_tick() / CONFIG_RTC_FREQUENCY; + return efm32_get_burtc_tick() / CONFIG_RTC_FREQUENCY; } #endif diff --git a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c index ee913467e5d7e..60fbbdfcde5de 100644 --- a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c +++ b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c @@ -463,7 +463,7 @@ static int imxrt_rdalarm(struct rtc_lowerhalf_s *lower, /* Get the current alarm setting in seconds */ - alarm = (time_t)imxrt_hprtc_getalarm(); + alarm = imxrt_hprtc_getalarm(); /* Convert the one second epoch time to a struct tm */ diff --git a/arch/arm/src/lc823450/lc823450_rtc.c b/arch/arm/src/lc823450/lc823450_rtc.c index 09fbf31dd7f99..5ea1cf43f0146 100644 --- a/arch/arm/src/lc823450/lc823450_rtc.c +++ b/arch/arm/src/lc823450/lc823450_rtc.c @@ -173,7 +173,7 @@ static void tm_divider(struct tm *tm, int divn, int divm) { time_t tt; tt = timegm(tm); - tt = (time_t) ((uint64_t)tt * divn / divm); + tt = tt * divn / divm; gmtime_r(&tt, tm); } #endif /* CONFIG_RTC_DIV */ diff --git a/arch/arm/src/lc823450/lc823450_timer.c b/arch/arm/src/lc823450/lc823450_timer.c index 6dd954afa6a9f..b56562b48be99 100644 --- a/arch/arm/src/lc823450/lc823450_timer.c +++ b/arch/arm/src/lc823450/lc823450_timer.c @@ -724,8 +724,8 @@ int up_rtc_gettime(struct timespec *tp) /* And return the result to the caller. */ - tp->tv_sec = (time_t)secs; - tp->tv_nsec = (long)nsecs; + tp->tv_sec = secs; + tp->tv_nsec = nsecs; tmrinfo("Returning tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec); return OK; diff --git a/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c b/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c index 6c98f88677280..e2aeae243c293 100644 --- a/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c +++ b/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c @@ -581,7 +581,7 @@ static int max326_rdalarm(struct rtc_lowerhalf_s *lower, { /* Extract integer seconds from the b32_t value */ - time_t sec = (time_t)(b32toi(ftime)); + time_t sec = b32toi(ftime); /* Convert to struct rtc_time (aka struct tm) */ diff --git a/arch/arm/src/sam34/sam4cm_oneshot.c b/arch/arm/src/sam34/sam4cm_oneshot.c index 6c31b6d42ab9a..7a5c1bcbbcc48 100644 --- a/arch/arm/src/sam34/sam4cm_oneshot.c +++ b/arch/arm/src/sam34/sam4cm_oneshot.c @@ -496,8 +496,8 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; } tmrinfo("remaining (%lu, %lu)\n", diff --git a/arch/arm/src/sam34/sam4cm_oneshot_lowerhalf.c b/arch/arm/src/sam34/sam4cm_oneshot_lowerhalf.c index 3ab83141b51e9..c9b41346f61fa 100644 --- a/arch/arm/src/sam34/sam4cm_oneshot_lowerhalf.c +++ b/arch/arm/src/sam34/sam4cm_oneshot_lowerhalf.c @@ -152,8 +152,8 @@ static int sam_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/arm/src/sama5/sam_oneshot.c b/arch/arm/src/sama5/sam_oneshot.c index 04c35719e7938..12fd473aca99a 100644 --- a/arch/arm/src/sama5/sam_oneshot.c +++ b/arch/arm/src/sama5/sam_oneshot.c @@ -507,8 +507,8 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; } tmrinfo("remaining (%lu, %lu)\n", diff --git a/arch/arm/src/sama5/sam_oneshot_lowerhalf.c b/arch/arm/src/sama5/sam_oneshot_lowerhalf.c index cfa4f72ea032a..dd7bf88489d22 100644 --- a/arch/arm/src/sama5/sam_oneshot_lowerhalf.c +++ b/arch/arm/src/sama5/sam_oneshot_lowerhalf.c @@ -154,8 +154,8 @@ static int sam_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/arm/src/samd5e5/sam_oneshot.c b/arch/arm/src/samd5e5/sam_oneshot.c index cb5911fb6bb42..b55b72c862a3f 100644 --- a/arch/arm/src/samd5e5/sam_oneshot.c +++ b/arch/arm/src/samd5e5/sam_oneshot.c @@ -441,8 +441,8 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; } tmrinfo("remaining (%lu, %lu)\n", diff --git a/arch/arm/src/samd5e5/sam_oneshot_lowerhalf.c b/arch/arm/src/samd5e5/sam_oneshot_lowerhalf.c index 28ec61c34de95..7373e522fefd6 100644 --- a/arch/arm/src/samd5e5/sam_oneshot_lowerhalf.c +++ b/arch/arm/src/samd5e5/sam_oneshot_lowerhalf.c @@ -152,8 +152,8 @@ static int sam_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/arm/src/samv7/sam_oneshot.c b/arch/arm/src/samv7/sam_oneshot.c index 1052435b40954..71abe8732085c 100644 --- a/arch/arm/src/samv7/sam_oneshot.c +++ b/arch/arm/src/samv7/sam_oneshot.c @@ -506,8 +506,8 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; } tmrinfo("remaining (%lu, %lu)\n", diff --git a/arch/arm/src/samv7/sam_oneshot_lowerhalf.c b/arch/arm/src/samv7/sam_oneshot_lowerhalf.c index 59482efb46f0c..593bd88294ccf 100644 --- a/arch/arm/src/samv7/sam_oneshot_lowerhalf.c +++ b/arch/arm/src/samv7/sam_oneshot_lowerhalf.c @@ -152,8 +152,8 @@ static int sam_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/arm/src/stm32/stm32_oneshot.c b/arch/arm/src/stm32/stm32_oneshot.c index 95a507b76195a..f05832e3d2a80 100644 --- a/arch/arm/src/stm32/stm32_oneshot.c +++ b/arch/arm/src/stm32/stm32_oneshot.c @@ -445,8 +445,8 @@ int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; } tmrinfo("remaining (%lu, %lu)\n", diff --git a/arch/arm/src/stm32/stm32_oneshot_lowerhalf.c b/arch/arm/src/stm32/stm32_oneshot_lowerhalf.c index 8d1bf6488f959..8d5c5c79a2861 100644 --- a/arch/arm/src/stm32/stm32_oneshot_lowerhalf.c +++ b/arch/arm/src/stm32/stm32_oneshot_lowerhalf.c @@ -151,8 +151,8 @@ static int stm32_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c index 7ddd226cd8dac..0d3634c8bdad7 100644 --- a/arch/arm/src/stm32/stm32_tickless.c +++ b/arch/arm/src/stm32/stm32_tickless.c @@ -710,7 +710,7 @@ int up_timer_gettime(struct timespec *ts) int up_timer_gettick(clock_t *ticks) { - *ticks = (clock_t)STM32_TIM_GETCOUNTER(g_tickless.tch); + *ticks = STM32_TIM_GETCOUNTER(g_tickless.tch); return OK; } @@ -869,8 +869,8 @@ int up_timer_cancel(struct timespec *ts) sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; tmrinfo("remaining (%lu, %lu)\n", (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); diff --git a/arch/arm/src/stm32f7/stm32_tickless.c b/arch/arm/src/stm32f7/stm32_tickless.c index bf0c10d350e8b..d809b623c5da6 100644 --- a/arch/arm/src/stm32f7/stm32_tickless.c +++ b/arch/arm/src/stm32f7/stm32_tickless.c @@ -751,7 +751,7 @@ int up_timer_gettime(struct timespec *ts) int up_timer_gettick(clock_t *ticks) { - *ticks = (clock_t)STM32_TIM_GETCOUNTER(g_tickless.tch); + *ticks = STM32_TIM_GETCOUNTER(g_tickless.tch); return OK; } @@ -911,8 +911,8 @@ int up_timer_cancel(struct timespec *ts) sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; tmrinfo("remaining (%lu, %lu)\n", (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); diff --git a/arch/arm/src/stm32h7/stm32_oneshot_lowerhalf.c b/arch/arm/src/stm32h7/stm32_oneshot_lowerhalf.c index 3cc03d1bf17a4..edec93ec7ecc5 100644 --- a/arch/arm/src/stm32h7/stm32_oneshot_lowerhalf.c +++ b/arch/arm/src/stm32h7/stm32_oneshot_lowerhalf.c @@ -151,8 +151,8 @@ static int stm32_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/arm/src/stm32h7/stm32_tickless.c b/arch/arm/src/stm32h7/stm32_tickless.c index 06d4651ba13f1..3a9896b14e629 100644 --- a/arch/arm/src/stm32h7/stm32_tickless.c +++ b/arch/arm/src/stm32h7/stm32_tickless.c @@ -725,7 +725,7 @@ int up_timer_gettime(struct timespec *ts) int up_timer_gettick(clock_t *ticks) { - *ticks = (clock_t)STM32_TIM_GETCOUNTER(g_tickless.tch); + *ticks = STM32_TIM_GETCOUNTER(g_tickless.tch); return OK; } @@ -885,8 +885,8 @@ int up_timer_cancel(struct timespec *ts) sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; tmrinfo("remaining (%lu, %lu)\n", (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.c b/arch/arm/src/stm32l4/stm32l4_oneshot.c index 70b41f1ed11ee..41c6e5dc83c5f 100644 --- a/arch/arm/src/stm32l4/stm32l4_oneshot.c +++ b/arch/arm/src/stm32l4/stm32l4_oneshot.c @@ -447,8 +447,8 @@ int stm32l4_oneshot_cancel(struct stm32l4_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; } tmrinfo("remaining (%lu, %lu)\n", diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot_lowerhalf.c b/arch/arm/src/stm32l4/stm32l4_oneshot_lowerhalf.c index e5143d7a02c53..7dd0b0cd73f30 100644 --- a/arch/arm/src/stm32l4/stm32l4_oneshot_lowerhalf.c +++ b/arch/arm/src/stm32l4/stm32l4_oneshot_lowerhalf.c @@ -152,8 +152,8 @@ static int stm32l4_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/arm/src/stm32wb/stm32wb_oneshot.c b/arch/arm/src/stm32wb/stm32wb_oneshot.c index d9356f01b32dc..612ec69f93e59 100644 --- a/arch/arm/src/stm32wb/stm32wb_oneshot.c +++ b/arch/arm/src/stm32wb/stm32wb_oneshot.c @@ -446,8 +446,8 @@ int stm32wb_oneshot_cancel(struct stm32wb_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; } tmrinfo("remaining (%lu, %lu)\n", diff --git a/arch/arm/src/stm32wb/stm32wb_oneshot_lowerhalf.c b/arch/arm/src/stm32wb/stm32wb_oneshot_lowerhalf.c index 17e05eefe97b4..4c1b7030377cf 100644 --- a/arch/arm/src/stm32wb/stm32wb_oneshot_lowerhalf.c +++ b/arch/arm/src/stm32wb/stm32wb_oneshot_lowerhalf.c @@ -152,8 +152,8 @@ static int stm32wb_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/arm/src/stm32wb/stm32wb_tickless.c b/arch/arm/src/stm32wb/stm32wb_tickless.c index 00769c2ba8585..c27c9790af4b7 100644 --- a/arch/arm/src/stm32wb/stm32wb_tickless.c +++ b/arch/arm/src/stm32wb/stm32wb_tickless.c @@ -576,7 +576,7 @@ int up_timer_gettime(struct timespec *ts) int up_timer_gettick(clock_t *ticks) { - *ticks = (clock_t)STM32WB_TIM_GETCOUNTER(g_tickless.tch); + *ticks = STM32WB_TIM_GETCOUNTER(g_tickless.tch); return OK; } @@ -735,8 +735,8 @@ int up_timer_cancel(struct timespec *ts) sec = usec / USEC_PER_SEC; nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; tmrinfo("remaining (%lu, %lu)\n", (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); diff --git a/arch/arm/src/xmc4/xmc4_tickless.c b/arch/arm/src/xmc4/xmc4_tickless.c index a15241254d8ab..1e8caebe04c98 100644 --- a/arch/arm/src/xmc4/xmc4_tickless.c +++ b/arch/arm/src/xmc4/xmc4_tickless.c @@ -563,8 +563,8 @@ int up_timer_cancel(struct timespec *ts) sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; tmrinfo("remaining count : %lu (%lu, %lu)\n", count, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); diff --git a/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c b/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c index 927069b0ce807..99bd4972bef24 100644 --- a/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c +++ b/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c @@ -301,7 +301,7 @@ static void avrdx_check_alarm_expired(uint8_t context) /* Note about data types - struct timespec is defined * in include/time.h, tv_sec is of type time_t which is defined - * in include/sys/types.h as uint64_t. + * in include/sys/types.h as int64_t. * * tv_nsec is defined as long, signed value */ diff --git a/arch/mips/src/pic32mz/pic32mz_oneshot.c b/arch/mips/src/pic32mz/pic32mz_oneshot.c index e845875b7358f..34d5f89a83c8c 100644 --- a/arch/mips/src/pic32mz/pic32mz_oneshot.c +++ b/arch/mips/src/pic32mz/pic32mz_oneshot.c @@ -433,8 +433,8 @@ int pic32mz_oneshot_cancel(struct pic32mz_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; } tmrinfo("remaining (%lu, %lu)\n", diff --git a/arch/mips/src/pic32mz/pic32mz_oneshot_lowerhalf.c b/arch/mips/src/pic32mz/pic32mz_oneshot_lowerhalf.c index 19b82b908d86e..b1b7537e9118e 100644 --- a/arch/mips/src/pic32mz/pic32mz_oneshot_lowerhalf.c +++ b/arch/mips/src/pic32mz/pic32mz_oneshot_lowerhalf.c @@ -153,8 +153,8 @@ static int pic32mz_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/risc-v/src/common/espressif/esp_i2c.c b/arch/risc-v/src/common/espressif/esp_i2c.c index 68707e10a58e5..5abb1ecd39a80 100644 --- a/arch/risc-v/src/common/espressif/esp_i2c.c +++ b/arch/risc-v/src/common/espressif/esp_i2c.c @@ -1052,7 +1052,7 @@ static int esp_i2c_polling_waitdone(struct esp_i2c_priv_s *priv) * and an error didn't occur within the timeout */ - while ((sclock_t)(current - timeout) < 0 && (priv->error == 0)) + while (current - timeout < 0 && priv->error == 0) { /* Check if any interrupt triggered, clear them * process the operation. diff --git a/arch/risc-v/src/common/espressif/esp_i2c_slave.c b/arch/risc-v/src/common/espressif/esp_i2c_slave.c index 10ca9e0687781..24b565d9cedbe 100644 --- a/arch/risc-v/src/common/espressif/esp_i2c_slave.c +++ b/arch/risc-v/src/common/espressif/esp_i2c_slave.c @@ -679,7 +679,7 @@ static int esp_i2c_slave_polling_waitdone(struct esp_i2c_priv_s *priv) current = clock_systime_ticks(); timeout = current + SEC2TICK(I2C_SLAVE_POLL_RATE); - while ((sclock_t)(current - timeout) < 0) + while (current - timeout < 0) { /* Check if any interrupt triggered, clear them * process the operation. diff --git a/arch/risc-v/src/common/espressif/esp_rtc.c b/arch/risc-v/src/common/espressif/esp_rtc.c index 0896312e1f83e..7c404e028d54e 100644 --- a/arch/risc-v/src/common/espressif/esp_rtc.c +++ b/arch/risc-v/src/common/espressif/esp_rtc.c @@ -699,7 +699,7 @@ time_t up_rtc_time(void) spin_unlock_irqrestore(&g_rtc_lowerhalf.lock, flags); - return (time_t)(time_us / USEC_PER_SEC); + return time_us / USEC_PER_SEC; } #endif /* !CONFIG_RTC_HIRES */ diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c index 72f0f81618ec1..a03bff8d9c532 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c @@ -846,7 +846,7 @@ static int esp32c3_i2c_polling_waitdone(struct esp32c3_i2c_priv_s *priv) * and an error didn't occur within the timeout */ - while ((sclock_t)(current - timeout) < 0 && (priv->error == 0)) + while (current - timeout < 0 && priv->error == 0) { /* Check if any interrupt triggered, clear them * process the operation. diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c index 8c48f8f5a6094..3d97fb6a7c8c6 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c @@ -3108,7 +3108,7 @@ time_t up_rtc_time(void) spin_unlock_irqrestore(&g_rtc_lock, flags); - return (time_t)(time_us / USEC_PER_SEC); + return time_us / USEC_PER_SEC; } #endif /* !CONFIG_RTC_HIRES */ diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c index 51a6bea4110f8..0f1d176967819 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c @@ -3289,8 +3289,8 @@ static int esp_get_time(void *t) ret = gettimeofday(&tv, NULL); if (!ret) { - time_adpt->sec = (time_t)tv.tv_sec; - time_adpt->usec = (suseconds_t)tv.tv_usec; + time_adpt->sec = tv.tv_sec; + time_adpt->usec = tv.tv_usec; } else { diff --git a/arch/risc-v/src/mpfs/mpfs_perf.c b/arch/risc-v/src/mpfs/mpfs_perf.c index 2cdf7c29a646a..aa32ac3b00c73 100644 --- a/arch/risc-v/src/mpfs/mpfs_perf.c +++ b/arch/risc-v/src/mpfs/mpfs_perf.c @@ -90,7 +90,7 @@ void up_udelay(useconds_t microseconds) { clock_t start = up_perf_gettime(); clock_t end = microseconds * up_perf_getfreq() / USEC_PER_SEC + start + 1; - while (((sclock_t)(up_perf_gettime() - end)) < 0) + while (up_perf_gettime() - end < 0) { } } diff --git a/arch/sparc/src/bm3803/bm3803_oneshot.c b/arch/sparc/src/bm3803/bm3803_oneshot.c index 89b9589c1856f..4c7f9bba616f8 100644 --- a/arch/sparc/src/bm3803/bm3803_oneshot.c +++ b/arch/sparc/src/bm3803/bm3803_oneshot.c @@ -389,8 +389,8 @@ int bm3803_oneshot_cancel(struct bm3803_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; } tmrinfo("remaining (%lu, %lu)\n", diff --git a/arch/sparc/src/bm3803/bm3803_oneshot_lowerhalf.c b/arch/sparc/src/bm3803/bm3803_oneshot_lowerhalf.c index c28ef7ca0c821..8e2aeffc17146 100644 --- a/arch/sparc/src/bm3803/bm3803_oneshot_lowerhalf.c +++ b/arch/sparc/src/bm3803/bm3803_oneshot_lowerhalf.c @@ -154,8 +154,8 @@ static int bm3803_max_delay(struct oneshot_lowerhalf_s *lower, uint64_t sec = usecs / 1000000; usecs -= 1000000 * sec; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (long)(usecs * 1000); + ts->tv_sec = sec; + ts->tv_nsec = usecs * 1000; } return ret; diff --git a/arch/x86_64/src/intel64/intel64_oneshot.c b/arch/x86_64/src/intel64/intel64_oneshot.c index d9f3da5b517dc..62f562698a288 100644 --- a/arch/x86_64/src/intel64/intel64_oneshot.c +++ b/arch/x86_64/src/intel64/intel64_oneshot.c @@ -461,8 +461,8 @@ int intel64_oneshot_cancel(struct intel64_oneshot_s *oneshot, sec = usec / USEC_PER_SEC; nsec = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts->tv_sec = (time_t)sec; - ts->tv_nsec = (unsigned long)nsec; + ts->tv_sec = sec; + ts->tv_nsec = nsec; tmrinfo("remaining (%lu, %lu)\n", (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); diff --git a/arch/xtensa/src/common/espressif/esp_i2c_slave.c b/arch/xtensa/src/common/espressif/esp_i2c_slave.c index 8ecfcb7bf4364..500c8837d8ea1 100644 --- a/arch/xtensa/src/common/espressif/esp_i2c_slave.c +++ b/arch/xtensa/src/common/espressif/esp_i2c_slave.c @@ -694,7 +694,7 @@ static int esp_i2c_slave_polling_waitdone(struct esp_i2c_priv_s *priv) current = clock_systime_ticks(); timeout = current + SEC2TICK(I2C_SLAVE_POLL_RATE); - while ((sclock_t)(current - timeout) < 0) + while (current - timeout < 0) { /* Check if any interrupt triggered, clear them * process the operation. diff --git a/arch/xtensa/src/common/espressif/esp_rtc.c b/arch/xtensa/src/common/espressif/esp_rtc.c index 2683e118f4aa3..c47ac898d57cd 100644 --- a/arch/xtensa/src/common/espressif/esp_rtc.c +++ b/arch/xtensa/src/common/espressif/esp_rtc.c @@ -698,7 +698,7 @@ time_t up_rtc_time(void) spin_unlock_irqrestore(&g_rtc_lowerhalf.lock, flags); - return (time_t)(time_us / USEC_PER_SEC); + return time_us / USEC_PER_SEC; } #endif /* !CONFIG_RTC_HIRES */ diff --git a/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c b/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c index cf6de7ede4ad2..8a5452ddb7e5f 100644 --- a/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c +++ b/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c @@ -154,7 +154,7 @@ static int esp32_max_lh_delay(struct oneshot_lowerhalf_s *lower, ts->tv_sec = UINT32_MAX; ts->tv_nsec = NSEC_PER_SEC - 1; - tmrinfo("max sec=%" PRIu32 "\n", ts->tv_sec); + tmrinfo("max sec=%" PRId64 "\n", ts->tv_sec); tmrinfo("max nsec=%" PRId32 "\n", ts->tv_nsec); return OK; diff --git a/arch/xtensa/src/esp32/esp32_wifi_adapter.c b/arch/xtensa/src/esp32/esp32_wifi_adapter.c index 6d372ab30070d..75edeee95ac1f 100644 --- a/arch/xtensa/src/esp32/esp32_wifi_adapter.c +++ b/arch/xtensa/src/esp32/esp32_wifi_adapter.c @@ -2594,8 +2594,8 @@ static int esp_get_time(void *t) ret = gettimeofday(&tv, NULL); if (!ret) { - time_adpt->sec = (time_t)tv.tv_sec; - time_adpt->usec = (suseconds_t)tv.tv_usec; + time_adpt->sec = tv.tv_sec; + time_adpt->usec = tv.tv_usec; } else { diff --git a/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c b/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c index cdfbbe7098ba6..d2de715a5f83a 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c +++ b/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c @@ -155,7 +155,7 @@ static int oneshot_lh_max_delay(struct oneshot_lowerhalf_s *lower, ts->tv_sec = UINT32_MAX; ts->tv_nsec = NSEC_PER_SEC - 1; - tmrinfo("max sec=%" PRIu32 "\n", ts->tv_sec); + tmrinfo("max sec=%" PRId64 "\n", ts->tv_sec); tmrinfo("max nsec=%ld\n", ts->tv_nsec); return OK; diff --git a/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c b/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c index bd8a24a4cbb01..9f3ea5c287f5c 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c +++ b/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c @@ -2412,8 +2412,8 @@ static int esp_get_time(void *t) ret = gettimeofday(&tv, NULL); if (!ret) { - time_adpt->sec = (time_t)tv.tv_sec; - time_adpt->usec = (suseconds_t)tv.tv_usec; + time_adpt->sec = tv.tv_sec; + time_adpt->usec = tv.tv_usec; } else { diff --git a/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c b/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c index eb07a398087bb..ccc60ac5aaf14 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c +++ b/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c @@ -155,7 +155,7 @@ static int oneshot_lh_max_delay(struct oneshot_lowerhalf_s *lower, ts->tv_sec = UINT32_MAX; ts->tv_nsec = NSEC_PER_SEC - 1; - tmrinfo("max sec=%" PRIu32 "\n", ts->tv_sec); + tmrinfo("max sec=%" PRId64 "\n", ts->tv_sec); tmrinfo("max nsec=%ld\n", ts->tv_nsec); return OK; diff --git a/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c b/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c index 6c615e8e3886d..ffd7aad445bdb 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c +++ b/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c @@ -2584,8 +2584,8 @@ static int esp_get_time(void *t) ret = gettimeofday(&tv, NULL); if (!ret) { - time_adpt->sec = (time_t)tv.tv_sec; - time_adpt->usec = (suseconds_t)tv.tv_usec; + time_adpt->sec = tv.tv_sec; + time_adpt->usec = tv.tv_usec; } else { diff --git a/drivers/audio/tone.c b/drivers/audio/tone.c index 3504d012f11a4..720d9c6ee9e73 100644 --- a/drivers/audio/tone.c +++ b/drivers/audio/tone.c @@ -377,8 +377,8 @@ static void next_note(FAR struct tone_upperhalf_s *upper) sec = duration / USEC_PER_SEC; nsec = ((duration) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts.tv_sec = (time_t) sec; - ts.tv_nsec = (unsigned long)nsec; + ts.tv_sec = sec; + ts.tv_nsec = nsec; ONESHOT_START(upper->oneshot, &ts); @@ -511,8 +511,8 @@ static void next_note(FAR struct tone_upperhalf_s *upper) sec = duration / USEC_PER_SEC; nsec = ((duration) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts.tv_sec = (time_t) sec; - ts.tv_nsec = (unsigned long)nsec; + ts.tv_sec = sec; + ts.tv_nsec = nsec; ONESHOT_START(upper->oneshot, &ts); return; @@ -554,8 +554,8 @@ static void next_note(FAR struct tone_upperhalf_s *upper) sec = duration / USEC_PER_SEC; nsec = ((duration) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts.tv_sec = (time_t) sec; - ts.tv_nsec = (unsigned long)nsec; + ts.tv_sec = sec; + ts.tv_nsec = nsec; ONESHOT_START(upper->oneshot, &ts); @@ -636,8 +636,8 @@ static void next_note(FAR struct tone_upperhalf_s *upper) sec = duration / USEC_PER_SEC; nsec = ((duration) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - ts.tv_sec = (time_t) sec; - ts.tv_nsec = (unsigned long)nsec; + ts.tv_sec = sec; + ts.tv_nsec = nsec; /* And arrange a callback when the note should stop */ diff --git a/drivers/input/aw86225.c b/drivers/input/aw86225.c index 68ba23a487846..24b98cbb4f7bd 100644 --- a/drivers/input/aw86225.c +++ b/drivers/input/aw86225.c @@ -2144,7 +2144,7 @@ static int aw86225_haptics_upload_effect(FAR struct ff_lowerhalf_s *lower, FAR struct aw86225 *aw86225 = (FAR struct aw86225 *)lower; FAR struct aw86225_hap_play_info *play = &aw86225->play; int16_t data[AW86225_CUSTOM_DATA_LEN]; - sclock_t time_us; + clock_t time_us; int ret; time_us = wd_gettime(&aw86225->timer); diff --git a/drivers/power/pm/activity_governor.c b/drivers/power/pm/activity_governor.c index 51c3859103dff..c757fb1af9f34 100644 --- a/drivers/power/pm/activity_governor.c +++ b/drivers/power/pm/activity_governor.c @@ -573,10 +573,10 @@ static void governor_timer(int domain, enum pm_state_e newstate) if (newstate < PM_SLEEP && dq_empty(&pdom->wakelock[newstate])) { - sclock_t delay = pmtick[newstate] + - pdomstate->btime - - clock_systime_ticks(); - sclock_t left = wd_gettime(&pdomstate->wdog); + clock_t delay = pmtick[newstate] + + pdomstate->btime - + clock_systime_ticks(); + clock_t left = wd_gettime(&pdomstate->wdog); if (delay <= 0) { diff --git a/drivers/power/pm/stability_governor.c b/drivers/power/pm/stability_governor.c index 4fd2b8d1a0130..ced75cbc38a62 100644 --- a/drivers/power/pm/stability_governor.c +++ b/drivers/power/pm/stability_governor.c @@ -115,7 +115,7 @@ static void stability_governor_statechanged(int domain, { if (WDOG_ISACTIVE(&g_stability_governor.domain[domain].wdog)) { - sclock_t left; + clock_t left; /* The left tick from wdog, if >0 should be other irq source */ diff --git a/drivers/rpmsg/rpmsg_ping.c b/drivers/rpmsg/rpmsg_ping.c index e837e8bf94d81..7784430e88577 100644 --- a/drivers/rpmsg/rpmsg_ping.c +++ b/drivers/rpmsg/rpmsg_ping.c @@ -189,7 +189,7 @@ static void rpmsg_ping_logout(FAR const char *s, clock_t value) perf_convert(value, &ts); - syslog(LOG_EMERG, "%s: %" PRIu64 " s, %ld ns\n", s, ts.tv_sec, ts.tv_nsec); + syslog(LOG_EMERG, "%s: %" PRId64 " s, %ld ns\n", s, ts.tv_sec, ts.tv_nsec); } static void rpmsg_ping_logout_rate(uint64_t len, clock_t avg) diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c index 6a997946a7fed..21b4d2b2f9e26 100644 --- a/drivers/timers/ds3231.c +++ b/drivers/timers/ds3231.c @@ -409,7 +409,7 @@ int up_rtc_settime(FAR const struct timespec *tp) /* Get the broken out time */ - newtime = (time_t)tp->tv_sec; + newtime = tp->tv_sec; if (tp->tv_nsec >= 500000000) { /* Round up */ diff --git a/drivers/timers/mcp794xx.c b/drivers/timers/mcp794xx.c index 272701991a8bf..7d4d786ec7357 100644 --- a/drivers/timers/mcp794xx.c +++ b/drivers/timers/mcp794xx.c @@ -502,7 +502,7 @@ int up_rtc_settime(FAR const struct timespec *tp) /* Get the broken out time */ - newtime = (time_t)tp->tv_sec; + newtime = tp->tv_sec; if (tp->tv_nsec >= 500000000) { /* Round up */ diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c index 72a4512038928..7e621c248a547 100644 --- a/drivers/timers/pcf85263.c +++ b/drivers/timers/pcf85263.c @@ -392,7 +392,7 @@ int up_rtc_settime(FAR const struct timespec *tp) /* Get the broken out time */ - newtime = (time_t)tp->tv_sec; + newtime = tp->tv_sec; if (tp->tv_nsec >= 500000000) { /* Round up */ diff --git a/drivers/timers/rx8010.c b/drivers/timers/rx8010.c index 7bf2639281521..b4189b663e787 100644 --- a/drivers/timers/rx8010.c +++ b/drivers/timers/rx8010.c @@ -397,7 +397,7 @@ int up_rtc_settime(FAR const struct timespec *tp) /* Get the broken out time */ - newtime = (time_t)tp->tv_sec; + newtime = tp->tv_sec; if (tp->tv_nsec >= 500000000) { /* Round up */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h index f11e25f4ff23a..02c348ff35814 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h @@ -106,7 +106,7 @@ struct bcmf_dev_s struct work_s lp_work_ifdown; /* Ifdown work to work queue */ struct work_s lp_work_dtim; /* Low power work to work queue */ int lp_dtim; /* Listen interval Delivery Traffic Indication Message */ - sclock_t lp_ticks; /* Ticks of last tx time */ + clock_t lp_ticks; /* Ticks of last tx time */ #endif #ifdef CONFIG_IEEE80211_BROADCOM_PTA_PRIORITY int pta_priority; /* Current priority of Packet Traffic Arbitration */ diff --git a/drivers/wireless/spirit/lib/spirit_spi.c b/drivers/wireless/spirit/lib/spirit_spi.c index 941c2f4b5ffdc..8cfd25fca4b86 100644 --- a/drivers/wireless/spirit/lib/spirit_spi.c +++ b/drivers/wireless/spirit/lib/spirit_spi.c @@ -635,17 +635,9 @@ int spirit_waitstatus(FAR struct spirit_library_s *spirit, /* Convert the MSEC timedelay to clock ticks, making sure that the * resulting delay in ticks is greater than or equal to the requested time * in MSEC. - * - * REVISIT: If USEC_PER_TICK and 'msec' are large, then the second - * computation may overflow! */ -#if (MSEC_PER_TICK * USEC_PER_MSEC) == USEC_PER_TICK - ticks = (msec + (MSEC_PER_TICK - 1)) / MSEC_PER_TICK; -#else - ticks = ((clock_t)msec * USEC_PER_MSEC + (USEC_PER_TICK - 1)) / - USEC_PER_TICK; -#endif + ticks = MSEC2TICK(msec); /* The time that we started the wait */ diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c index c6d429d189d30..cba73983baa37 100644 --- a/fs/vfs/fs_poll.c +++ b/fs/vfs/fs_poll.c @@ -488,7 +488,7 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout) * will return immediately. */ - ret = nxsem_tickwait(&sem, MSEC2TICK((clock_t)timeout)); + ret = nxsem_tickwait(&sem, MSEC2TICK(timeout)); if (ret < 0) { if (ret == -ETIMEDOUT) diff --git a/fs/vfs/fs_timerfd.c b/fs/vfs/fs_timerfd.c index aa2bc97fde1a3..cd06f2634f9c2 100644 --- a/fs/vfs/fs_timerfd.c +++ b/fs/vfs/fs_timerfd.c @@ -654,7 +654,7 @@ int timerfd_settime(int fd, int flags, * instead (assuming a repetitive timer). */ - if ((sclock_t)delay <= 0) + if (delay <= 0) { delay = dev->delay; } @@ -692,7 +692,7 @@ int timerfd_gettime(int fd, FAR struct itimerspec *curr_value) { FAR struct timerfd_priv_s *dev; FAR struct file *filep; - sclock_t ticks; + clock_t ticks; int ret; /* Some sanity checks */ diff --git a/include/limits.h b/include/limits.h index df58833c20a11..047dc3d6b85d7 100644 --- a/include/limits.h +++ b/include/limits.h @@ -236,7 +236,7 @@ #define TIMER_MAX _POSIX_TIMER_MAX #define CLOCKRES_MIN _POSIX_CLOCKRES_MIN -#define CLOCK_MAX UINT64_MAX +#define CLOCK_MAX INT64_MAX /* Other invariant values */ diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h index f55b341ca6072..fd7e14e6a917f 100644 --- a/include/nuttx/clock.h +++ b/include/nuttx/clock.h @@ -177,11 +177,11 @@ /* ?SEC2TIC rounds up */ -#define NSEC2TICK(nsec) div_const_roundup(nsec, (uint32_t)NSEC_PER_TICK) -#define USEC2TICK(usec) div_const_roundup(usec, (uint32_t)USEC_PER_TICK) +#define NSEC2TICK(nsec) div_const_roundup(nsec, NSEC_PER_TICK) +#define USEC2TICK(usec) div_const_roundup(usec, USEC_PER_TICK) #if (MSEC_PER_TICK * USEC_PER_MSEC) == USEC_PER_TICK -# define MSEC2TICK(msec) div_const_roundup(msec, (uint32_t)MSEC_PER_TICK) +# define MSEC2TICK(msec) div_const_roundup(msec, MSEC_PER_TICK) #else # define MSEC2TICK(msec) USEC2TICK((msec) * USEC_PER_MSEC) #endif @@ -196,34 +196,34 @@ #if (MSEC_PER_TICK * USEC_PER_MSEC) == USEC_PER_TICK # define TICK2MSEC(tick) ((tick) * MSEC_PER_TICK) #else -# define TICK2MSEC(tick) div_const(((tick) * USEC_PER_TICK), (uint32_t)USEC_PER_MSEC) +# define TICK2MSEC(tick) div_const(((tick) * USEC_PER_TICK), USEC_PER_MSEC) #endif /* TIC2?SEC rounds to nearest */ -#define TICK2DSEC(tick) div_const_roundnearest(tick, (uint32_t)TICK_PER_DSEC) -#define TICK2HSEC(tick) div_const_roundnearest(tick, (uint32_t)TICK_PER_HSEC) -#define TICK2SEC(tick) div_const_roundnearest(tick, (uint32_t)TICK_PER_SEC) +#define TICK2DSEC(tick) div_const_roundnearest(tick, TICK_PER_DSEC) +#define TICK2HSEC(tick) div_const_roundnearest(tick, TICK_PER_HSEC) +#define TICK2SEC(tick) div_const_roundnearest(tick, TICK_PER_SEC) /* MSEC2SEC */ -#define MSEC2SEC(usec) div_const(msec, (uint32_t)MSEC_PER_SEC) +#define MSEC2SEC(msec) div_const(msec, MSEC_PER_SEC) /* USEC2MSEC */ -#define USEC2MSEC(usec) div_const(usec, (uint32_t)USEC_PER_MSEC) +#define USEC2MSEC(usec) div_const(usec, USEC_PER_MSEC) /* USEC2SEC */ -#define USEC2SEC(usec) div_const(usec, (uint32_t)USEC_PER_SEC) +#define USEC2SEC(usec) div_const(usec, USEC_PER_SEC) /* NSEC2USEC */ -#define NSEC2USEC(nsec) div_const(nsec, (uint32_t)NSEC_PER_USEC) +#define NSEC2USEC(nsec) div_const(nsec, NSEC_PER_USEC) /* NSEC2MSEC */ -#define NSEC2MSEC(nsec) div_const(nsec, (uint32_t)NSEC_PER_MSEC) +#define NSEC2MSEC(nsec) div_const(nsec, NSEC_PER_MSEC) #if defined(CONFIG_DEBUG_SCHED) && !defined(CONFIG_SCHED_TICKLESS) /* Initial system timer ticks value close to maximum 32-bit value, to test @@ -232,7 +232,7 @@ */ # define INITIAL_SYSTEM_TIMER_TICKS \ - ((uint64_t)(UINT32_MAX - (TICK_PER_SEC * 5))) + (UINT32_MAX - (TICK_PER_SEC * 5)) #else # define INITIAL_SYSTEM_TIMER_TICKS 0 #endif @@ -301,13 +301,6 @@ struct cpuload_s }; #endif -/* This non-standard type used to hold relative clock ticks that may take - * negative values. Because of its non-portable nature the type sclock_t - * should be used only within the OS proper and not by portable applications. - */ - -typedef int64_t sclock_t; - /**************************************************************************** * Public Data ****************************************************************************/ @@ -327,47 +320,47 @@ extern "C" #define clock_ticks2time(ts, tick) \ do \ { \ - 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; \ + clock_t _tick = (tick); \ + (ts)->tv_sec = div_const(_tick, TICK_PER_SEC); \ + _tick -= (ts)->tv_sec * TICK_PER_SEC; \ + (ts)->tv_nsec = _tick * NSEC_PER_TICK; \ } \ while (0) #define clock_time2ticks(ts) \ - ((clock_t)((ts)->tv_sec * TICK_PER_SEC) + \ - (clock_t)div_const_roundup((uint64_t)(ts)->tv_nsec, (uint32_t)NSEC_PER_TICK)) + ((ts)->tv_sec * TICK_PER_SEC + \ + div_const_roundup((ts)->tv_nsec, NSEC_PER_TICK)) #define clock_time2ticks_floor(ts) \ - ((clock_t)(ts)->tv_sec * TICK_PER_SEC + \ - div_const((uint32_t)(ts)->tv_nsec, (uint32_t)NSEC_PER_TICK)) + ((ts)->tv_sec * TICK_PER_SEC + \ + div_const((ts)->tv_nsec, NSEC_PER_TICK)) #define clock_usec2time(ts, usec) \ do \ { \ - uint64_t _usec = (usec); \ - (ts)->tv_sec = (time_t)div_const(_usec, (uint32_t)USEC_PER_SEC); \ - _usec -= (uint64_t)(ts)->tv_sec * USEC_PER_SEC; \ - (ts)->tv_nsec = (long)_usec * NSEC_PER_USEC; \ + int64_t _usec = (usec); \ + (ts)->tv_sec = div_const(_usec, USEC_PER_SEC); \ + _usec -= (ts)->tv_sec * USEC_PER_SEC; \ + (ts)->tv_nsec = _usec * NSEC_PER_USEC; \ } \ while (0) #define clock_time2usec(ts) \ - ((uint64_t)(ts)->tv_sec * USEC_PER_SEC + \ - div_const((uint32_t)(ts)->tv_nsec, (uint32_t)NSEC_PER_USEC)) + ((ts)->tv_sec * USEC_PER_SEC + \ + div_const((ts)->tv_nsec, NSEC_PER_USEC)) #define clock_nsec2time(ts, nsec) \ do \ { \ - uint64_t _nsec = (nsec); \ - (ts)->tv_sec = (time_t)div_const(_nsec, (uint32_t)NSEC_PER_SEC); \ - _nsec -= (uint64_t)(ts)->tv_sec * NSEC_PER_SEC; \ - (ts)->tv_nsec = (long)_nsec; \ + int64_t _nsec = (nsec); \ + (ts)->tv_sec = div_const(_nsec, NSEC_PER_SEC); \ + _nsec -= (ts)->tv_sec * NSEC_PER_SEC; \ + (ts)->tv_nsec = _nsec; \ } \ while (0) #define clock_time2nsec(ts) \ - ((uint64_t)(ts)->tv_sec * NSEC_PER_SEC + (uint64_t)(ts)->tv_nsec) + ((ts)->tv_sec * NSEC_PER_SEC + (ts)->tv_nsec) /* Calculate delay+1, forcing the delay into a range that we can handle. * @@ -389,7 +382,7 @@ extern "C" * current_tick + 1, which is not enough for at least 1 tick. */ -#define clock_delay2abstick(delay) (clock_systime_ticks() + (delay) + 1u) +#define clock_delay2abstick(delay) (clock_systime_ticks() + (delay) + 1) /**************************************************************************** * Name: clock_timespec_add @@ -447,7 +440,7 @@ extern "C" _nsec += NSEC_PER_SEC; \ _sec--; \ } \ - if ((sclock_t)_sec < 0) \ + if (_sec < 0) \ { \ _sec = 0; \ _nsec = 0; \ @@ -540,7 +533,7 @@ int clock_realtime2absticks(FAR const struct timespec *reltime, * false - Otherwise. * * Assumptions: - * The type of delay value should be sclock_t. + * The type of delay value should be clock_t. * ****************************************************************************/ @@ -554,16 +547,16 @@ int clock_realtime2absticks(FAR const struct timespec *reltime, * it is considered not expired. * * For bit-63 as the sign bit, we can simplify this to: - * (sclock_t)(tick2 - tick1) >= 0. + * (clock_t)(tick2 - tick1) >= 0. * * However, this function requires an assumption to work correctly: - * Assumes the timer delay time does not exceed SCLOCK_MAX (2^63 - 1). + * Assumes the timer delay time does not exceed CLOCK_MAX (2^63 - 1). * - * The range of the delay data type sclock_t being - * [- (SCLOCK_MAX + 1), SCLOCK_MAX] ensures this assumption holds. + * The range of the delay data type clock_t being + * [- (CLOCK_MAX + 1), CLOCK_MAX] ensures this assumption holds. */ -#define clock_compare(tick1, tick2) ((sclock_t)((tick2) - (tick1)) >= 0) +#define clock_compare(tick1, tick2) ((clock_t)((tick2) - (tick1)) >= 0) /**************************************************************************** * Name: clock_isleapyear diff --git a/include/nuttx/fs/hostfs.h b/include/nuttx/fs/hostfs.h index fba49f3efbfbd..92c611e8b0385 100644 --- a/include/nuttx/fs/hostfs.h +++ b/include/nuttx/fs/hostfs.h @@ -136,7 +136,7 @@ typedef int nuttx_fsid_t[2]; /* These must match the definition in include/time.h */ -typedef uint64_t nuttx_time_t; +typedef int64_t nuttx_time_t; struct nuttx_timespec { diff --git a/include/nuttx/mqueue.h b/include/nuttx/mqueue.h index 60f2ee96f25bd..02758bc9da301 100644 --- a/include/nuttx/mqueue.h +++ b/include/nuttx/mqueue.h @@ -634,7 +634,7 @@ int file_mq_timedsend(FAR struct file *mq, FAR const char *msg, ****************************************************************************/ int file_mq_ticksend(FAR struct file *mq, FAR const char *msg, - size_t msglen, unsigned int prio, sclock_t ticks); + size_t msglen, unsigned int prio, clock_t ticks); /**************************************************************************** * Name: file_mq_receive @@ -740,7 +740,7 @@ ssize_t file_mq_timedreceive(FAR struct file *mq, FAR char *msg, ssize_t file_mq_tickreceive(FAR struct file *mq, FAR char *msg, size_t msglen, FAR unsigned int *prio, - sclock_t ticks); + clock_t ticks); /**************************************************************************** * Name: file_mq_setattr diff --git a/include/nuttx/timers/clkcnt.h b/include/nuttx/timers/clkcnt.h index 31310b5ecbaf7..e9ed6487936f7 100644 --- a/include/nuttx/timers/clkcnt.h +++ b/include/nuttx/timers/clkcnt.h @@ -128,7 +128,7 @@ clock_t clkcnt_max_tick(clkcnt_t max_count, uint32_t freq) clkcnt_t cnt = max_count / freq * TICK_PER_SEC + max_count % freq * TICK_PER_SEC / freq; cnt = cnt <= CLOCK_MAX ? cnt : CLOCK_MAX; - return (clock_t)cnt; + return cnt; } /**************************************************************************** @@ -427,7 +427,7 @@ clock_t clkcnt_delta_cnt2tick(clkcnt_t delta, uint32_t freq) DEBUGASSERT(tick <= CLOCK_MAX); - return (clock_t)tick; + return tick; } /**************************************************************************** diff --git a/include/nuttx/wdog.h b/include/nuttx/wdog.h index 8dab48c4851bb..ab9014c894d8a 100644 --- a/include/nuttx/wdog.h +++ b/include/nuttx/wdog.h @@ -188,7 +188,7 @@ int wd_start(FAR struct wdog_s *wdog, clock_t delay, /* Ensure delay is within the range the wdog can handle. */ - if (delay <= WDOG_MAX_DELAY) + if (delay >= 0 && delay <= WDOG_MAX_DELAY) { ret = wd_start_abstick(wdog, clock_delay2abstick(delay), wdentry, arg); } @@ -331,7 +331,7 @@ int wd_start_next(FAR struct wdog_s *wdog, clock_t delay, { /* Ensure delay is within the range the wdog can handle. */ - if (delay > WDOG_MAX_DELAY) + if (delay < 0 || delay > WDOG_MAX_DELAY) { return -EINVAL; } @@ -374,7 +374,7 @@ int wd_cancel(FAR struct wdog_s *wdog); * ****************************************************************************/ -sclock_t wd_gettime(FAR struct wdog_s *wdog); +clock_t wd_gettime(FAR struct wdog_s *wdog); #undef EXTERN #ifdef __cplusplus diff --git a/include/nuttx/wqueue.h b/include/nuttx/wqueue.h index b38a8ce7ef774..0bda2d0acbeef 100644 --- a/include/nuttx/wqueue.h +++ b/include/nuttx/wqueue.h @@ -547,7 +547,7 @@ int work_cancel_sync_wq(FAR struct kwork_wqueue_s *wqueue, * ****************************************************************************/ -#define work_timeleft(work) ((sclock_t)((work)->qtime - clock())) +#define work_timeleft(work) ((work)->qtime - clock()) /**************************************************************************** * Name: lpwork_boostpriority diff --git a/include/sys/types.h b/include/sys/types.h index 93a62d167ed1e..0836db8feb348 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -247,12 +247,13 @@ typedef uint16_t sa_family_t; /* Used for system times in clock ticks. This type is the natural width of * the system timer. * - * NOTE: The signed-ness of clock_t is not specified at OpenGroup.org. An - * unsigned type is used to support the full range of the internal clock. + * NOTE: The signed-ness of clock_t is not specified at OpenGroup.org, but + * a signed type is used to align with other OSes (Linux, BSD, etc.) and + * to allow expressing negative tick differences directly. */ -typedef uint64_t clock_t; -typedef uint64_t time_t; /* Holds time in seconds */ +typedef int64_t clock_t; +typedef int64_t time_t; /* Holds time in seconds */ typedef int clockid_t; /* Identifies one time base source */ typedef FAR void *timer_t; /* Represents one POSIX timer */ diff --git a/libs/libc/netdb/lib_dnscache.c b/libs/libc/netdb/lib_dnscache.c index 8212bbd86d074..d613ce4750c52 100644 --- a/libs/libc/netdb/lib_dnscache.c +++ b/libs/libc/netdb/lib_dnscache.c @@ -145,7 +145,7 @@ void dns_save_answer(FAR const char *hostname, /* Get the current time */ clock_gettime(CLOCK_MONOTONIC, &now); - entry->ctime = (time_t)now.tv_sec; + entry->ctime = now.tv_sec; #endif strlcpy(entry->name, hostname, CONFIG_NETDB_DNSCLIENT_NAMESIZE); @@ -212,7 +212,7 @@ int dns_find_answer(FAR const char *hostname, FAR union dns_addr_u *addr, FAR struct dns_cache_s *entry; #if CONFIG_NETDB_DNSCLIENT_LIFESEC > 0 struct timespec now; - uint32_t elapsed; + time_t elapsed; int ret; #endif int next; @@ -243,12 +243,9 @@ int dns_find_answer(FAR const char *hostname, FAR union dns_addr_u *addr, } #if CONFIG_NETDB_DNSCLIENT_LIFESEC > 0 - /* Check if this entry has expired - * REVISIT: Does not this calculation assume that the sizeof(time_t) - * is equal to the sizeof(uint32_t)? - */ + /* Check if this entry has expired */ - elapsed = (uint32_t)now.tv_sec - (uint32_t)entry->ctime; + elapsed = now.tv_sec - entry->ctime; if (ret >= 0 && (elapsed > CONFIG_NETDB_DNSCLIENT_LIFESEC || elapsed > entry->ttl)) { diff --git a/libs/libc/time/lib_calendar2utc.c b/libs/libc/time/lib_calendar2utc.c index 9b7180133dcf2..8d87c438c3658 100644 --- a/libs/libc/time/lib_calendar2utc.c +++ b/libs/libc/time/lib_calendar2utc.c @@ -168,7 +168,7 @@ time_t clock_calendar2utc(int year, int month, int day) /* Add in the days up to the beginning of this month. */ - days += (time_t)clock_daysbeforemonth(month, clock_isleapyear(year)); + days += clock_daysbeforemonth(month, clock_isleapyear(year)); /* Add in the days since the beginning of this month (days are 1-based). */ diff --git a/libs/libc/time/lib_time.c b/libs/libc/time/lib_time.c index 67a3701c6923c..e73ca4292220f 100644 --- a/libs/libc/time/lib_time.c +++ b/libs/libc/time/lib_time.c @@ -80,5 +80,5 @@ time_t time(time_t *tloc) return ts.tv_sec; } - return (time_t)ERROR; + return ERROR; } diff --git a/mm/iob/iob_alloc.c b/mm/iob/iob_alloc.c index 130526bc49fcc..27575084c039e 100644 --- a/mm/iob/iob_alloc.c +++ b/mm/iob/iob_alloc.c @@ -46,7 +46,7 @@ static clock_t iob_allocwait_gettimeout(clock_t start, unsigned int timeout) { - sclock_t tick; + clock_t tick; tick = clock_systime_ticks() - start; if (tick >= MSEC2TICK(timeout)) diff --git a/net/icmp/icmp_pmtu.c b/net/icmp/icmp_pmtu.c index 39e84bccb3e8b..2d8e0461abe79 100644 --- a/net/icmp/icmp_pmtu.c +++ b/net/icmp/icmp_pmtu.c @@ -99,16 +99,16 @@ void icmpv4_add_pmtu_entry(in_addr_t destipaddr, int mtu) for (i = 0; i < CONFIG_NET_ICMP_PMTU_ENTRIES; i++) { - if ((g_icmp_pmtu_entry[i].pmtu == 0) || - (sclock_t)(now - g_icmp_pmtu_entry[i].time) >= + if (g_icmp_pmtu_entry[i].pmtu == 0 || + now - g_icmp_pmtu_entry[i].time >= SEC2TICK(CONFIG_NET_ICMP_PMTU_TIMEOUT * 60)) { j = i; break; } - if ((sclock_t)(g_icmp_pmtu_entry[i].time - - g_icmp_pmtu_entry[j].time) < 0) + if (g_icmp_pmtu_entry[i].time - + g_icmp_pmtu_entry[j].time < 0) { j = i; } diff --git a/net/icmpv6/icmpv6_pmtu.c b/net/icmpv6/icmpv6_pmtu.c index 996d7a80183b6..11d06cdd391d6 100644 --- a/net/icmpv6/icmpv6_pmtu.c +++ b/net/icmpv6/icmpv6_pmtu.c @@ -99,15 +99,15 @@ void icmpv6_add_pmtu_entry(net_ipv6addr_t destipaddr, int mtu) for (i = 0; i < CONFIG_NET_ICMPv6_PMTU_ENTRIES; i++) { if (g_icmpv6_pmtu_entry[i].pmtu == 0 || - (sclock_t)(now - g_icmpv6_pmtu_entry[i].time) >= + now - g_icmpv6_pmtu_entry[i].time >= SEC2TICK(CONFIG_NET_ICMPv6_PMTU_TIMEOUT * 60)) { j = i; break; } - if ((sclock_t)(g_icmpv6_pmtu_entry[i].time - - g_icmpv6_pmtu_entry[j].time) < 0) + if (g_icmpv6_pmtu_entry[i].time - + g_icmpv6_pmtu_entry[j].time < 0) { j = i; } diff --git a/net/ipfrag/ipfrag.c b/net/ipfrag/ipfrag.c index ae87114199cc0..e4e47bc3bdc4d 100644 --- a/net/ipfrag/ipfrag.c +++ b/net/ipfrag/ipfrag.c @@ -192,7 +192,7 @@ static void ip_fragin_timerout_expiry(wdparm_t arg) static void ip_fragin_timerwork(FAR void *arg) { clock_t curtick = clock_systime_ticks(); - sclock_t interval = 0; + clock_t interval = 0; FAR sq_entry_t *entry; FAR sq_entry_t *entrynext; FAR struct ip_fragsnode_s *node; diff --git a/net/mld/mld_query.c b/net/mld/mld_query.c index a7767153e346f..e665a3a176151 100644 --- a/net/mld/mld_query.c +++ b/net/mld/mld_query.c @@ -88,46 +88,10 @@ static inline void mld_check_v1compat(FAR struct net_driver_s *dev, * running, this will reset the timer. */ - mld_start_v1timer(dev, - MSEC2TICK(MLD_V1PRESENT_MSEC((clock_t)MLD_QUERY_MSEC))); + mld_start_v1timer(dev, MSEC2TICK(MLD_V1PRESENT_MSEC(MLD_QUERY_MSEC))); } } -/**************************************************************************** - * Name: mld_mrc2mrd - * - * Description: - * Convert the MLD Maximum Response Code (MRC) to the Maximum Response - * Delay (MRD) in units of system clock ticks. - * - ****************************************************************************/ - -#if 0 /* Not used */ -static clock_t mld_mrc2mrd(uint16_t mrc) -{ - uint32_t mrd; /* Units of milliseconds */ - - /* If bit 15 is not set (i.e., mrc < 32768), - * then no conversion is required. - */ - - if (mrc < 32768) - { - mrd = mrc; - } - else - { - /* Conversion required */ - - mrd = MLD_MRD_VALUE(mrc); - } - - /* Return the MRD in units of clock ticks */ - - return MSEC2TICK((clock_t)mrd); -} -#endif - /**************************************************************************** * Name: mld_cmpaddr * diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h index 07aed8ee9907d..09d2fcddb76ce 100644 --- a/net/tcp/tcp.h +++ b/net/tcp/tcp.h @@ -278,7 +278,7 @@ struct tcp_conn_s #endif uint16_t flags; /* Flags of TCP-specific options */ #ifdef CONFIG_NET_SOLINGER - sclock_t ltimeout; /* Linger timeout expiration */ + clock_t ltimeout; /* Linger timeout expiration */ #endif #ifdef CONFIG_NETDEV_RSS int rcvcpu; /* Current cpu id */ diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c index 44ded0aef9012..96a35dd0ad6eb 100644 --- a/net/tcp/tcp_timer.c +++ b/net/tcp/tcp_timer.c @@ -233,7 +233,7 @@ static void tcp_xmit_probe(FAR struct net_driver_s *dev, void tcp_update_timer(FAR struct tcp_conn_s *conn) { - sclock_t timeout = tcp_get_timeout(conn); + clock_t timeout = tcp_get_timeout(conn); if (timeout > 0) { @@ -242,7 +242,7 @@ void tcp_update_timer(FAR struct tcp_conn_s *conn) if (conn->ltimeout != 0) { - sclock_t ticks = conn->ltimeout - clock_systime_ticks(); + clock_t ticks = conn->ltimeout - clock_systime_ticks(); if (ticks <= 0) { @@ -448,7 +448,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn) /* Send reset immediately if linger timeout */ if (conn->ltimeout != 0 && - ((sclock_t)(conn->ltimeout - clock_systime_ticks()) <= 0)) + conn->ltimeout - clock_systime_ticks() <= 0) { conn->tcpstateflags = TCP_CLOSED; ninfo("TCP state: TCP_CLOSED\n"); diff --git a/net/utils/net_snoop.c b/net/utils/net_snoop.c index 16e1a8f15473c..9baf111c6e882 100644 --- a/net/utils/net_snoop.c +++ b/net/utils/net_snoop.c @@ -47,7 +47,7 @@ /* microseconds since midnight, January 1st, 0 AD nominal Gregorian. */ -#define SNOOP_EPOCH_USEC(tv) (((tv).tv_sec - 0x386d4380ll) * 1000000ll \ +#define SNOOP_EPOCH_USEC(tv) (((tv).tv_sec - 0x386d4380) * 1000000 \ + (tv).tv_usec + 0x00e03ab44a676000ll) /**************************************************************************** diff --git a/sched/clock/clock.c b/sched/clock/clock.c index 8f1c20f415e65..5d3d478049a57 100644 --- a/sched/clock/clock.c +++ b/sched/clock/clock.c @@ -54,13 +54,11 @@ * None * * Returned Value: - * The system time in units of clock ticks is returned. If the processor - * time used is not available or its value cannot be represented, the - * function will return the value (clock_t)-1. + * The system time in units of clock ticks is returned. * ****************************************************************************/ clock_t clock(void) { - return (clock_t)clock_systime_ticks(); + return clock_systime_ticks(); } diff --git a/sched/clock/clock_initialize.c b/sched/clock/clock_initialize.c index 98df8a0dbd73f..117929a4177de 100644 --- a/sched/clock/clock_initialize.c +++ b/sched/clock/clock_initialize.c @@ -137,7 +137,7 @@ int clock_basetime(FAR struct timespec *tp) /* Set the base time as seconds into this julian day. */ - tp->tv_sec = jdn * (time_t)SEC_PER_DAY; + tp->tv_sec = jdn * SEC_PER_DAY; tp->tv_nsec = 0; return OK; } diff --git a/sched/mqueue/mq_rcvinternal.c b/sched/mqueue/mq_rcvinternal.c index db8dfbbc76b54..dd3c6c420030a 100644 --- a/sched/mqueue/mq_rcvinternal.c +++ b/sched/mqueue/mq_rcvinternal.c @@ -127,7 +127,7 @@ static void nxmq_rcvtimeout(wdparm_t arg) int nxmq_wait_receive(FAR struct mqueue_inode_s *msgq, FAR struct mqueue_msg_s **rcvmsg, FAR const struct timespec *abstime, - sclock_t ticks) + clock_t ticks) { FAR struct mqueue_msg_s *newmsg; FAR struct tcb_s *rtcb = this_task(); diff --git a/sched/mqueue/mq_receive.c b/sched/mqueue/mq_receive.c index 8e39036c01b52..3703d204474d2 100644 --- a/sched/mqueue/mq_receive.c +++ b/sched/mqueue/mq_receive.c @@ -138,7 +138,7 @@ static ssize_t file_mq_timedreceive_internal(FAR struct file *mq, FAR char *msg, size_t msglen, FAR unsigned int *prio, FAR const struct timespec *abstime, - sclock_t ticks) + clock_t ticks) { FAR struct mqueue_inode_s *msgq; FAR struct mqueue_msg_s *mqmsg; @@ -325,7 +325,7 @@ ssize_t file_mq_timedreceive(FAR struct file *mq, FAR char *msg, ssize_t file_mq_tickreceive(FAR struct file *mq, FAR char *msg, size_t msglen, FAR unsigned int *prio, - sclock_t ticks) + clock_t ticks) { return file_mq_timedreceive_internal(mq, msg, msglen, prio, NULL, ticks); } diff --git a/sched/mqueue/mq_send.c b/sched/mqueue/mq_send.c index a6671e15bf8d8..a4d3ba36c5e4f 100644 --- a/sched/mqueue/mq_send.c +++ b/sched/mqueue/mq_send.c @@ -275,7 +275,7 @@ static int file_mq_timedsend_internal(FAR struct file *mq, FAR const char *msg, size_t msglen, unsigned int prio, FAR const struct timespec *abstime, - sclock_t ticks) + clock_t ticks) { FAR struct mqueue_inode_s *msgq; FAR struct mqueue_msg_s *mqmsg; @@ -466,7 +466,7 @@ int file_mq_timedsend(FAR struct file *mq, FAR const char *msg, ****************************************************************************/ int file_mq_ticksend(FAR struct file *mq, FAR const char *msg, - size_t msglen, unsigned int prio, sclock_t ticks) + size_t msglen, unsigned int prio, clock_t ticks) { return file_mq_timedsend_internal(mq, msg, msglen, prio, NULL, ticks); } diff --git a/sched/mqueue/mq_sndinternal.c b/sched/mqueue/mq_sndinternal.c index a9e2b8956e144..ac7bfe12e57af 100644 --- a/sched/mqueue/mq_sndinternal.c +++ b/sched/mqueue/mq_sndinternal.c @@ -126,7 +126,7 @@ static void nxmq_sndtimeout(wdparm_t arg) int nxmq_wait_send(FAR struct mqueue_inode_s *msgq, FAR const struct timespec *abstime, - sclock_t ticks) + clock_t ticks) { FAR struct tcb_s *rtcb = this_task(); diff --git a/sched/mqueue/mqueue.h b/sched/mqueue/mqueue.h index 9499e155e2578..27aa681319b06 100644 --- a/sched/mqueue/mqueue.h +++ b/sched/mqueue/mqueue.h @@ -128,14 +128,14 @@ void nxmq_wait_irq(FAR struct tcb_s *wtcb, int errcode); int nxmq_wait_receive(FAR struct mqueue_inode_s *msgq, FAR struct mqueue_msg_s **rcvmsg, FAR const struct timespec *abstime, - sclock_t ticks); + clock_t ticks); void nxmq_notify_receive(FAR struct mqueue_inode_s *msgq); /* mq_sndinternal.c *********************************************************/ int nxmq_wait_send(FAR struct mqueue_inode_s *msgq, FAR const struct timespec *abstime, - sclock_t ticks); + clock_t ticks); void nxmq_notify_send(FAR struct mqueue_inode_s *msgq); /* mq_recover.c *************************************************************/ diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c index cbbd6075f334d..19b43f858958c 100644 --- a/sched/pthread/pthread_create.c +++ b/sched/pthread/pthread_create.c @@ -328,8 +328,8 @@ int nx_pthread_create(pthread_trampoline_t trampoline, FAR pthread_t *thread, if (policy == SCHED_SPORADIC) { FAR struct sporadic_s *sporadic; - sclock_t repl_ticks; - sclock_t budget_ticks; + clock_t repl_ticks; + clock_t budget_ticks; /* Convert timespec values to system clock ticks */ diff --git a/sched/sched/sched_profil.c b/sched/sched/sched_profil.c index 585c5b242755d..cdd77a875a4bc 100644 --- a/sched/sched/sched_profil.c +++ b/sched/sched/sched_profil.c @@ -34,7 +34,7 @@ * Pre-processor Definitions ****************************************************************************/ -#define PROFTICK NSEC2TICK((clock_t)(NSEC_PER_SEC / CONFIG_SCHED_PROFILE_TICKSPERSEC)) +#define PROFTICK NSEC2TICK(NSEC_PER_SEC / CONFIG_SCHED_PROFILE_TICKSPERSEC) /**************************************************************************** * Private Types diff --git a/sched/sched/sched_setparam.c b/sched/sched/sched_setparam.c index 4e8a5b7626d48..586ad7463cc30 100644 --- a/sched/sched/sched_setparam.c +++ b/sched/sched/sched_setparam.c @@ -55,8 +55,8 @@ int set_sporadic_param(FAR const struct sched_param *param, if ((rtcb->flags & TCB_FLAG_POLICY_MASK) == TCB_FLAG_SCHED_SPORADIC) { FAR struct sporadic_s *sporadic; - sclock_t repl_ticks; - sclock_t budget_ticks; + clock_t repl_ticks; + clock_t budget_ticks; if (param->sched_ss_max_repl >= 1 && param->sched_ss_max_repl <= CONFIG_SCHED_SPORADIC_MAXREPL) diff --git a/sched/sched/sched_setscheduler.c b/sched/sched/sched_setscheduler.c index 4936c2e5eed89..4efe6684b6fe7 100644 --- a/sched/sched/sched_setscheduler.c +++ b/sched/sched/sched_setscheduler.c @@ -49,8 +49,8 @@ int process_sporadic(FAR struct tcb_s *tcb, FAR const struct sched_param *param) { FAR struct sporadic_s *sporadic; - sclock_t repl_ticks; - sclock_t budget_ticks; + clock_t repl_ticks; + clock_t budget_ticks; int ret = -EINVAL; if (param->sched_ss_max_repl >= 1 && diff --git a/sched/timer/timer_gettime.c b/sched/timer/timer_gettime.c index 280c656d13df0..75a25b6291c08 100644 --- a/sched/timer/timer_gettime.c +++ b/sched/timer/timer_gettime.c @@ -73,7 +73,7 @@ int timer_gettime(timer_t timerid, FAR struct itimerspec *value) { FAR struct posix_timer_s *timer = timer_gethandle(timerid); - sclock_t ticks; + clock_t ticks; int ret = OK; if (!timer || !value) diff --git a/sched/wdog/wd_gettime.c b/sched/wdog/wd_gettime.c index 5ebdcfc3c4a7e..8fe8e49a59148 100644 --- a/sched/wdog/wd_gettime.c +++ b/sched/wdog/wd_gettime.c @@ -52,12 +52,12 @@ * ****************************************************************************/ -sclock_t wd_gettime(FAR struct wdog_s *wdog) +clock_t wd_gettime(FAR struct wdog_s *wdog) { irqstate_t flags; clock_t expired; bool is_active; - sclock_t delay = 0; + clock_t delay = 0; if (wdog != NULL && WDOG_ISACTIVE(wdog)) { @@ -68,7 +68,7 @@ sclock_t wd_gettime(FAR struct wdog_s *wdog) if (is_active) { - delay = (sclock_t)(expired - clock_systime_ticks()); + delay = expired - clock_systime_ticks(); delay = delay >= 0 ? delay : 0; } } diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c index 55ee857c4675a..3693952305457 100644 --- a/sched/wdog/wd_start.c +++ b/sched/wdog/wd_start.c @@ -368,7 +368,7 @@ uint64_t wd_timer(const hrtimer_t *timer, uint64_t expired) clock_t tick = div_const(expired, NSEC_PER_TICK); clock_t delay = wd_expiration(tick) - tick; - uint64_t nsec = TICK2NSEC((uint64_t)delay); + uint64_t nsec = TICK2NSEC(delay); return nsec <= HRTIMER_MAX_DELAY ? nsec : HRTIMER_MAX_DELAY; } #endif diff --git a/sched/wdog/wdog.h b/sched/wdog/wdog.h index 8303e6bb35a3e..bd726af57d791 100644 --- a/sched/wdog/wdog.h +++ b/sched/wdog/wdog.h @@ -127,11 +127,11 @@ uint64_t wd_timer(const hrtimer_t *timer, uint64_t expired); #ifdef CONFIG_HRTIMER static inline_function void wd_timer_start(clock_t tick, bool in_expiration) { - DEBUGASSERT((uint64_t)tick <= UINT64_MAX / NSEC_PER_TICK); + DEBUGASSERT(tick <= INT64_MAX / NSEC_PER_TICK); if (!in_expiration) { hrtimer_start(&g_wdtimer, wd_timer, - TICK2NSEC((uint64_t)tick), HRTIMER_MODE_ABS); + TICK2NSEC(tick), HRTIMER_MODE_ABS); } } @@ -214,7 +214,7 @@ static inline_function clock_t wd_get_next_expire(clock_t curr) } leave_critical_section(flags); - return (sclock_t)(next - curr) <= 0 ? 0u : next; + return next - curr <= 0 ? 0 : next; } #undef EXTERN From b53723bf2da1ae2070e16dfaa52ef74256af9e5d Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 17 May 2026 14:30:05 +0800 Subject: [PATCH 6/8] !nuttx: drop redundant casts on tv_sec/tv_nsec and fix printf formats Now that time_t is unconditionally 64-bit (signed int64_t) and the struct timespec fields tv_sec / tv_nsec are wide enough on their own, the explicit (uint64_t)/(int64_t)/(int) casts that used to guard the multiplications and subtractions in *_us / *_ms / *_ns helpers are no longer needed. Drop them to keep the timekeeping math readable and consistent with the previous sclock_t/time_t cleanup. In the same spirit, this commit also: * Normalises the printf-style format specifiers and casts used to print tv_sec / tv_nsec / tv_usec values across arch/, drivers/, fs/, sched/ and libs/. The prior code was a mix of "%d"/"%u"/"%ld"/"%lu"/"%lld"/PRIu32/PRIu64 with matching (int)/(unsigned long)/(long long)/PRIu* casts; some formats truncated time_t on 32-bit hosts, others mismatched signedness or width. Replace all such cases with the portable POSIX-recommended forms: - tv_sec (time_t, signed, impl-defined width) -> %jd + (intmax_t) - tv_nsec (long, signed) -> %ld (no cast) - tv_usec (suseconds_t / long) -> %ld (no cast) Add #include where required. * Drops a few stale `(FAR const time_t *)&ts.tv_sec` casts and related `(FAR struct tm *)` / `(const time_t *)` casts in gmtime_r() / localtime_r() / gmtime() callers; ts.tv_sec is plain time_t now and the casts only obscured the type. * Fixes one overflow in fs/procfs/fs_procfscritmon.c where all_time.tv_sec * 1000000 could overflow on 32-bit time_t before being multiplied again; cast to uint64_t at the start. No behavioural change. Signed-off-by: Xiang Xiao --- arch/arm/src/cxd56xx/cxd56_rtc.c | 4 +- arch/arm/src/cxd56xx/cxd56_timer.c | 2 +- arch/arm/src/cxd56xx/cxd56_wdt.c | 2 +- arch/arm/src/efm32/efm32_rtc_burtc.c | 6 +-- arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c | 3 +- arch/arm/src/lc823450/lc823450_timer.c | 2 +- arch/arm/src/lpc31xx/lpc31_timerisr.c | 2 +- arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c | 2 +- arch/arm/src/rp2040/rp2040_clock.c | 2 +- arch/arm/src/rp23xx/rp23xx_clock.c | 2 +- arch/arm/src/rtl8720c/amebaz_depend.c | 2 +- arch/arm/src/s32k3xx/s32k3xx_pinirq.c | 2 +- arch/arm/src/sam34/sam4cm_freerun.c | 4 +- arch/arm/src/sam34/sam4cm_oneshot.c | 11 ++-- arch/arm/src/sama5/sam_freerun.c | 4 +- arch/arm/src/sama5/sam_oneshot.c | 11 ++-- arch/arm/src/sama5/sam_tickless.c | 2 +- arch/arm/src/samd5e5/sam_freerun.c | 4 +- arch/arm/src/samd5e5/sam_oneshot.c | 10 ++-- arch/arm/src/samd5e5/sam_tickless.c | 5 +- arch/arm/src/samv7/sam_freerun.c | 4 +- arch/arm/src/samv7/sam_oneshot.c | 11 ++-- arch/arm/src/stm32/stm32_bbsram.c | 4 +- arch/arm/src/stm32/stm32_eth.c | 2 +- arch/arm/src/stm32/stm32_freerun.c | 4 +- arch/arm/src/stm32/stm32_oneshot.c | 9 ++-- arch/arm/src/stm32/stm32_rtcounter.c | 4 +- arch/arm/src/stm32/stm32_tickless.c | 12 ++--- .../arm/src/stm32f0l0g0/stm32_tim_lowerhalf.c | 4 +- arch/arm/src/stm32f7/stm32_bbsram.c | 4 +- arch/arm/src/stm32f7/stm32_tickless.c | 12 ++--- arch/arm/src/stm32h7/stm32_bbsram.c | 4 +- arch/arm/src/stm32h7/stm32_oneshot.c | 4 +- arch/arm/src/stm32h7/stm32_tickless.c | 12 ++--- arch/arm/src/stm32l4/stm32l4_freerun.c | 4 +- arch/arm/src/stm32l4/stm32l4_oneshot.c | 9 ++-- arch/arm/src/stm32wb/stm32wb_freerun.c | 4 +- arch/arm/src/stm32wb/stm32wb_oneshot.c | 9 ++-- arch/arm/src/stm32wb/stm32wb_tickless.c | 12 ++--- arch/arm/src/xmc4/xmc4_tickless.c | 12 ++--- arch/arm64/src/common/arm64_fatal.c | 2 +- arch/arm64/src/imx9/imx9_usdhc.c | 12 ++--- arch/mips/src/pic32mz/pic32mz_freerun.c | 8 +-- arch/mips/src/pic32mz/pic32mz_oneshot.c | 9 ++-- arch/renesas/src/rx65n/rx65n_sbram.c | 4 +- .../common/espressif/esp_ets_timer_legacy.c | 2 +- arch/risc-v/src/common/espressif/esp_rtc.c | 3 +- arch/risc-v/src/common/supervisor/riscv_sbi.c | 2 +- .../src/esp32c3-legacy/esp32c3_ble_adapter.c | 2 +- .../src/esp32c3-legacy/esp32c3_freerun.c | 4 +- .../src/esp32c3-legacy/esp32c3_oneshot.c | 6 +-- arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c | 4 +- .../esp32c3-legacy/esp32c3_rtc_lowerhalf.c | 3 +- arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c | 52 +++++++++---------- .../src/esp32c3-legacy/esp32c3_tickless.c | 2 +- arch/risc-v/src/esp32c3-legacy/esp32c3_tim.c | 16 +++--- arch/risc-v/src/mpfs/mpfs_ddr.c | 14 ++--- arch/risc-v/src/rp23xx-rv/rp23xx_clock.c | 2 +- arch/sparc/src/bm3803/bm3803_freerun.c | 4 +- arch/sparc/src/bm3803/bm3803_oneshot.c | 8 +-- arch/x86_64/src/intel64/intel64_oneshot.c | 9 ++-- arch/xtensa/src/common/espressif/esp_rtc.c | 3 +- arch/xtensa/src/esp32/esp32_freerun.c | 4 +- arch/xtensa/src/esp32/esp32_oneshot.c | 6 +-- .../src/esp32/esp32_oneshot_lowerhalf.c | 4 +- arch/xtensa/src/esp32/esp32_tim.c | 8 +-- arch/xtensa/src/esp32s2/esp32s2_freerun.c | 4 +- arch/xtensa/src/esp32s2/esp32s2_oneshot.c | 5 +- .../src/esp32s2/esp32s2_oneshot_lowerhalf.c | 2 +- arch/xtensa/src/esp32s2/esp32s2_tim.c | 24 ++++----- arch/xtensa/src/esp32s3/esp32s3_freerun.c | 4 +- arch/xtensa/src/esp32s3/esp32s3_oneshot.c | 5 +- .../src/esp32s3/esp32s3_oneshot_lowerhalf.c | 2 +- arch/xtensa/src/esp32s3/esp32s3_tickless.c | 4 +- arch/xtensa/src/esp32s3/esp32s3_tim.c | 16 +++--- crypto/random_pool.c | 2 +- drivers/misc/optee_rpc.c | 4 +- drivers/note/noteram_driver.c | 4 +- drivers/rpmsg/rpmsg_ping.c | 3 +- drivers/sensors/mpl115a.c | 2 +- drivers/sensors/ms56xx_uorb.c | 12 ++--- drivers/sensors/scd30.c | 4 +- drivers/sensors/scd41.c | 4 +- drivers/sensors/sgp30.c | 8 +-- drivers/sensors/sht21.c | 4 +- drivers/sensors/sht4x_uorb.c | 4 +- drivers/sensors/sps30.c | 4 +- drivers/sensors/t67xx.c | 4 +- drivers/syslog/vsyslog.c | 8 +-- drivers/timers/ds3231.c | 3 +- drivers/timers/mcp794xx.c | 3 +- drivers/timers/ptp_clock_dummy.c | 14 ++--- drivers/timers/rx8010.c | 3 +- fs/fat/fs_fat32util.c | 2 +- fs/nfs/nfs_vfsops.c | 6 +-- fs/procfs/fs_procfscritmon.c | 24 ++++----- fs/procfs/fs_procfsproc.c | 34 ++++++------ libs/libc/time/lib_gethrtime.c | 2 +- mm/ubsan/ubsan.c | 3 +- sched/clock/clock_adjtime.c | 2 +- sched/clock/clock_getres.c | 4 +- 101 files changed, 323 insertions(+), 325 deletions(-) diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c index cd7e4338992bf..b83b8b1bcc07e 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc.c +++ b/arch/arm/src/cxd56xx/cxd56_rtc.c @@ -75,7 +75,7 @@ /* convert seconds to 64bit counter value running at 32kHz */ -#define SEC_TO_CNT(sec) ((uint64_t)(((uint64_t)(sec)) << 15)) +#define SEC_TO_CNT(sec) (((uint64_t)(sec)) << 15) /* convert nano-seconds to 32kHz counter less than 1 second */ @@ -157,7 +157,7 @@ static void rtc_dumptime(const struct timespec *tp, const char *msg) gmtime_r(&tp->tv_sec, &tm); rtcinfo("%s:\n", msg); - rtcinfo("RTC %u.%09u\n", tp->tv_sec, tp->tv_nsec); + rtcinfo("RTC %jd.%09ld\n", (intmax_t)tp->tv_sec, tp->tv_nsec); rtcinfo("%4d/%02d/%02d %02d:%02d:%02d\n", tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); diff --git a/arch/arm/src/cxd56xx/cxd56_timer.c b/arch/arm/src/cxd56xx/cxd56_timer.c index 11e29835d791c..e851f268b8c04 100644 --- a/arch/arm/src/cxd56xx/cxd56_timer.c +++ b/arch/arm/src/cxd56xx/cxd56_timer.c @@ -336,7 +336,7 @@ static int cxd56_getstatus(struct timer_lowerhalf_s *lower, /* Get the time remaining until the timer expires (in microseconds). */ - remaining = (uint64_t)getreg32(priv->base + CXD56_TIMER_VALUE); + remaining = getreg32(priv->base + CXD56_TIMER_VALUE); status->timeleft = (uint32_t)(remaining * 1000000ULL * TIMER_DIVIDER / priv->clkticks); diff --git a/arch/arm/src/cxd56xx/cxd56_wdt.c b/arch/arm/src/cxd56xx/cxd56_wdt.c index cb668e9314572..62207f47a10ce 100644 --- a/arch/arm/src/cxd56xx/cxd56_wdt.c +++ b/arch/arm/src/cxd56xx/cxd56_wdt.c @@ -391,7 +391,7 @@ static int cxd56_getstatus(struct watchdog_lowerhalf_s *lower, /* Get the time remaining until the watchdog expires (in milliseconds) */ - remain = (uint64_t)cxd56_getreg(CXD56_WDT_WDOGVALUE); + remain = cxd56_getreg(CXD56_WDT_WDOGVALUE); status->timeleft = (uint32_t)(remain * 1000 / cxd56_get_cpu_baseclk()); if (cxd56_getreg(CXD56_WDT_WDOGRIS) != WDOGRIS_RAWINT) { diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c index c3f8a128cbd05..c3b2f55f8214b 100644 --- a/arch/arm/src/efm32/efm32_rtc_burtc.c +++ b/arch/arm/src/efm32/efm32_rtc_burtc.c @@ -431,7 +431,7 @@ int up_rtc_gettime(struct timespec *tp) tp->tv_nsec = (val % CONFIG_RTC_FREQUENCY) * (NSEC_PER_SEC / CONFIG_RTC_FREQUENCY); - rtcinfo("Get RTC %u.%09u\n", tp->tv_sec, tp->tv_nsec); + rtcinfo("Get RTC %jd.%09ld\n", (intmax_t)tp->tv_sec, tp->tv_nsec); return OK; } @@ -481,8 +481,8 @@ int up_rtc_settime(const struct timespec *tp) cnt_carry = val / __CNT_TOP; cnt = val % __CNT_TOP; - rtcinfo("Set RTC %u.%09u carry %u zero %u reg %u\n", - tp->tv_sec, tp->tv_nsec, cnt_carry, cnt, cnt_reg); + rtcinfo("Set RTC %jd.%09ld carry %u zero %u reg %u\n", + (intmax_t)tp->tv_sec, tp->tv_nsec, cnt_carry, cnt, cnt_reg); putreg32(cnt_carry, __CNT_CARRY_REG); putreg32(cnt , __CNT_ZERO_REG); diff --git a/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c b/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c index c2ec3cdc90827..e2e5fc3954859 100644 --- a/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c +++ b/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c @@ -515,8 +515,7 @@ static int kinetis_rdalarm(struct rtc_lowerhalf_s *lower, flags = enter_critical_section(); ret = kinetis_rtc_rdalarm(&ts); - localtime_r((const time_t *)&ts.tv_sec, - (struct tm *)alarminfo->time); + localtime_r(&ts.tv_sec, (struct tm *)alarminfo->time); leave_critical_section(flags); } diff --git a/arch/arm/src/lc823450/lc823450_timer.c b/arch/arm/src/lc823450/lc823450_timer.c index b56562b48be99..cea75ec495b60 100644 --- a/arch/arm/src/lc823450/lc823450_timer.c +++ b/arch/arm/src/lc823450/lc823450_timer.c @@ -727,6 +727,6 @@ int up_rtc_gettime(struct timespec *tp) tp->tv_sec = secs; tp->tv_nsec = nsecs; - tmrinfo("Returning tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec); + tmrinfo("Returning tp=(%jd,%ld)\n", (intmax_t)tp->tv_sec, tp->tv_nsec); return OK; } diff --git a/arch/arm/src/lpc31xx/lpc31_timerisr.c b/arch/arm/src/lpc31xx/lpc31_timerisr.c index 4e5e99ec6d211..8bd8ea2247aad 100644 --- a/arch/arm/src/lpc31xx/lpc31_timerisr.c +++ b/arch/arm/src/lpc31xx/lpc31_timerisr.c @@ -97,7 +97,7 @@ void up_timer_initialize(void) * of the timer0 module clock (in the AHB0APB1_BASE domain (2)). */ - freq = (uint64_t)lpc31_clkfreq(CLKID_TIMER0PCLK, DOMAINID_AHB0APB1); + freq = lpc31_clkfreq(CLKID_TIMER0PCLK, DOMAINID_AHB0APB1); /* If the clock is >1MHz, use pre-dividers */ diff --git a/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c b/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c index a2aefa4fa821f..c53e23120892b 100644 --- a/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c +++ b/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c @@ -362,7 +362,7 @@ static int nrf52_settimeout(struct watchdog_lowerhalf_s *lower, nrf52_wdt_behaviour_set(priv->mode); - nrf52_wdt_reload_value_set(((uint64_t) timeout * 32768) / 1000); + nrf52_wdt_reload_value_set(((uint64_t)timeout * 32768) / 1000); up_enable_irq(NRF52_IRQ_WDT); diff --git a/arch/arm/src/rp2040/rp2040_clock.c b/arch/arm/src/rp2040/rp2040_clock.c index 658833973399b..cba8946fd5db6 100644 --- a/arch/arm/src/rp2040/rp2040_clock.c +++ b/arch/arm/src/rp2040/rp2040_clock.c @@ -118,7 +118,7 @@ bool rp2040_clock_configure(int clk_index, * (left shift by 8) */ - div = (uint32_t) (((uint64_t) src_freq << 8) / freq); + div = (uint32_t)(((uint64_t)src_freq << 8) / freq); /* If increasing divisor, set divisor before source. Otherwise set source * before divisor. This avoids a momentary overspeed when e.g. switching diff --git a/arch/arm/src/rp23xx/rp23xx_clock.c b/arch/arm/src/rp23xx/rp23xx_clock.c index fadc48f2a2777..e1e41904782f5 100644 --- a/arch/arm/src/rp23xx/rp23xx_clock.c +++ b/arch/arm/src/rp23xx/rp23xx_clock.c @@ -124,7 +124,7 @@ bool rp23xx_clock_configure(int clk_index, * (left shift by 16) */ - div = (uint32_t) (((uint64_t) src_freq << 16) / freq); + div = (uint32_t)(((uint64_t)src_freq << 16) / freq); /* If increasing divisor, set divisor before source. Otherwise set source * before divisor. This avoids a momentary overspeed when e.g. switching diff --git a/arch/arm/src/rtl8720c/amebaz_depend.c b/arch/arm/src/rtl8720c/amebaz_depend.c index 6ba9241ec4fd3..ac81473c3dc25 100644 --- a/arch/arm/src/rtl8720c/amebaz_depend.c +++ b/arch/arm/src/rtl8720c/amebaz_depend.c @@ -518,7 +518,7 @@ static unsigned int __div64_32(uint64_t *n, unsigned int base) if (high >= base) { high /= base; - res = (uint64_t) high << 32; + res = (uint64_t)high << 32; rem -= (uint64_t)(high * base) << 32; } diff --git a/arch/arm/src/s32k3xx/s32k3xx_pinirq.c b/arch/arm/src/s32k3xx/s32k3xx_pinirq.c index b7b7cb87174b1..7392b4669dd96 100644 --- a/arch/arm/src/s32k3xx/s32k3xx_pinirq.c +++ b/arch/arm/src/s32k3xx/s32k3xx_pinirq.c @@ -157,7 +157,7 @@ static int s32k3xx_wkpuinterrupt(int irq, void *context, void *arg) wisr_64 = getreg32(S32K3XX_WKPU_WISR_64); irer_64 = getreg32(S32K3XX_WKPU_IRER_64); - eif = (wisr & irer) | (((uint64_t) (wisr_64 & irer_64)) << 32); + eif = (wisr & irer) | (((uint64_t)(wisr_64 & irer_64)) << 32); /* Examine each WKPU source */ diff --git a/arch/arm/src/sam34/sam4cm_freerun.c b/arch/arm/src/sam34/sam4cm_freerun.c index df76aae6d944c..06579ba89037d 100644 --- a/arch/arm/src/sam34/sam4cm_freerun.c +++ b/arch/arm/src/sam34/sam4cm_freerun.c @@ -276,8 +276,8 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/arm/src/sam34/sam4cm_oneshot.c b/arch/arm/src/sam34/sam4cm_oneshot.c index 7a5c1bcbbcc48..abb19a70abb11 100644 --- a/arch/arm/src/sam34/sam4cm_oneshot.c +++ b/arch/arm/src/sam34/sam4cm_oneshot.c @@ -233,7 +233,7 @@ int sam_oneshot_max_delay(struct sam_oneshot_s *oneshot, uint64_t *usec) { DEBUGASSERT(oneshot && usec); *usec = (0xffffull * USEC_PER_SEC) / - (uint64_t)sam_tc_divfreq(oneshot->tch); + sam_tc_divfreq(oneshot->tch); return OK; } @@ -266,9 +266,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, uint64_t regval; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); /* Was the oneshot already running? */ @@ -500,8 +499,8 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, ts->tv_nsec = nsec; } - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/arm/src/sama5/sam_freerun.c b/arch/arm/src/sama5/sam_freerun.c index 07f8e5e7c9682..a38149f4eb038 100644 --- a/arch/arm/src/sama5/sam_freerun.c +++ b/arch/arm/src/sama5/sam_freerun.c @@ -277,8 +277,8 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/arm/src/sama5/sam_oneshot.c b/arch/arm/src/sama5/sam_oneshot.c index 12fd473aca99a..9cc75c83ffe0e 100644 --- a/arch/arm/src/sama5/sam_oneshot.c +++ b/arch/arm/src/sama5/sam_oneshot.c @@ -243,7 +243,7 @@ int sam_oneshot_max_delay(struct sam_oneshot_s *oneshot, uint64_t *usec) { DEBUGASSERT(oneshot != NULL && usec != NULL); *usec = (0xffffull * USEC_PER_SEC) / - (uint64_t)sam_tc_divfreq(oneshot->tch); + sam_tc_divfreq(oneshot->tch); return OK; } @@ -276,9 +276,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, uint64_t regval; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); /* Was the oneshot already running? */ @@ -511,8 +510,8 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, ts->tv_nsec = nsec; } - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/arm/src/sama5/sam_tickless.c b/arch/arm/src/sama5/sam_tickless.c index cf497896013a3..27dd87b39e7f5 100644 --- a/arch/arm/src/sama5/sam_tickless.c +++ b/arch/arm/src/sama5/sam_tickless.c @@ -265,7 +265,7 @@ void up_timer_initialize(void) /* Convert this to configured clock ticks for use by the OS timer logic */ max_delay /= CONFIG_USEC_PER_TICK; - if (max_delay > (uint64_t)UINT32_MAX) + if (max_delay > UINT32_MAX) { g_oneshot_maxticks = UINT32_MAX; } diff --git a/arch/arm/src/samd5e5/sam_freerun.c b/arch/arm/src/samd5e5/sam_freerun.c index 0992557d5b20a..5aaf594675923 100644 --- a/arch/arm/src/samd5e5/sam_freerun.c +++ b/arch/arm/src/samd5e5/sam_freerun.c @@ -213,8 +213,8 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/arm/src/samd5e5/sam_oneshot.c b/arch/arm/src/samd5e5/sam_oneshot.c index b55b72c862a3f..cf4e9ae814df1 100644 --- a/arch/arm/src/samd5e5/sam_oneshot.c +++ b/arch/arm/src/samd5e5/sam_oneshot.c @@ -178,7 +178,7 @@ int sam_oneshot_max_delay(struct sam_oneshot_s *oneshot, uint64_t *usec) { DEBUGASSERT(oneshot != NULL && usec != NULL); *usec = (0xffffull * USEC_PER_SEC) / - (uint64_t)sam_tc_divfreq(oneshot->tch); + sam_tc_divfreq(oneshot->tch); return OK; } @@ -211,8 +211,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, uint64_t regval; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); /* Was the oneshot already running? */ @@ -445,8 +445,8 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, ts->tv_nsec = nsec; } - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/arm/src/samd5e5/sam_tickless.c b/arch/arm/src/samd5e5/sam_tickless.c index 7629bdab14b25..7f8191279f111 100644 --- a/arch/arm/src/samd5e5/sam_tickless.c +++ b/arch/arm/src/samd5e5/sam_tickless.c @@ -263,7 +263,7 @@ void up_timer_initialize(void) /* Convert this to configured clock ticks for use by the OS timer logic */ max_delay /= CONFIG_USEC_PER_TICK; - if (max_delay > (uint64_t)UINT32_MAX) + if (max_delay > UINT32_MAX) { g_oneshot_maxticks = UINT32_MAX; } @@ -398,8 +398,7 @@ int up_timer_cancel(struct timespec *ts) int up_timer_start(const struct timespec *ts) { - tmrinfo("ts=(%lu, %lu)\n", (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("ts=(%jd, %ld)\n", (intmax_t)ts->tv_sec, ts->tv_nsec); return ONESHOT_INITIALIZED(&g_tickless.oneshot) ? sam_oneshot_start(&g_tickless.oneshot, &g_tickless.freerun, sam_oneshot_handler, NULL, ts) : diff --git a/arch/arm/src/samv7/sam_freerun.c b/arch/arm/src/samv7/sam_freerun.c index 2b6b582a913d0..716e3b88eb745 100644 --- a/arch/arm/src/samv7/sam_freerun.c +++ b/arch/arm/src/samv7/sam_freerun.c @@ -277,8 +277,8 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/arm/src/samv7/sam_oneshot.c b/arch/arm/src/samv7/sam_oneshot.c index 71abe8732085c..853dd67472c8c 100644 --- a/arch/arm/src/samv7/sam_oneshot.c +++ b/arch/arm/src/samv7/sam_oneshot.c @@ -244,7 +244,7 @@ int sam_oneshot_max_delay(struct sam_oneshot_s *oneshot, uint64_t *usec) { DEBUGASSERT(oneshot != NULL && usec != NULL); *usec = (0xffffull * USEC_PER_SEC) / - (uint64_t)sam_tc_divfreq(oneshot->tch); + sam_tc_divfreq(oneshot->tch); return OK; } @@ -277,9 +277,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, uint64_t regval; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); /* Was the oneshot already running? */ @@ -510,8 +509,8 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, ts->tv_nsec = nsec; } - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/arm/src/stm32/stm32_bbsram.c b/arch/arm/src/stm32/stm32_bbsram.c index 9d914aff6c7eb..b595b37761100 100644 --- a/arch/arm/src/stm32/stm32_bbsram.c +++ b/arch/arm/src/stm32/stm32_bbsram.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -177,7 +178,8 @@ static void stm32_bbsram_dump(struct bbsramfh_s *bbf, char *op) _info(" fileno:%d\n", (int) bbf->fileno); _info(" dirty:%d\n", (int) bbf->dirty); _info(" length:%d\n", (int) bbf->len); - _info(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec); + _info(" time:%jd:%ld\n", (intmax_t)bbf->lastwrite.tv_sec, + bbf->lastwrite.tv_nsec); _info(" data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n", bbf->data[0], bbf->data[1], bbf->data[2], bbf->data[3], bbf->data[4]); } diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index e68e5a00dd2a2..3f1fdf514a366 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -3582,7 +3582,7 @@ static int stm32_eth_ptp_adjust(long ppb) if (ppb != 0) { - addend += (int64_t)addend * ppb / NSEC_PER_SEC; + addend += addend * ppb / NSEC_PER_SEC; } /* Check for overflows */ diff --git a/arch/arm/src/stm32/stm32_freerun.c b/arch/arm/src/stm32/stm32_freerun.c index 59437493b1f13..af5599a931452 100644 --- a/arch/arm/src/stm32/stm32_freerun.c +++ b/arch/arm/src/stm32/stm32_freerun.c @@ -247,7 +247,7 @@ int stm32_freerun_counter(struct stm32_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%ju, %lu)\n", + tmrinfo("usec=%llu ts=(%jd, %ld)\n", usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; @@ -257,7 +257,7 @@ int stm32_freerun_counter(struct stm32_freerun_s *freerun, int stm32_freerun_counter(struct stm32_freerun_s *freerun, uint64_t *counter) { - *counter = (uint64_t)STM32_TIM_GETCOUNTER(freerun->tch); + *counter = STM32_TIM_GETCOUNTER(freerun->tch); return OK; } diff --git a/arch/arm/src/stm32/stm32_oneshot.c b/arch/arm/src/stm32/stm32_oneshot.c index f05832e3d2a80..b80df41e76265 100644 --- a/arch/arm/src/stm32/stm32_oneshot.c +++ b/arch/arm/src/stm32/stm32_oneshot.c @@ -259,9 +259,8 @@ int stm32_oneshot_start(struct stm32_oneshot_s *oneshot, uint64_t period; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); DEBUGASSERT(oneshot->tch); @@ -449,8 +448,8 @@ int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot, ts->tv_nsec = nsec; } - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/arm/src/stm32/stm32_rtcounter.c b/arch/arm/src/stm32/stm32_rtcounter.c index aed4639477343..a93fcb4f8904b 100644 --- a/arch/arm/src/stm32/stm32_rtcounter.c +++ b/arch/arm/src/stm32/stm32_rtcounter.c @@ -832,8 +832,8 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) regvals.cnth = getreg16(STM32_RTC_ALRH); regvals.cntl = getreg16(STM32_RTC_ALRL); tp.tv_sec = regvals.cnth << 16 | regvals.cntl; - memcpy(alminfo->ar_time, (FAR struct tm *)gmtime(&tp.tv_sec), - sizeof(FAR struct tm)); + memcpy(alminfo->ar_time, gmtime(&tp.tv_sec), + sizeof(struct tm)); ret = OK; } break; diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c index 0d3634c8bdad7..3cd076bf1d742 100644 --- a/arch/arm/src/stm32/stm32_tickless.c +++ b/arch/arm/src/stm32/stm32_tickless.c @@ -686,8 +686,8 @@ int up_timer_gettime(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } @@ -872,8 +872,8 @@ int up_timer_cancel(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = nsec; - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; @@ -911,8 +911,8 @@ int up_timer_start(const struct timespec *ts) uint32_t count; irqstate_t flags; - tmrinfo("ts=(%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("ts=(%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(ts); DEBUGASSERT(g_tickless.tch); diff --git a/arch/arm/src/stm32f0l0g0/stm32_tim_lowerhalf.c b/arch/arm/src/stm32f0l0g0/stm32_tim_lowerhalf.c index 2923e1b123522..25e8257960468 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_tim_lowerhalf.c +++ b/arch/arm/src/stm32f0l0g0/stm32_tim_lowerhalf.c @@ -417,7 +417,7 @@ static int stm32_getstatus(struct timer_lowerhalf_s *lower, } else { - timeout = ((uint64_t) period * 1000000) / clock; + timeout = ((uint64_t)period * 1000000) / clock; } status->timeout = timeout; @@ -425,7 +425,7 @@ static int stm32_getstatus(struct timer_lowerhalf_s *lower, /* Get the time remaining until the timer expires (in microseconds) */ counter = STM32_TIM_GETCOUNTER(priv->tim); - status->timeleft = ((uint64_t) (timeout - counter) * clock) / 1000000; + status->timeleft = ((uint64_t)(timeout - counter) * clock) / 1000000; tmrinfo("timeout=%" PRIu32 " counter=%" PRIu32 "\n", timeout, counter); tmrinfo("timeleft=%" PRIu32 "\n", status->timeleft); return OK; diff --git a/arch/arm/src/stm32f7/stm32_bbsram.c b/arch/arm/src/stm32f7/stm32_bbsram.c index 06b418f36d7e9..36d92cc7de361 100644 --- a/arch/arm/src/stm32f7/stm32_bbsram.c +++ b/arch/arm/src/stm32f7/stm32_bbsram.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -177,7 +178,8 @@ static void stm32_bbsram_dump(struct bbsramfh_s *bbf, char *op) _info(" fileno:%d\n", (int) bbf->fileno); _info(" dirty:%d\n", (int) bbf->dirty); _info(" length:%d\n", (int) bbf->len); - _info(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec); + _info(" time:%jd:%ld\n", (intmax_t)bbf->lastwrite.tv_sec, + bbf->lastwrite.tv_nsec); _info(" data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n", bbf->data[0], bbf->data[1], bbf->data[2], bbf->data[3], bbf->data[4]); } diff --git a/arch/arm/src/stm32f7/stm32_tickless.c b/arch/arm/src/stm32f7/stm32_tickless.c index d809b623c5da6..52ddb0e04bd20 100644 --- a/arch/arm/src/stm32f7/stm32_tickless.c +++ b/arch/arm/src/stm32f7/stm32_tickless.c @@ -727,8 +727,8 @@ int up_timer_gettime(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } @@ -914,8 +914,8 @@ int up_timer_cancel(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = nsec; - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; @@ -955,8 +955,8 @@ int up_timer_start(const struct timespec *ts) uint32_t count; irqstate_t flags; - tmrinfo("ts=(%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("ts=(%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(ts); DEBUGASSERT(g_tickless.tch); diff --git a/arch/arm/src/stm32h7/stm32_bbsram.c b/arch/arm/src/stm32h7/stm32_bbsram.c index 7bea7fd69eb8f..a4666960d318f 100644 --- a/arch/arm/src/stm32h7/stm32_bbsram.c +++ b/arch/arm/src/stm32h7/stm32_bbsram.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -198,7 +199,8 @@ static void stm32_bbsram_dump(struct bbsramfh_s *bbf, char *op) _info(" fileno:%d\n", (int) bbf->fileno); _info(" dirty:%d\n", (int) bbf->dirty); _info(" length:%d\n", (int) bbf->len); - _info(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec); + _info(" time:%jd:%ld\n", (intmax_t)bbf->lastwrite.tv_sec, + bbf->lastwrite.tv_nsec); _info(" data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n", bbf->data[0], bbf->data[1], bbf->data[2], bbf->data[3], bbf->data[4]); } diff --git a/arch/arm/src/stm32h7/stm32_oneshot.c b/arch/arm/src/stm32h7/stm32_oneshot.c index fe56cfdbe58a6..078d6efe50236 100644 --- a/arch/arm/src/stm32h7/stm32_oneshot.c +++ b/arch/arm/src/stm32h7/stm32_oneshot.c @@ -263,8 +263,8 @@ int stm32_oneshot_start(struct stm32_oneshot_s *oneshot, uint64_t period; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", handler, arg, - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", handler, arg, + (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); DEBUGASSERT(oneshot->tch); diff --git a/arch/arm/src/stm32h7/stm32_tickless.c b/arch/arm/src/stm32h7/stm32_tickless.c index 3a9896b14e629..1de1d5abf738a 100644 --- a/arch/arm/src/stm32h7/stm32_tickless.c +++ b/arch/arm/src/stm32h7/stm32_tickless.c @@ -701,8 +701,8 @@ int up_timer_gettime(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } @@ -888,8 +888,8 @@ int up_timer_cancel(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = nsec; - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; @@ -929,8 +929,8 @@ int up_timer_start(const struct timespec *ts) uint32_t count; irqstate_t flags; - tmrinfo("ts=(%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("ts=(%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(ts); DEBUGASSERT(g_tickless.tch); diff --git a/arch/arm/src/stm32l4/stm32l4_freerun.c b/arch/arm/src/stm32l4/stm32l4_freerun.c index 54be46f54099d..433a55288f29c 100644 --- a/arch/arm/src/stm32l4/stm32l4_freerun.c +++ b/arch/arm/src/stm32l4/stm32l4_freerun.c @@ -231,8 +231,8 @@ int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%u, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.c b/arch/arm/src/stm32l4/stm32l4_oneshot.c index 41c6e5dc83c5f..0b70b905db882 100644 --- a/arch/arm/src/stm32l4/stm32l4_oneshot.c +++ b/arch/arm/src/stm32l4/stm32l4_oneshot.c @@ -260,9 +260,8 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot, uint64_t period; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); DEBUGASSERT(oneshot->tch); @@ -451,8 +450,8 @@ int stm32l4_oneshot_cancel(struct stm32l4_oneshot_s *oneshot, ts->tv_nsec = nsec; } - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/arm/src/stm32wb/stm32wb_freerun.c b/arch/arm/src/stm32wb/stm32wb_freerun.c index 9b3a195f701f7..a4168046aa411 100644 --- a/arch/arm/src/stm32wb/stm32wb_freerun.c +++ b/arch/arm/src/stm32wb/stm32wb_freerun.c @@ -245,7 +245,7 @@ int stm32wb_freerun_counter(struct stm32wb_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%ju, %lu)\n", + tmrinfo("usec=%llu ts=(%jd, %ld)\n", usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; @@ -256,7 +256,7 @@ int stm32wb_freerun_counter(struct stm32wb_freerun_s *freerun, int stm32wb_freerun_counter(struct stm32wb_freerun_s *freerun, uint64_t *counter) { - *counter = (uint64_t)STM32WB_TIM_GETCOUNTER(freerun->tch); + *counter = STM32WB_TIM_GETCOUNTER(freerun->tch); return OK; } diff --git a/arch/arm/src/stm32wb/stm32wb_oneshot.c b/arch/arm/src/stm32wb/stm32wb_oneshot.c index 612ec69f93e59..ed0d899531cf0 100644 --- a/arch/arm/src/stm32wb/stm32wb_oneshot.c +++ b/arch/arm/src/stm32wb/stm32wb_oneshot.c @@ -260,9 +260,8 @@ int stm32wb_oneshot_start(struct stm32wb_oneshot_s *oneshot, uint64_t period; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); DEBUGASSERT(oneshot->tch); @@ -450,8 +449,8 @@ int stm32wb_oneshot_cancel(struct stm32wb_oneshot_s *oneshot, ts->tv_nsec = nsec; } - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/arm/src/stm32wb/stm32wb_tickless.c b/arch/arm/src/stm32wb/stm32wb_tickless.c index c27c9790af4b7..ef5e64b5f60da 100644 --- a/arch/arm/src/stm32wb/stm32wb_tickless.c +++ b/arch/arm/src/stm32wb/stm32wb_tickless.c @@ -552,8 +552,8 @@ int up_timer_gettime(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } @@ -738,8 +738,8 @@ int up_timer_cancel(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = nsec; - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; @@ -777,8 +777,8 @@ int up_timer_start(const struct timespec *ts) uint32_t count; irqstate_t flags; - tmrinfo("ts=(%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("ts=(%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(ts); DEBUGASSERT(g_tickless.tch); diff --git a/arch/arm/src/xmc4/xmc4_tickless.c b/arch/arm/src/xmc4/xmc4_tickless.c index 1e8caebe04c98..6d82734096e27 100644 --- a/arch/arm/src/xmc4/xmc4_tickless.c +++ b/arch/arm/src/xmc4/xmc4_tickless.c @@ -375,8 +375,8 @@ int up_timer_gettime(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } @@ -412,8 +412,8 @@ int up_timer_start(const struct timespec *ts) uint64_t period; irqstate_t flags; - tmrinfo("ts=(%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("ts=(%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(ts); /* Was an interval already running? */ @@ -566,8 +566,8 @@ int up_timer_cancel(struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = nsec; - tmrinfo("remaining count : %lu (%lu, %lu)\n", count, - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining count : %lu (%jd, %ld)\n", count, + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/arm64/src/common/arm64_fatal.c b/arch/arm64/src/common/arm64_fatal.c index 2051c9d574eb2..a4e5800d83c56 100644 --- a/arch/arm64/src/common/arm64_fatal.c +++ b/arch/arm64/src/common/arm64_fatal.c @@ -666,7 +666,7 @@ uint64_t *arm64_fatal_handler(uint64_t *regs) tcb->flags |= TCB_FLAG_FORCED_CANCEL; - regs[REG_ELR] = (uint64_t) _exit; + regs[REG_ELR] = (uint64_t)_exit; regs[REG_X0] = SIGSEGV; regs[REG_SPSR] &= ~SPSR_MODE_MASK; regs[REG_SPSR] |= SPSR_MODE_EL1H; diff --git a/arch/arm64/src/imx9/imx9_usdhc.c b/arch/arm64/src/imx9/imx9_usdhc.c index a2a4be457730a..3e2eaaee7e3f2 100644 --- a/arch/arm64/src/imx9/imx9_usdhc.c +++ b/arch/arm64/src/imx9/imx9_usdhc.c @@ -2441,7 +2441,7 @@ static int imx9_recvsetup(struct sdio_dev_s *dev, uint8_t *buffer, { struct imx9_dev_s *priv = (struct imx9_dev_s *)dev; DEBUGASSERT(priv != NULL && buffer != NULL && nbytes > 0); - DEBUGASSERT(((uint64_t) buffer & 3) == 0); + DEBUGASSERT(((uint64_t)buffer & 3) == 0); /* Reset the DPSM configuration */ @@ -2492,7 +2492,7 @@ static int imx9_sendsetup(struct sdio_dev_s *dev, { struct imx9_dev_s *priv = (struct imx9_dev_s *)dev; DEBUGASSERT(priv != NULL && buffer != NULL && nbytes > 0); - DEBUGASSERT(((uint64_t) buffer & 3) == 0); + DEBUGASSERT(((uint64_t)buffer & 3) == 0); /* Reset the DPSM configuration */ @@ -3230,12 +3230,12 @@ static int imx9_dmarecvsetup(struct sdio_dev_s *dev, imx9_configxfrints(priv, USDHC_DMADONE_INTS); if (priv->unaligned_rx) { - putreg32((uint64_t) priv->rxbuffer, + putreg32((uint64_t)priv->rxbuffer, priv->addr + IMX9_USDHC_DSADDR_OFFSET); } else { - putreg32((uint64_t) priv->buffer, + putreg32((uint64_t)priv->buffer, priv->addr + IMX9_USDHC_DSADDR_OFFSET); } @@ -3271,7 +3271,7 @@ static int imx9_dmasendsetup(struct sdio_dev_s *dev, { struct imx9_dev_s *priv = (struct imx9_dev_s *)dev; DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); - DEBUGASSERT(((uint64_t) buffer & 3) == 0); + DEBUGASSERT(((uint64_t)buffer & 3) == 0); /* Begin sampling register values */ @@ -3297,7 +3297,7 @@ static int imx9_dmasendsetup(struct sdio_dev_s *dev, /* Configure the TX DMA */ - putreg32((uint64_t) buffer, priv->addr + IMX9_USDHC_DSADDR_OFFSET); + putreg32((uint64_t)buffer, priv->addr + IMX9_USDHC_DSADDR_OFFSET); /* Sample the register state */ diff --git a/arch/mips/src/pic32mz/pic32mz_freerun.c b/arch/mips/src/pic32mz/pic32mz_freerun.c index a20367971fae2..e764c14326955 100644 --- a/arch/mips/src/pic32mz/pic32mz_freerun.c +++ b/arch/mips/src/pic32mz/pic32mz_freerun.c @@ -260,8 +260,8 @@ int pic32mz_freerun_counter(struct pic32mz_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%u, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } @@ -271,8 +271,8 @@ int pic32mz_freerun_counter(struct pic32mz_freerun_s *freerun, int pic32mz_freerun_counter(struct pic32mz_freerun_s *freerun, uint64_t *counter) { - *counter = (uint64_t)PIC32MZ_TIMER_GETCOUNTER(freerun->timer) & - freerun->counter_mask; + *counter = PIC32MZ_TIMER_GETCOUNTER(freerun->timer) & + freerun->counter_mask; return OK; } diff --git a/arch/mips/src/pic32mz/pic32mz_oneshot.c b/arch/mips/src/pic32mz/pic32mz_oneshot.c index 34d5f89a83c8c..1d58ef03b15c9 100644 --- a/arch/mips/src/pic32mz/pic32mz_oneshot.c +++ b/arch/mips/src/pic32mz/pic32mz_oneshot.c @@ -277,9 +277,8 @@ int pic32mz_oneshot_start(struct pic32mz_oneshot_s *oneshot, uint64_t period; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); DEBUGASSERT(oneshot->timer); @@ -437,8 +436,8 @@ int pic32mz_oneshot_cancel(struct pic32mz_oneshot_s *oneshot, ts->tv_nsec = nsec; } - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/renesas/src/rx65n/rx65n_sbram.c b/arch/renesas/src/rx65n/rx65n_sbram.c index 5702f9707a8ca..486626b594943 100644 --- a/arch/renesas/src/rx65n/rx65n_sbram.c +++ b/arch/renesas/src/rx65n/rx65n_sbram.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -170,7 +171,8 @@ static void rx65n_sbram_dump(struct sbramfh_s *bbf, char *op) _info(" fileno:%d\n", (int) bbf->fileno); _info(" dirty:%d\n", (int) bbf->dirty); _info(" length:%d\n", (int) bbf->len); - _info(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec); + _info(" time:%jd:%ld\n", (intmax_t)bbf->lastwrite.tv_sec, + bbf->lastwrite.tv_nsec); _info(" data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n", bbf->data[0], bbf->data[1], bbf->data[2], bbf->data[3], bbf->data[4]); } diff --git a/arch/risc-v/src/common/espressif/esp_ets_timer_legacy.c b/arch/risc-v/src/common/espressif/esp_ets_timer_legacy.c index c892926185bbf..c2981660f9be8 100644 --- a/arch/risc-v/src/common/espressif/esp_ets_timer_legacy.c +++ b/arch/risc-v/src/common/espressif/esp_ets_timer_legacy.c @@ -203,7 +203,7 @@ void IRAM_ATTR ets_timer_arm(ets_timer *ptimer, uint32_t time_ms, bool repeat_flag) { - uint64_t time_us = 1000LL * (uint64_t) time_ms; + uint64_t time_us = 1000LL * (uint64_t)time_ms; assert(timer_initialized(ptimer)); diff --git a/arch/risc-v/src/common/espressif/esp_rtc.c b/arch/risc-v/src/common/espressif/esp_rtc.c index 7c404e028d54e..ed76d633527b2 100644 --- a/arch/risc-v/src/common/espressif/esp_rtc.c +++ b/arch/risc-v/src/common/espressif/esp_rtc.c @@ -630,8 +630,7 @@ static int esp_rtc_rdalarm(struct rtc_lowerhalf_s *lower, ts.tv_nsec = ((esp_hr_timer_time_us() + g_rtc_save->offset + cbinfo->deadline_us) % USEC_PER_SEC) * NSEC_PER_USEC; - localtime_r((const time_t *)&ts.tv_sec, - (struct tm *)alarminfo->time); + localtime_r(&ts.tv_sec, (struct tm *)alarminfo->time); spin_unlock_irqrestore(&priv->lock, flags); diff --git a/arch/risc-v/src/common/supervisor/riscv_sbi.c b/arch/risc-v/src/common/supervisor/riscv_sbi.c index 81780dd8fd3c6..42ab3c452eef3 100644 --- a/arch/risc-v/src/common/supervisor/riscv_sbi.c +++ b/arch/risc-v/src/common/supervisor/riscv_sbi.c @@ -131,7 +131,7 @@ uint64_t riscv_sbi_get_time(void) } while (hi != READ_CSR(CSR_TIMEH)); - return (((uint64_t) hi) << 32) | lo; + return (((uint64_t)hi) << 32) | lo; #endif } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.c index 87591b0294818..2fef2b25e2d6f 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.c @@ -1399,7 +1399,7 @@ static uint32_t IRAM_ATTR btdm_lpcycles_2_hus(uint32_t cycles, static uint32_t IRAM_ATTR btdm_hus_2_lpcycles(uint32_t us) { uint64_t cycles; - cycles = ((uint64_t)(us) << g_btdm_lpcycle_us_frac) / g_btdm_lpcycle_us; + cycles = ((uint64_t)us << g_btdm_lpcycle_us_frac) / g_btdm_lpcycle_us; return (uint32_t)cycles; } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.c index d0063550d7b2b..0681134630041 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.c @@ -301,8 +301,8 @@ int esp32c3_freerun_counter(struct esp32c3_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo(" usec=%" PRIu64 " ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo(" usec=%" PRIu64 " ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c index 7b799a49b6270..e7b214f424749 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -258,9 +259,8 @@ int esp32c3_oneshot_start(struct esp32c3_oneshot_s *oneshot, uint64_t timeout_us; int ret = OK; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot != NULL); DEBUGASSERT(handler != NULL); DEBUGASSERT(ts != NULL); diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c index 3d97fb6a7c8c6..0db475b59c584 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c @@ -735,7 +735,7 @@ static uint32_t IRAM_ATTR esp32c3_rtc_clk_cal_internal( expected_freq = RTC_SLOW_CLK_FREQ_90K; } - us_time_estimate = (uint32_t) (((uint64_t) slowclk_cycles) * + us_time_estimate = (uint32_t)(((uint64_t)slowclk_cycles) * MHZ / expected_freq); /* Start calibration */ @@ -2509,7 +2509,7 @@ uint64_t IRAM_ATTR esp32c3_rtc_time_get(void) modifyreg32(RTC_CNTL_TIME_UPDATE_REG, 0, RTC_CNTL_TIME_UPDATE); rtc_time = getreg32(RTC_CNTL_TIME0_REG); - rtc_time |= ((uint64_t) getreg32(RTC_CNTL_TIME1_REG)) << 32; + rtc_time |= ((uint64_t)getreg32(RTC_CNTL_TIME1_REG)) << 32; return rtc_time; } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.c index 180ea68e1c5f8..762ba07651d18 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.c @@ -483,8 +483,7 @@ static int rtc_lh_rdalarm(struct rtc_lowerhalf_s *lower, flags = spin_lock_irqsave(&priv->lock); ret = up_rtc_rdalarm(&ts, alarminfo->id); - localtime_r((const time_t *)&ts.tv_sec, - (struct tm *)alarminfo->time); + localtime_r(&ts.tv_sec, (struct tm *)alarminfo->time); spin_unlock_irqrestore(&priv->lock, flags); diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c index 83cd10350c6d1..ecf8e91988941 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c @@ -47,36 +47,36 @@ * Pre-processor Definitions ****************************************************************************/ -#define PUT_UINT32_BE(n,b,i) \ -{ \ - (b)[(i)] = (unsigned char) ((n) >> 24); \ - (b)[(i) + 1] = (unsigned char) ((n) >> 16); \ - (b)[(i) + 2] = (unsigned char) ((n) >> 8); \ - (b)[(i) + 3] = (unsigned char) ((n)); \ +#define PUT_UINT32_BE(n,b,i) \ +{ \ + (b)[(i)] = (unsigned char)((n) >> 24); \ + (b)[(i) + 1] = (unsigned char)((n) >> 16); \ + (b)[(i) + 2] = (unsigned char)((n) >> 8); \ + (b)[(i) + 3] = (unsigned char)((n)); \ } -#define GET_UINT64_BE(n,b,i) \ -{ \ - (n) = ((uint64_t) (b)[(i)] << 56) \ - | ((uint64_t) (b)[(i) + 1] << 48) \ - | ((uint64_t) (b)[(i) + 2] << 40) \ - | ((uint64_t) (b)[(i) + 3] << 32) \ - | ((uint64_t) (b)[(i) + 4] << 24) \ - | ((uint64_t) (b)[(i) + 5] << 16) \ - | ((uint64_t) (b)[(i) + 6] << 8) \ - | ((uint64_t) (b)[(i) + 7]); \ +#define GET_UINT64_BE(n,b,i) \ +{ \ + (n) = ((uint64_t)(b)[(i)] << 56) \ + | ((uint64_t)(b)[(i) + 1] << 48) \ + | ((uint64_t)(b)[(i) + 2] << 40) \ + | ((uint64_t)(b)[(i) + 3] << 32) \ + | ((uint64_t)(b)[(i) + 4] << 24) \ + | ((uint64_t)(b)[(i) + 5] << 16) \ + | ((uint64_t)(b)[(i) + 6] << 8) \ + | ((uint64_t)(b)[(i) + 7]); \ } -#define PUT_UINT64_BE(n,b,i) \ -{ \ - (b)[(i)] = (uint8_t) ((n) >> 56); \ - (b)[(i) + 1] = (uint8_t) ((n) >> 48); \ - (b)[(i) + 2] = (uint8_t) ((n) >> 40); \ - (b)[(i) + 3] = (uint8_t) ((n) >> 32); \ - (b)[(i) + 4] = (uint8_t) ((n) >> 24); \ - (b)[(i) + 5] = (uint8_t) ((n) >> 16); \ - (b)[(i) + 6] = (uint8_t) ((n) >> 8); \ - (b)[(i) + 7] = (uint8_t) ((n)); \ +#define PUT_UINT64_BE(n,b,i) \ +{ \ + (b)[(i)] = (uint8_t)((n) >> 56); \ + (b)[(i) + 1] = (uint8_t)((n) >> 48); \ + (b)[(i) + 2] = (uint8_t)((n) >> 40); \ + (b)[(i) + 3] = (uint8_t)((n) >> 32); \ + (b)[(i) + 4] = (uint8_t)((n) >> 24); \ + (b)[(i) + 5] = (uint8_t)((n) >> 16); \ + (b)[(i) + 6] = (uint8_t)((n) >> 8); \ + (b)[(i) + 7] = (uint8_t)((n)); \ } #define SHR(x,n) ((x) >> (n)) diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c index eb0a37a925407..5828687edf45f 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c @@ -191,7 +191,7 @@ static inline uint64_t up_tmr_getcounter(void) static inline uint64_t up_tmr_getalarmvalue(void) { - return ((uint64_t) getreg32(SYS_TIMER_SYSTIMER_TARGET0_HI_REG) << 32) \ + return ((uint64_t)getreg32(SYS_TIMER_SYSTIMER_TARGET0_HI_REG) << 32) \ | getreg32(SYS_TIMER_SYSTIMER_TARGET0_LO_REG); } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_tim.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim.c index 27baa0a7ef125..5cb085855019d 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_tim.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim.c @@ -384,10 +384,10 @@ static void esp32c3_tim_getcounter(struct esp32c3_tim_dev_s *dev, /* Discard the top 12 bits */ value_32 &= LOW_20_MASK; - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(SYS_TIMER_SYSTIMER_UNIT1_VALUE_LO_REG); - *value |= (uint64_t)value_32; + *value |= value_32; } else { @@ -402,10 +402,10 @@ static void esp32c3_tim_getcounter(struct esp32c3_tim_dev_s *dev, /* Discard the top 10 bits */ value_32 &= LOW_22_MASK; - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T0LO_REG(priv->id)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } } @@ -521,10 +521,10 @@ static void esp32c3_tim_getalarmvalue(struct esp32c3_tim_dev_s *dev, /* Get only the 20 low bits. */ value_32 &= LOW_20_MASK; - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(SYS_TIMER_SYSTIMER_TARGET2_LO_REG); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } else { @@ -535,10 +535,10 @@ static void esp32c3_tim_getalarmvalue(struct esp32c3_tim_dev_s *dev, /* Get only the 22 low bits. */ value_32 &= LOW_22_MASK; - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T0ALARMLO_REG(priv->id)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } } diff --git a/arch/risc-v/src/mpfs/mpfs_ddr.c b/arch/risc-v/src/mpfs/mpfs_ddr.c index 10f1719beb770..b28038e543f9b 100644 --- a/arch/risc-v/src/mpfs/mpfs_ddr.c +++ b/arch/risc-v/src/mpfs/mpfs_ddr.c @@ -2090,7 +2090,7 @@ static inline uint64_t rotl(uint64_t x, int k) return (x << k) | (x >> (-k & 0x3f)); } -static int mpfs_ddr_rand(void) +static uint32_t mpfs_ddr_rand(void) { uint64_t s0 = prng_state[0]; uint64_t s1 = prng_state[1]; @@ -2099,7 +2099,7 @@ static int mpfs_ddr_rand(void) prng_state[0] = s0 ^ rotl(s1, 29); prng_state[1] = s0 ^ (s1 << 9); - return (int)result; + return (uint32_t)result; } /**************************************************************************** @@ -2145,7 +2145,7 @@ static void mpfs_ddr_write(struct mpfs_ddr_priv_s *priv, break; case PATTERN_RANDOM: - data = (uint64_t)mpfs_ddr_rand(); + data = mpfs_ddr_rand(); break; case PATTERN_CCCCCCCC: @@ -2212,7 +2212,7 @@ static void mpfs_ddr_write(struct mpfs_ddr_priv_s *priv, break; case PATTERN_RANDOM: - data = (uint64_t)mpfs_ddr_rand(); + data = mpfs_ddr_rand(); break; case PATTERN_CCCCCCCC: @@ -2287,7 +2287,7 @@ uint32_t mpfs_ddr_read(struct mpfs_ddr_priv_s *priv, break; case PATTERN_RANDOM: - data = (uint64_t)mpfs_ddr_rand(); + data = mpfs_ddr_rand(); *ddr_word_ptr = data; *ddr_32_pt_t = (uint32_t)data; break; @@ -2366,8 +2366,8 @@ uint32_t mpfs_ddr_read(struct mpfs_ddr_priv_s *priv, break; case PATTERN_RANDOM: - data = (uint64_t)mpfs_ddr_rand(); - mpfs_ddr_rand_addr_offset = (uint32_t)(mpfs_ddr_rand() & + data = mpfs_ddr_rand(); + mpfs_ddr_rand_addr_offset = (mpfs_ddr_rand() & 0xffffc); ddr_word_ptr = first_ddr_word_pt_t + mpfs_ddr_rand_addr_offset; diff --git a/arch/risc-v/src/rp23xx-rv/rp23xx_clock.c b/arch/risc-v/src/rp23xx-rv/rp23xx_clock.c index d68033efb894b..d1203c678d6b4 100644 --- a/arch/risc-v/src/rp23xx-rv/rp23xx_clock.c +++ b/arch/risc-v/src/rp23xx-rv/rp23xx_clock.c @@ -124,7 +124,7 @@ bool rp23xx_clock_configure(int clk_index, * (left shift by 16) */ - div = (uint32_t) (((uint64_t) src_freq << 16) / freq); + div = (uint32_t)(((uint64_t)src_freq << 16) / freq); /* If increasing divisor, set divisor before source. Otherwise set source * before divisor. This avoids a momentary overspeed when e.g. switching diff --git a/arch/sparc/src/bm3803/bm3803_freerun.c b/arch/sparc/src/bm3803/bm3803_freerun.c index aa10a9370ba72..5ed69de022a67 100644 --- a/arch/sparc/src/bm3803/bm3803_freerun.c +++ b/arch/sparc/src/bm3803/bm3803_freerun.c @@ -232,8 +232,8 @@ int bm3803_freerun_counter(struct bm3803_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%lld, %ld)\n", - usec, ts->tv_sec, ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/sparc/src/bm3803/bm3803_oneshot.c b/arch/sparc/src/bm3803/bm3803_oneshot.c index 4c7f9bba616f8..9eff78c46a39b 100644 --- a/arch/sparc/src/bm3803/bm3803_oneshot.c +++ b/arch/sparc/src/bm3803/bm3803_oneshot.c @@ -206,8 +206,8 @@ int bm3803_oneshot_start(struct bm3803_oneshot_s *oneshot, uint64_t period; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", handler, arg, - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", handler, arg, + (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); DEBUGASSERT(oneshot->tch); @@ -393,8 +393,8 @@ int bm3803_oneshot_cancel(struct bm3803_oneshot_s *oneshot, ts->tv_nsec = nsec; } - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/x86_64/src/intel64/intel64_oneshot.c b/arch/x86_64/src/intel64/intel64_oneshot.c index 62f562698a288..a98b8cea55502 100644 --- a/arch/x86_64/src/intel64/intel64_oneshot.c +++ b/arch/x86_64/src/intel64/intel64_oneshot.c @@ -290,9 +290,8 @@ int intel64_oneshot_start(struct intel64_oneshot_s *oneshot, uint64_t compare = 0; irqstate_t flags; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); DEBUGASSERT(oneshot->tch); @@ -464,8 +463,8 @@ int intel64_oneshot_cancel(struct intel64_oneshot_s *oneshot, ts->tv_sec = sec; ts->tv_nsec = nsec; - tmrinfo("remaining (%lu, %lu)\n", - (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("remaining (%jd, %ld)\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); } return OK; diff --git a/arch/xtensa/src/common/espressif/esp_rtc.c b/arch/xtensa/src/common/espressif/esp_rtc.c index c47ac898d57cd..2d08b1d056ef9 100644 --- a/arch/xtensa/src/common/espressif/esp_rtc.c +++ b/arch/xtensa/src/common/espressif/esp_rtc.c @@ -629,8 +629,7 @@ static int esp_rtc_rdalarm(struct rtc_lowerhalf_s *lower, ts.tv_nsec = ((esp_hr_timer_time_us() + g_rtc_save->offset + cbinfo->deadline_us) % USEC_PER_SEC) * NSEC_PER_USEC; - localtime_r((const time_t *)&ts.tv_sec, - (struct tm *)alarminfo->time); + localtime_r(&ts.tv_sec, (struct tm *)alarminfo->time); spin_unlock_irqrestore(&priv->lock, flags); diff --git a/arch/xtensa/src/esp32/esp32_freerun.c b/arch/xtensa/src/esp32/esp32_freerun.c index 11098f19f2c77..65f07cb06690b 100644 --- a/arch/xtensa/src/esp32/esp32_freerun.c +++ b/arch/xtensa/src/esp32/esp32_freerun.c @@ -292,8 +292,8 @@ int esp32_freerun_counter(struct esp32_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%" PRIu32 ", %" PRIu32 ")\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/xtensa/src/esp32/esp32_oneshot.c b/arch/xtensa/src/esp32/esp32_oneshot.c index d182188e55b99..b13c22468a2e0 100644 --- a/arch/xtensa/src/esp32/esp32_oneshot.c +++ b/arch/xtensa/src/esp32/esp32_oneshot.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -249,9 +250,8 @@ int esp32_oneshot_start(struct esp32_oneshot_s *oneshot, uint64_t timeout_us; int ret = OK; - tmrinfo("handler=%p arg=%p, ts=(%" PRIu32 ", %" PRIu32 ")\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot != NULL); DEBUGASSERT(handler != NULL); DEBUGASSERT(ts != NULL); diff --git a/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c b/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c index 8a5452ddb7e5f..96edf50c243e3 100644 --- a/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c +++ b/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c @@ -154,8 +154,8 @@ static int esp32_max_lh_delay(struct oneshot_lowerhalf_s *lower, ts->tv_sec = UINT32_MAX; ts->tv_nsec = NSEC_PER_SEC - 1; - tmrinfo("max sec=%" PRId64 "\n", ts->tv_sec); - tmrinfo("max nsec=%" PRId32 "\n", ts->tv_nsec); + tmrinfo("max sec=%jd\n", (intmax_t)ts->tv_sec); + tmrinfo("max nsec=%ld\n", ts->tv_nsec); return OK; } diff --git a/arch/xtensa/src/esp32/esp32_tim.c b/arch/xtensa/src/esp32/esp32_tim.c index 4c07e91924656..f0740bcd7b746 100644 --- a/arch/xtensa/src/esp32/esp32_tim.c +++ b/arch/xtensa/src/esp32/esp32_tim.c @@ -351,10 +351,10 @@ static void esp32_tim_getcounter(struct esp32_tim_dev_s *dev, /* Read value */ value_32 = esp32_tim_getreg(dev, TIM_HI_OFFSET); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = esp32_tim_getreg(dev, TIM_LO_OFFSET); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } /**************************************************************************** @@ -420,10 +420,10 @@ static void esp32_tim_getalarmvalue(struct esp32_tim_dev_s *dev, /* Read value */ value_32 = esp32_tim_getreg(dev, TIMG_ALARM_HI_OFFSET); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = esp32_tim_getreg(dev, TIMG_ALARM_LO_OFFSET); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } /**************************************************************************** diff --git a/arch/xtensa/src/esp32s2/esp32s2_freerun.c b/arch/xtensa/src/esp32s2/esp32s2_freerun.c index 57ed96fbe1f97..2de1102e8d00a 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_freerun.c +++ b/arch/xtensa/src/esp32s2/esp32s2_freerun.c @@ -296,8 +296,8 @@ int esp32s2_freerun_counter(struct esp32s2_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo(" usec=%" PRIu64 " ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo(" usec=%" PRIu64 " ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/xtensa/src/esp32s2/esp32s2_oneshot.c b/arch/xtensa/src/esp32s2/esp32s2_oneshot.c index 2ee16c5722e4d..f820027eb8480 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_oneshot.c +++ b/arch/xtensa/src/esp32s2/esp32s2_oneshot.c @@ -263,9 +263,8 @@ int esp32s2_oneshot_start(struct esp32s2_oneshot_s *oneshot, uint64_t timeout_us; int ret = OK; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot != NULL); DEBUGASSERT(handler != NULL); DEBUGASSERT(ts != NULL); diff --git a/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c b/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c index d2de715a5f83a..c00f497a04f3b 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c +++ b/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c @@ -155,7 +155,7 @@ static int oneshot_lh_max_delay(struct oneshot_lowerhalf_s *lower, ts->tv_sec = UINT32_MAX; ts->tv_nsec = NSEC_PER_SEC - 1; - tmrinfo("max sec=%" PRId64 "\n", ts->tv_sec); + tmrinfo("max sec=%jd\n", (intmax_t)ts->tv_sec); tmrinfo("max nsec=%ld\n", ts->tv_nsec); return OK; diff --git a/arch/xtensa/src/esp32s2/esp32s2_tim.c b/arch/xtensa/src/esp32s2/esp32s2_tim.c index 96857be68c14c..5745e4dad338a 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_tim.c +++ b/arch/xtensa/src/esp32s2/esp32s2_tim.c @@ -487,10 +487,10 @@ static void esp32s2_tim_getcounter(struct esp32s2_tim_dev_s *dev, /* Read value */ value_32 = getreg32(SYSTIMER_VALUE_HI_REG); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(SYSTIMER_VALUE_LO_REG); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } else { @@ -503,10 +503,10 @@ static void esp32s2_tim_getcounter(struct esp32s2_tim_dev_s *dev, /* Read value */ value_32 = getreg32(TIMG_T0HI_REG(priv->gid)); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T0LO_REG(priv->gid)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } else { @@ -517,10 +517,10 @@ static void esp32s2_tim_getcounter(struct esp32s2_tim_dev_s *dev, /* Read value */ value_32 = getreg32(TIMG_T1HI_REG(priv->gid)); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T1LO_REG(priv->gid)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } } } @@ -639,28 +639,28 @@ static void esp32s2_tim_getalarmvalue(struct esp32s2_tim_dev_s *dev, if (priv->tid == SYSTIMER_COMP0) { value_32 = getreg32(SYSTIMER_TARGET0_HI_REG); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(SYSTIMER_TARGET0_LO_REG); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } else { if (priv->tid == TIMER0) { value_32 = getreg32(TIMG_T0ALARMHI_REG(priv->gid)); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T0ALARMLO_REG(priv->gid)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } else { value_32 = getreg32(TIMG_T1ALARMHI_REG(priv->gid)); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T1ALARMLO_REG(priv->gid)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } } } diff --git a/arch/xtensa/src/esp32s3/esp32s3_freerun.c b/arch/xtensa/src/esp32s3/esp32s3_freerun.c index d09e07b4ca23f..ea0bced848224 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_freerun.c +++ b/arch/xtensa/src/esp32s3/esp32s3_freerun.c @@ -315,8 +315,8 @@ int esp32s3_freerun_counter(struct esp32s3_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo(" usec=%" PRIu64 " ts=(%lu, %lu)\n", - usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo(" usec=%" PRIu64 " ts=(%jd, %ld)\n", + usec, (intmax_t)ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/xtensa/src/esp32s3/esp32s3_oneshot.c b/arch/xtensa/src/esp32s3/esp32s3_oneshot.c index ba45b5e2fdeda..53d2eee041425 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_oneshot.c +++ b/arch/xtensa/src/esp32s3/esp32s3_oneshot.c @@ -262,9 +262,8 @@ int esp32s3_oneshot_start(struct esp32s3_oneshot_s *oneshot, uint64_t timeout_us; int ret = OK; - tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", - handler, arg, (unsigned long)ts->tv_sec, - (unsigned long)ts->tv_nsec); + tmrinfo("handler=%p arg=%p, ts=(%jd, %ld)\n", + handler, arg, (intmax_t)ts->tv_sec, ts->tv_nsec); DEBUGASSERT(oneshot != NULL); DEBUGASSERT(handler != NULL); diff --git a/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c b/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c index ccc60ac5aaf14..ac0e81e7343a5 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c +++ b/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c @@ -155,7 +155,7 @@ static int oneshot_lh_max_delay(struct oneshot_lowerhalf_s *lower, ts->tv_sec = UINT32_MAX; ts->tv_nsec = NSEC_PER_SEC - 1; - tmrinfo("max sec=%" PRId64 "\n", ts->tv_sec); + tmrinfo("max sec=%jd\n", (intmax_t)ts->tv_sec); tmrinfo("max nsec=%ld\n", ts->tv_nsec); return OK; diff --git a/arch/xtensa/src/esp32s3/esp32s3_tickless.c b/arch/xtensa/src/esp32s3/esp32s3_tickless.c index d2dffcc9f2b44..3a3a1d7f5e7ef 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_tickless.c +++ b/arch/xtensa/src/esp32s3/esp32s3_tickless.c @@ -148,7 +148,7 @@ static inline uint64_t tickless_getcounter(void) } while (lo_start != lo); - counter = ((uint64_t) hi << 32) | lo; + counter = ((uint64_t)hi << 32) | lo; return counter; } @@ -171,7 +171,7 @@ static inline uint64_t tickless_getalarmvalue(void) { uint32_t hi = getreg32(SYSTIMER_TARGET0_HI_REG); uint32_t lo = getreg32(SYSTIMER_TARGET0_LO_REG); - uint64_t ticks = ((uint64_t) hi << 32) | lo; + uint64_t ticks = ((uint64_t)hi << 32) | lo; return ticks; } diff --git a/arch/xtensa/src/esp32s3/esp32s3_tim.c b/arch/xtensa/src/esp32s3/esp32s3_tim.c index 9e533b6d40d19..336d05c50f84f 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_tim.c +++ b/arch/xtensa/src/esp32s3/esp32s3_tim.c @@ -425,10 +425,10 @@ static void tim_getcounter(struct esp32s3_tim_dev_s *dev, uint64_t *value) /* Read value */ value_32 = getreg32(TIMG_T0HI_REG(priv->gid)); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T0LO_REG(priv->gid)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } else { @@ -439,10 +439,10 @@ static void tim_getcounter(struct esp32s3_tim_dev_s *dev, uint64_t *value) /* Read value */ value_32 = getreg32(TIMG_T1HI_REG(priv->gid)); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T1LO_REG(priv->gid)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } } @@ -545,18 +545,18 @@ static void tim_getalarmvalue(struct esp32s3_tim_dev_s *dev, uint64_t *value) if (priv->tid == ESP32S3_TIM_TIMER0) { value_32 = getreg32(TIMG_T0ALARMHI_REG(priv->gid)); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T0ALARMLO_REG(priv->gid)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } else { value_32 = getreg32(TIMG_T1ALARMHI_REG(priv->gid)); /* High 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; *value <<= SHIFT_32; value_32 = getreg32(TIMG_T1ALARMLO_REG(priv->gid)); /* Low 32 bits */ - *value |= (uint64_t)value_32; + *value |= value_32; } } diff --git a/crypto/random_pool.c b/crypto/random_pool.c index 2578edd391be5..71d68311a51cc 100644 --- a/crypto/random_pool.c +++ b/crypto/random_pool.c @@ -433,7 +433,7 @@ void up_rngaddentropy(enum rnd_source_t kindof, FAR const uint32_t *buf, */ clock_systime_timespec(&ts); - tbuf[0] = ROTL_32((uint32_t)ts.tv_nsec, 17) ^ ROTL_32(ts.tv_sec, 3); + tbuf[0] = ROTL_32(ts.tv_nsec, 17) ^ ROTL_32(ts.tv_sec, 3); tbuf[0] += ROTL_32(kindof, 27); tbuf[0] += ROTL_32((uintptr_t)&tbuf[0], 11); diff --git a/drivers/misc/optee_rpc.c b/drivers/misc/optee_rpc.c index e3e8c6e39a526..1307ec97c2446 100644 --- a/drivers/misc/optee_rpc.c +++ b/drivers/misc/optee_rpc.c @@ -80,8 +80,8 @@ static void optee_rpc_cmd_get_time(FAR struct optee_msg_arg *arg) return; } - arg->params[0].u.value.a = (uint32_t)ts.tv_sec; /* Seconds since epoch. */ - arg->params[0].u.value.b = (uint32_t)ts.tv_nsec; /* Nanoseconds. */ + arg->params[0].u.value.a = ts.tv_sec; /* Seconds since epoch. */ + arg->params[0].u.value.b = ts.tv_nsec; /* Nanoseconds. */ arg->ret = TEE_SUCCESS; } diff --git a/drivers/note/noteram_driver.c b/drivers/note/noteram_driver.c index e64a48e6d472d..ee5b471632002 100644 --- a/drivers/note/noteram_driver.c +++ b/drivers/note/noteram_driver.c @@ -817,9 +817,9 @@ static int noteram_dump_header(FAR struct lib_outstream_s *s, int cpu = 0; #endif - ret = lib_sprintf(s, "%8s-%-3u [%d] %3" PRIu64 ".%09ld: ", + ret = lib_sprintf(s, "%8s-%-3u [%d] %3jd.%09ld: ", note_get_taskname(pid, buf, TASK_NAME_SIZE), - get_pid(pid), cpu, ts.tv_sec, ts.tv_nsec); + get_pid(pid), cpu, (intmax_t)ts.tv_sec, ts.tv_nsec); return ret; } diff --git a/drivers/rpmsg/rpmsg_ping.c b/drivers/rpmsg/rpmsg_ping.c index 7784430e88577..b20ff0a1afccd 100644 --- a/drivers/rpmsg/rpmsg_ping.c +++ b/drivers/rpmsg/rpmsg_ping.c @@ -189,7 +189,8 @@ static void rpmsg_ping_logout(FAR const char *s, clock_t value) perf_convert(value, &ts); - syslog(LOG_EMERG, "%s: %" PRId64 " s, %ld ns\n", s, ts.tv_sec, ts.tv_nsec); + syslog(LOG_EMERG, "%s: %jd s, %ld ns\n", + s, (intmax_t)ts.tv_sec, ts.tv_nsec); } static void rpmsg_ping_logout_rate(uint64_t len, clock_t avg) diff --git a/drivers/sensors/mpl115a.c b/drivers/sensors/mpl115a.c index cb751ab305919..24cf7fa023c69 100644 --- a/drivers/sensors/mpl115a.c +++ b/drivers/sensors/mpl115a.c @@ -281,7 +281,7 @@ static int mpl115a_getpressure(FAR struct mpl115a_dev_s *priv) /* These code are from Freescale AN3785 */ c12x2 = ((int32_t)priv->mpl115a_cal_c12 * tadc) >> 11; - a1 = (int32_t) (priv->mpl115a_cal_b1 + c12x2); + a1 = (int32_t)(priv->mpl115a_cal_b1 + c12x2); a1x1 = a1 * padc; y1 = (((int32_t)priv->mpl115a_cal_a0) << 10) + a1x1; a2x2 = (((int32_t)priv->mpl115a_cal_b2) * tadc) >> 1; diff --git a/drivers/sensors/ms56xx_uorb.c b/drivers/sensors/ms56xx_uorb.c index fa2753e254029..ce464c10766dc 100644 --- a/drivers/sensors/ms56xx_uorb.c +++ b/drivers/sensors/ms56xx_uorb.c @@ -491,11 +491,11 @@ static int32_t ms56xx_compensate_temp(FAR struct ms56xx_dev_s *priv, /* dt = d1 - c5 * 256 */ - dt = temp_raw - ((int32_t) c->c5 << 8); + dt = temp_raw - ((int32_t)c->c5 << 8); /* temp = 2000 + (dt * c6) / 8388608 */ - temp = 2000 + (((int64_t) (dt * c->c6)) >> 23); + temp = 2000 + (((int64_t)(dt * c->c6)) >> 23); /* Save dt that will be used for pressure calibration */ @@ -535,8 +535,8 @@ static uint32_t ms56xx_compensate_press(FAR struct ms56xx_dev_s *priv, switch (priv->model) { case MS56XX_MODEL_MS5607: - off = ((int64_t) c->c2 << 17) + ((int64_t) (c->c4 * dt) >> 6); - sens = ((int64_t) c->c1 << 16) + ((int64_t) (c->c3 * dt) >> 7); + off = ((int64_t)c->c2 << 17) + ((int64_t)(c->c4 * dt) >> 6); + sens = ((int64_t)c->c1 << 16) + ((int64_t)(c->c3 * dt) >> 7); #if defined(CONFIG_MS56XX_SECOND_ORDER_COMPENSATE) if (*temp < 2000) { @@ -562,8 +562,8 @@ static uint32_t ms56xx_compensate_press(FAR struct ms56xx_dev_s *priv, break; case MS56XX_MODEL_MS5611: - off = ((int64_t) c->c2 << 16) + ((int64_t) (c->c4 * dt) >> 7); - sens = ((int64_t) c->c1 << 15) + ((int64_t) (c->c3 * dt) >> 8); + off = ((int64_t)c->c2 << 16) + ((int64_t)(c->c4 * dt) >> 7); + sens = ((int64_t)c->c1 << 15) + ((int64_t)(c->c3 * dt) >> 8); #if defined(CONFIG_MS56XX_SECOND_ORDER_COMPENSATE) if (*temp < 2000) { diff --git a/drivers/sensors/scd30.c b/drivers/sensors/scd30.c index 3cee8495bedb2..2372b8e308489 100644 --- a/drivers/sensors/scd30.c +++ b/drivers/sensors/scd30.c @@ -440,12 +440,12 @@ static bool has_time_passed(struct timespec curr, struct timespec start, unsigned int secs_since_start) { - if ((long)((start.tv_sec + secs_since_start) - curr.tv_sec) == 0) + if ((start.tv_sec + secs_since_start) - curr.tv_sec == 0) { return start.tv_nsec <= curr.tv_nsec; } - return (long)((start.tv_sec + secs_since_start) - curr.tv_sec) <= 0; + return (start.tv_sec + secs_since_start) - curr.tv_sec <= 0; } /**************************************************************************** diff --git a/drivers/sensors/scd41.c b/drivers/sensors/scd41.c index 1127af0d4e710..e091274460240 100644 --- a/drivers/sensors/scd41.c +++ b/drivers/sensors/scd41.c @@ -430,12 +430,12 @@ static bool has_time_passed(struct timespec curr, struct timespec start, unsigned int secs_since_start) { - if ((long)((start.tv_sec + secs_since_start) - curr.tv_sec) == 0) + if ((start.tv_sec + secs_since_start) - curr.tv_sec == 0) { return start.tv_nsec <= curr.tv_nsec; } - return (long)((start.tv_sec + secs_since_start) - curr.tv_sec) <= 0; + return (start.tv_sec + secs_since_start) - curr.tv_sec <= 0; } /**************************************************************************** diff --git a/drivers/sensors/sgp30.c b/drivers/sensors/sgp30.c index c075566324a7b..d86565d48cf8a 100644 --- a/drivers/sensors/sgp30.c +++ b/drivers/sensors/sgp30.c @@ -460,12 +460,12 @@ static bool has_time_passed(FAR struct timespec *curr, FAR struct timespec *start, unsigned int secs_since_start) { - if ((long)((start->tv_sec + secs_since_start) - curr->tv_sec) == 0) + if ((start->tv_sec + secs_since_start) - curr->tv_sec == 0) { return start->tv_nsec <= curr->tv_nsec; } - return (long)((start->tv_sec + secs_since_start) - curr->tv_sec) <= 0; + return (start->tv_sec + secs_since_start) - curr->tv_sec <= 0; } /**************************************************************************** @@ -485,7 +485,7 @@ static bool time_has_passed_ms(FAR struct timespec *curr, if (start->tv_sec < curr->tv_sec) { - curr_msec += 1000 * ((long)(curr->tv_sec - start->tv_sec)); + curr_msec += 1000 * (curr->tv_sec - start->tv_sec); } return (start_msec + msecs_since_start) <= curr_msec; @@ -773,7 +773,7 @@ static ssize_t sgp30_read(FAR struct file *filep, FAR char *buffer, ts_sleep.tv_nsec += NSEC_PER_SEC; } - if ((long)ts_sleep.tv_sec >= 0) + if (ts_sleep.tv_sec >= 0) { ret = nxsig_nanosleep(&ts_sleep, NULL); if (ret == -EINTR) diff --git a/drivers/sensors/sht21.c b/drivers/sensors/sht21.c index c3213b5d280e4..1a9b7f0d9a0f6 100644 --- a/drivers/sensors/sht21.c +++ b/drivers/sensors/sht21.c @@ -263,12 +263,12 @@ static bool has_time_passed(struct timespec curr, struct timespec start, unsigned int secs_since_start) { - if ((long)((start.tv_sec + secs_since_start) - curr.tv_sec) == 0) + if ((start.tv_sec + secs_since_start) - curr.tv_sec == 0) { return start.tv_nsec <= curr.tv_nsec; } - return (long)((start.tv_sec + secs_since_start) - curr.tv_sec) <= 0; + return (start.tv_sec + secs_since_start) - curr.tv_sec <= 0; } /**************************************************************************** diff --git a/drivers/sensors/sht4x_uorb.c b/drivers/sensors/sht4x_uorb.c index 57265d452c85f..75d22b216e22e 100644 --- a/drivers/sensors/sht4x_uorb.c +++ b/drivers/sensors/sht4x_uorb.c @@ -523,12 +523,12 @@ static int sht4x_read(FAR struct sht4x_dev_s *priv, static bool has_time_passed(struct timespec curr, struct timespec start, unsigned int secs_since_start) { - if ((long)((start.tv_sec + secs_since_start) - curr.tv_sec) == 0) + if ((start.tv_sec + secs_since_start) - curr.tv_sec == 0) { return start.tv_nsec <= curr.tv_nsec; } - return (long)((start.tv_sec + secs_since_start) - curr.tv_sec) <= 0; + return (start.tv_sec + secs_since_start) - curr.tv_sec <= 0; } /**************************************************************************** diff --git a/drivers/sensors/sps30.c b/drivers/sensors/sps30.c index 960f808718b4d..883531b4677c6 100644 --- a/drivers/sensors/sps30.c +++ b/drivers/sensors/sps30.c @@ -452,12 +452,12 @@ static bool has_time_passed(struct timespec curr, struct timespec start, unsigned int secs_since_start) { - if ((long)((start.tv_sec + secs_since_start) - curr.tv_sec) == 0) + if ((start.tv_sec + secs_since_start) - curr.tv_sec == 0) { return start.tv_nsec <= curr.tv_nsec; } - return (long)((start.tv_sec + secs_since_start) - curr.tv_sec) <= 0; + return (start.tv_sec + secs_since_start) - curr.tv_sec <= 0; } /**************************************************************************** diff --git a/drivers/sensors/t67xx.c b/drivers/sensors/t67xx.c index a5750e31a817b..f74308e24f75f 100644 --- a/drivers/sensors/t67xx.c +++ b/drivers/sensors/t67xx.c @@ -406,12 +406,12 @@ static bool has_time_passed(struct timespec curr, struct timespec start, unsigned int secs_since_start) { - if ((long)((start.tv_sec + secs_since_start) - curr.tv_sec) == 0) + if ((start.tv_sec + secs_since_start) - curr.tv_sec == 0) { return start.tv_nsec <= curr.tv_nsec; } - return (long)((start.tv_sec + secs_since_start) - curr.tv_sec) <= 0; + return (start.tv_sec + secs_since_start) - curr.tv_sec <= 0; } /**************************************************************************** diff --git a/drivers/syslog/vsyslog.c b/drivers/syslog/vsyslog.c index b930245a95ee4..668d70d8298e7 100644 --- a/drivers/syslog/vsyslog.c +++ b/drivers/syslog/vsyslog.c @@ -168,9 +168,9 @@ int nx_vsyslog(int priority, FAR const IPTR char *fmt, FAR va_list *ap) # endif # else # if defined(CONFIG_SYSLOG_TIMESTAMP_MS) - "[%5ju.%03ld] " + "[%5jd.%03ld] " # else - "[%5ju.%06ld] " + "[%5jd.%06ld] " # endif # endif #endif @@ -216,10 +216,10 @@ int nx_vsyslog(int priority, FAR const IPTR char *fmt, FAR va_list *ap) # endif # else # if defined(CONFIG_SYSLOG_TIMESTAMP_MS) - , (uintmax_t)ts.tv_sec + , (intmax_t)ts.tv_sec , ts.tv_nsec / NSEC_PER_MSEC # else - , (uintmax_t)ts.tv_sec + , (intmax_t)ts.tv_sec , ts.tv_nsec / NSEC_PER_USEC # endif # endif diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c index 21b4d2b2f9e26..eeec87bbb397c 100644 --- a/drivers/timers/ds3231.c +++ b/drivers/timers/ds3231.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -405,7 +406,7 @@ int up_rtc_settime(FAR const struct timespec *tp) return -EAGAIN; } - rtcinfo("Setting time tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec); + rtcinfo("Setting time tp=(%jd,%ld)\n", (intmax_t)tp->tv_sec, tp->tv_nsec); /* Get the broken out time */ diff --git a/drivers/timers/mcp794xx.c b/drivers/timers/mcp794xx.c index 7d4d786ec7357..872ccfba25b1e 100644 --- a/drivers/timers/mcp794xx.c +++ b/drivers/timers/mcp794xx.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -498,7 +499,7 @@ int up_rtc_settime(FAR const struct timespec *tp) return -EAGAIN; } - rtcinfo("Setting time tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec); + rtcinfo("Setting time tp=(%jd,%ld)\n", (intmax_t)tp->tv_sec, tp->tv_nsec); /* Get the broken out time */ diff --git a/drivers/timers/ptp_clock_dummy.c b/drivers/timers/ptp_clock_dummy.c index 80eacb3fb4cf7..fa5fe569769a3 100644 --- a/drivers/timers/ptp_clock_dummy.c +++ b/drivers/timers/ptp_clock_dummy.c @@ -24,6 +24,8 @@ #include +#include + #include #include @@ -116,8 +118,8 @@ static int ptp_clock_dummy_gettime(FAR struct ptp_lowerhalf_s *lower, sts->post_ts.tv_nsec = ts->tv_nsec; } - ptpinfo("ptp_clock_dummy_gettime sec:%ld, nsec:%ld\n", ts->tv_sec, - ts->tv_nsec); + ptpinfo("ptp_clock_dummy_gettime sec:%jd, nsec:%ld\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); return 0; } @@ -144,16 +146,16 @@ ptp_clock_dummy_getcrosststamp(FAR struct ptp_lowerhalf_s *lower, cts->monoraw.tv_sec = ts.tv_sec; cts->monoraw.tv_nsec = ts.tv_sec; - ptpinfo("ptp_clock_dummy_getcrosststamp sec:%ld, nsec:%ld\n", - (long)ts.tv_sec, ts.tv_nsec); + ptpinfo("ptp_clock_dummy_getcrosststamp sec:%jd, nsec:%ld\n", + (intmax_t)ts.tv_sec, ts.tv_nsec); return 0; } static int ptp_clock_dummy_settime(FAR struct ptp_lowerhalf_s *lower, FAR const struct timespec *ts) { - ptpinfo("ptp_clock_dummy_settime sec:%ld, nsec:%ld\n", (long)ts->tv_sec, - ts->tv_nsec); + ptpinfo("ptp_clock_dummy_settime sec:%jd, nsec:%ld\n", + (intmax_t)ts->tv_sec, ts->tv_nsec); return 0; } diff --git a/drivers/timers/rx8010.c b/drivers/timers/rx8010.c index b4189b663e787..b605a6215230e 100644 --- a/drivers/timers/rx8010.c +++ b/drivers/timers/rx8010.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -393,7 +394,7 @@ int up_rtc_settime(FAR const struct timespec *tp) return -EAGAIN; } - rtcinfo("Setting time tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec); + rtcinfo("Setting time tp=(%jd,%ld)\n", (intmax_t)tp->tv_sec, tp->tv_nsec); /* Get the broken out time */ diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c index 9d97fe87fdfe0..1efcc009b5382 100644 --- a/fs/fat/fs_fat32util.c +++ b/fs/fat/fs_fat32util.c @@ -390,7 +390,7 @@ uint32_t fat_systime2fattime(void) { /* Break done the seconds in date and time units */ - if (gmtime_r((FAR const time_t *)&ts.tv_sec, &tm) != NULL) + if (gmtime_r(&ts.tv_sec, &tm) != NULL) { /* FAT can only represent dates since 1980. struct tm can * represent dates since 1900. diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c index c9912d6d2492d..1914b2d2bd913 100644 --- a/fs/nfs/nfs_vfsops.c +++ b/fs/nfs/nfs_vfsops.c @@ -2420,11 +2420,11 @@ static int nfs_statfs(FAR struct inode *mountpt, FAR struct statfs *sbp) sfp = (FAR struct rpc_reply_fsstat *)nmp->nm_iobuffer; sbp->f_bsize = NFS_FABLKSIZE; tquad = fxdr_hyper(&sfp->fsstat.sf_tbytes); - sbp->f_blocks = tquad / (uint64_t) NFS_FABLKSIZE; + sbp->f_blocks = tquad / NFS_FABLKSIZE; tquad = fxdr_hyper(&sfp->fsstat.sf_fbytes); - sbp->f_bfree = tquad / (uint64_t) NFS_FABLKSIZE; + sbp->f_bfree = tquad / NFS_FABLKSIZE; tquad = fxdr_hyper(&sfp->fsstat.sf_abytes); - sbp->f_bavail = tquad / (uint64_t) NFS_FABLKSIZE; + sbp->f_bavail = tquad / NFS_FABLKSIZE; tquad = fxdr_hyper(&sfp->fsstat.sf_tfiles); sbp->f_files = tquad; tquad = fxdr_hyper(&sfp->fsstat.sf_ffiles); diff --git a/fs/procfs/fs_procfscritmon.c b/fs/procfs/fs_procfscritmon.c index e2681b48f38e0..a87b2fc6a7c72 100644 --- a/fs/procfs/fs_procfscritmon.c +++ b/fs/procfs/fs_procfscritmon.c @@ -235,9 +235,9 @@ static ssize_t critmon_read_cpu(FAR struct critmon_file_s *attr, /* Generate output for maximum time pre-emption disabled */ - linesize = procfs_snprintf(attr->line, CRITMON_LINELEN, ",%lu.%09lu", - (unsigned long)maxtime.tv_sec, - (unsigned long)maxtime.tv_nsec); + linesize = procfs_snprintf(attr->line, CRITMON_LINELEN, ",%jd.%09ld", + (intmax_t)maxtime.tv_sec, + maxtime.tv_nsec); copysize = procfs_memcpy(attr->line, linesize, buffer, buflen, offset); totalsize += copysize; @@ -269,9 +269,9 @@ static ssize_t critmon_read_cpu(FAR struct critmon_file_s *attr, /* Generate output for maximum time in a critical section */ - linesize = procfs_snprintf(attr->line, CRITMON_LINELEN, ",%lu.%09lu", - (unsigned long)maxtime.tv_sec, - (unsigned long)maxtime.tv_nsec); + linesize = procfs_snprintf(attr->line, CRITMON_LINELEN, ",%jd.%09ld", + (intmax_t)maxtime.tv_sec, + maxtime.tv_nsec); copysize = procfs_memcpy(attr->line, linesize, buffer, buflen, offset); totalsize += copysize; @@ -303,9 +303,9 @@ static ssize_t critmon_read_cpu(FAR struct critmon_file_s *attr, /* Generate output for max busywait time to enter csection(get spinlock) */ - linesize = procfs_snprintf(attr->line, CRITMON_LINELEN, ",%lu.%09lu", - (unsigned long)maxtime.tv_sec, - (unsigned long)maxtime.tv_nsec); + linesize = procfs_snprintf(attr->line, CRITMON_LINELEN, ",%jd.%09ld", + (intmax_t)maxtime.tv_sec, + maxtime.tv_nsec); copysize = procfs_memcpy(attr->line, linesize, buffer, buflen, offset); totalsize += copysize; @@ -335,10 +335,10 @@ static ssize_t critmon_read_cpu(FAR struct critmon_file_s *attr, /* Generate output for all busywait time to enter csection(get spinlock) */ - linesize = procfs_snprintf(attr->line, CRITMON_LINELEN, ",%lu.%09lu %2" + linesize = procfs_snprintf(attr->line, CRITMON_LINELEN, ",%jd.%09ld %2" PRId32 ".%04" PRId32 "%%", - (unsigned long)all_time.tv_sec, - (unsigned long)all_time.tv_nsec, + (intmax_t)all_time.tv_sec, + all_time.tv_nsec, rate / 10000, rate % 10000); copysize = procfs_memcpy(attr->line, linesize, buffer, buflen, offset); diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c index 2cbf357ebbc21..53398931fa6ce 100644 --- a/fs/procfs/fs_procfsproc.c +++ b/fs/procfs/fs_procfsproc.c @@ -791,9 +791,9 @@ static ssize_t proc_critmon(FAR struct proc_file_s *procfile, /* Generate output for maximum time pre-emption disabled */ - linesize = procfs_snprintf(procfile->line, STATUS_LINELEN, "%lu.%09lu %p,", - (unsigned long)maxtime.tv_sec, - (unsigned long)maxtime.tv_nsec, + linesize = procfs_snprintf(procfile->line, STATUS_LINELEN, "%jd.%09ld %p,", + (intmax_t)maxtime.tv_sec, + maxtime.tv_nsec, tcb->preemp_max_caller); copysize = procfs_memcpy(procfile->line, linesize, buffer, remaining, &offset); @@ -827,9 +827,9 @@ static ssize_t proc_critmon(FAR struct proc_file_s *procfile, /* Generate output for maximum time in a critical section */ - linesize = procfs_snprintf(procfile->line, STATUS_LINELEN, "%lu.%09lu %p,", - (unsigned long)maxtime.tv_sec, - (unsigned long)maxtime.tv_nsec, + linesize = procfs_snprintf(procfile->line, STATUS_LINELEN, "%jd.%09ld %p,", + (intmax_t)maxtime.tv_sec, + maxtime.tv_nsec, tcb->crit_max_caller); copysize = procfs_memcpy(procfile->line, linesize, buffer, remaining, &offset); @@ -863,9 +863,9 @@ static ssize_t proc_critmon(FAR struct proc_file_s *procfile, /* Generate output for max busywait time */ - linesize = procfs_snprintf(procfile->line, STATUS_LINELEN, "%lu.%09lu %p,", - (unsigned long)maxtime.tv_sec, - (unsigned long)maxtime.tv_nsec, + linesize = procfs_snprintf(procfile->line, STATUS_LINELEN, "%jd.%09ld %p,", + (intmax_t)maxtime.tv_sec, + maxtime.tv_nsec, tcb->busywait_max_caller); copysize = procfs_memcpy(procfile->line, linesize, buffer, remaining, &offset); @@ -891,9 +891,9 @@ static ssize_t proc_critmon(FAR struct proc_file_s *procfile, /* Generate output for all busywait time */ - linesize = procfs_snprintf(procfile->line, STATUS_LINELEN, "%lu.%09lu,", - (unsigned long)maxtime.tv_sec, - (unsigned long)maxtime.tv_nsec); + linesize = procfs_snprintf(procfile->line, STATUS_LINELEN, "%jd.%09ld,", + (intmax_t)maxtime.tv_sec, + maxtime.tv_nsec); copysize = procfs_memcpy(procfile->line, linesize, buffer, remaining, &offset); @@ -929,11 +929,11 @@ static ssize_t proc_critmon(FAR struct proc_file_s *procfile, */ linesize = procfs_snprintf(procfile->line, STATUS_LINELEN, - "%lu.%09lu,%lu.%09lu\n", - (unsigned long)maxtime.tv_sec, - (unsigned long)maxtime.tv_nsec, - (unsigned long)runtime.tv_sec, - (unsigned long)(runtime.tv_nsec)); + "%jd.%09ld,%jd.%09ld\n", + (intmax_t)maxtime.tv_sec, + maxtime.tv_nsec, + (intmax_t)runtime.tv_sec, + runtime.tv_nsec); copysize = procfs_memcpy(procfile->line, linesize, buffer, remaining, &offset); diff --git a/libs/libc/time/lib_gethrtime.c b/libs/libc/time/lib_gethrtime.c index 930a8ebcafb7c..41be074815b2c 100644 --- a/libs/libc/time/lib_gethrtime.c +++ b/libs/libc/time/lib_gethrtime.c @@ -49,5 +49,5 @@ hrtime_t gethrtime(void) struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); - return (hrtime_t)1000000000 * ts.tv_sec + ts.tv_nsec; + return 1000000000 * ts.tv_sec + ts.tv_nsec; } diff --git a/mm/ubsan/ubsan.c b/mm/ubsan/ubsan.c index 63d8ee10511b4..f0b2944a04e0c 100644 --- a/mm/ubsan/ubsan.c +++ b/mm/ubsan/ubsan.c @@ -161,8 +161,7 @@ static int64_t get_signed_val(FAR struct type_descriptor *type, uint64_t mask = (1llu << bits) - 1; uint64_t ret = (uintptr_t)val & mask; - return (int64_t)(((ret & (1llu << (bits - 1))) != 0) ? - ret | ~mask : ret); + return ret & (1llu << (bits - 1)) != 0 ? ret | ~mask : ret; } return *(FAR int64_t *)val; diff --git a/sched/clock/clock_adjtime.c b/sched/clock/clock_adjtime.c index 0ab524fc5c9fb..b18ec32117040 100644 --- a/sched/clock/clock_adjtime.c +++ b/sched/clock/clock_adjtime.c @@ -202,7 +202,7 @@ int adjtime(FAR const struct timeval *delta, FAR struct timeval *olddelta) if (delta) { - adjust_usec = (long long)delta->tv_sec * USEC_PER_SEC + delta->tv_usec; + adjust_usec = delta->tv_sec * USEC_PER_SEC + delta->tv_usec; ret = adjtime_start(adjust_usec); } diff --git a/sched/clock/clock_getres.c b/sched/clock/clock_getres.c index 1348e93a0ccb1..53c88d57cd081 100644 --- a/sched/clock/clock_getres.c +++ b/sched/clock/clock_getres.c @@ -71,8 +71,8 @@ int clock_getres(clockid_t clock_id, struct timespec *res) res->tv_sec = 0; res->tv_nsec = NSEC_PER_TICK; - sinfo("Returning res=(%d,%d)\n", (int)res->tv_sec, - (int)res->tv_nsec); + sinfo("Returning res=(%jd,%ld)\n", + (intmax_t)res->tv_sec, res->tv_nsec); break; #ifdef CONFIG_PTP_CLOCK From 66ebf02454be750908a82b166a7589933f4ce977 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 4 May 2026 00:52:21 +0800 Subject: [PATCH 7/8] arch/esp32: Fix conflicting types for '_times_r' D:/a/nuttx/nuttx/sources/nuttx/arch/risc-v/src/common/espressif/esp_libc_stubs.c:131:9: error: conflicting types for '_times_r'; have 'clock_t(struct _reent *, struct tms *)' {aka 'long long int(struct _reent *, struct tms *)'} 131 | clock_t _times_r(struct _reent *r, struct tms *buf) | ^~~~~~~~ In file included from D:/a/nuttx/nuttx/sources/nuttx/build/arch/risc-v/src/common/espressif/esp-hal-3rdparty/components/esp_rom/esp32c3/include/esp32c3/rom/libc_stubs.h:15, from D:/a/nuttx/nuttx/sources/nuttx/arch/risc-v/src/common/espressif/esp_libc_stubs.c:44: D:/a/nuttx/nuttx/sources/tools/riscv-none-elf-gcc/riscv-none-elf/include/reent.h:156:18: note: previous declaration of '_times_r' with type 'long unsigned int(struct _reent *, struct tms *)' 156 | extern _CLOCK_T_ _times_r (struct _reent *, struct tms *); | ^~~~~~~~ Signed-off-by: Xiang Xiao --- arch/risc-v/src/common/espressif/esp_libc_stubs.c | 12 ++++++++++-- arch/risc-v/src/esp32c3-legacy/esp32c3_libc_stubs.c | 2 +- .../src/esp32c3-legacy/rom/esp32c3_libc_stubs.h | 2 +- arch/xtensa/src/esp32/esp32_libc_stubs.c | 2 +- arch/xtensa/src/esp32/rom/esp32_libc_stubs.h | 2 +- arch/xtensa/src/esp32s2/esp32s2_libc_stubs.c | 2 +- arch/xtensa/src/esp32s2/rom/esp32s2_libc_stubs.h | 2 +- arch/xtensa/src/esp32s3/esp32s3_libc_stubs.c | 2 +- arch/xtensa/src/esp32s3/rom/esp32s3_libc_stubs.h | 2 +- 9 files changed, 18 insertions(+), 10 deletions(-) diff --git a/arch/risc-v/src/common/espressif/esp_libc_stubs.c b/arch/risc-v/src/common/espressif/esp_libc_stubs.c index 5cfd85ccff766..307a2d78bfdd6 100644 --- a/arch/risc-v/src/common/espressif/esp_libc_stubs.c +++ b/arch/risc-v/src/common/espressif/esp_libc_stubs.c @@ -128,7 +128,7 @@ int _stat_r(struct _reent *r, const char *pathname, struct stat *statbuf) return nx_stat(pathname, statbuf, 1); } -clock_t _times_r(struct _reent *r, struct tms *buf) +unsigned long _times_r(struct _reent *r, struct tms *buf) { return times(buf); } @@ -374,7 +374,15 @@ static const struct syscall_stub_table g_stub_table = ._abort = &_abort, ._system_r = &_system_r, ._rename_r = &_rename_r, - ._times_r = &_times_r, + + /* The vendor ROM header declares ._times_r as 'clock_t (*)(...)' while + * newlib's prototypes _times_r() as returning 'unsigned long'. + * Since clock_t is now int64_t in NuttX, the two no longer match. Cast + * here to silence -Wincompatible-pointer-types; the ROM only ever reads + * the low bits, so the truncation is harmless. + */ + + ._times_r = (clock_t (*)(struct _reent *, struct tms *))&_times_r, ._gettimeofday_r = &_gettimeofday_r, ._raise_r = &_raise_r, ._unlink_r = &_unlink_r, diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_libc_stubs.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_libc_stubs.c index b5afe3f934069..56ee3506cb4e7 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_libc_stubs.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_libc_stubs.c @@ -121,7 +121,7 @@ int _stat_r(struct _reent *r, const char *pathname, struct stat *statbuf) return nx_stat(pathname, statbuf, 1); } -clock_t _times_r(struct _reent *r, struct tms *buf) +unsigned long _times_r(struct _reent *r, struct tms *buf) { return times(buf); } diff --git a/arch/risc-v/src/esp32c3-legacy/rom/esp32c3_libc_stubs.h b/arch/risc-v/src/esp32c3-legacy/rom/esp32c3_libc_stubs.h index 82d9c6a3296c6..b618e086d0eb6 100644 --- a/arch/risc-v/src/esp32c3-legacy/rom/esp32c3_libc_stubs.h +++ b/arch/risc-v/src/esp32c3-legacy/rom/esp32c3_libc_stubs.h @@ -56,7 +56,7 @@ struct syscall_stub_table void (* _abort)(void); int (* _system_r)(struct _reent *r, const char *); int (* _rename_r)(struct _reent *r, const char *, const char *); - clock_t (* _times_r)(struct _reent *r, struct tms *); + unsigned long (* _times_r)(struct _reent *r, struct tms *); int (* _gettimeofday_r) (struct _reent *r, struct timeval *, void *); void (* _raise_r)(struct _reent *r); int (* _unlink_r)(struct _reent *r, const char *); diff --git a/arch/xtensa/src/esp32/esp32_libc_stubs.c b/arch/xtensa/src/esp32/esp32_libc_stubs.c index 6adf18af0a186..7c69d40aa8c35 100644 --- a/arch/xtensa/src/esp32/esp32_libc_stubs.c +++ b/arch/xtensa/src/esp32/esp32_libc_stubs.c @@ -114,7 +114,7 @@ int _stat_r(struct _reent *r, const char *pathname, struct stat *statbuf) return nx_stat(pathname, statbuf, 1); } -clock_t _times_r(struct _reent *r, struct tms *buf) +unsigned long _times_r(struct _reent *r, struct tms *buf) { return times(buf); } diff --git a/arch/xtensa/src/esp32/rom/esp32_libc_stubs.h b/arch/xtensa/src/esp32/rom/esp32_libc_stubs.h index 5ad98d3e4d8d7..4c96cb736e24d 100644 --- a/arch/xtensa/src/esp32/rom/esp32_libc_stubs.h +++ b/arch/xtensa/src/esp32/rom/esp32_libc_stubs.h @@ -72,7 +72,7 @@ struct syscall_stub_table void (* _abort)(void); int (* _system_r)(struct _reent *r, const char *); int (* _rename_r)(struct _reent *r, const char *, const char *); - clock_t (* _times_r)(struct _reent *r, struct tms *); + unsigned long (* _times_r)(struct _reent *r, struct tms *); int (* _gettimeofday_r) (struct _reent *r, struct timeval *, void *); void (* _raise_r)(struct _reent *r); int (* _unlink_r)(struct _reent *r, const char *); diff --git a/arch/xtensa/src/esp32s2/esp32s2_libc_stubs.c b/arch/xtensa/src/esp32s2/esp32s2_libc_stubs.c index 9c61f6ef4f87a..22b7b0b268da9 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_libc_stubs.c +++ b/arch/xtensa/src/esp32s2/esp32s2_libc_stubs.c @@ -114,7 +114,7 @@ int _stat_r(struct _reent *r, const char *pathname, struct stat *statbuf) return nx_stat(pathname, statbuf, 1); } -clock_t _times_r(struct _reent *r, struct tms *buf) +unsigned long _times_r(struct _reent *r, struct tms *buf) { return times(buf); } diff --git a/arch/xtensa/src/esp32s2/rom/esp32s2_libc_stubs.h b/arch/xtensa/src/esp32s2/rom/esp32s2_libc_stubs.h index fa6d95de4c0ca..2afdeb46ade9e 100644 --- a/arch/xtensa/src/esp32s2/rom/esp32s2_libc_stubs.h +++ b/arch/xtensa/src/esp32s2/rom/esp32s2_libc_stubs.h @@ -72,7 +72,7 @@ struct syscall_stub_table void (* _abort)(void); int (* _system_r)(struct _reent *r, const char *); int (* _rename_r)(struct _reent *r, const char *, const char *); - clock_t (* _times_r)(struct _reent *r, struct tms *); + unsigned long (* _times_r)(struct _reent *r, struct tms *); int (* _gettimeofday_r) (struct _reent *r, struct timeval *, void *); void (* _raise_r)(struct _reent *r); int (* _unlink_r)(struct _reent *r, const char *); diff --git a/arch/xtensa/src/esp32s3/esp32s3_libc_stubs.c b/arch/xtensa/src/esp32s3/esp32s3_libc_stubs.c index 0efe020acc895..690798e779a8b 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_libc_stubs.c +++ b/arch/xtensa/src/esp32s3/esp32s3_libc_stubs.c @@ -116,7 +116,7 @@ int _stat_r(struct _reent *r, const char *pathname, struct stat *statbuf) return nx_stat(pathname, statbuf, 1); } -clock_t _times_r(struct _reent *r, struct tms *buf) +unsigned long _times_r(struct _reent *r, struct tms *buf) { return times(buf); } diff --git a/arch/xtensa/src/esp32s3/rom/esp32s3_libc_stubs.h b/arch/xtensa/src/esp32s3/rom/esp32s3_libc_stubs.h index c7cc0cb327d17..4813f70e879a9 100644 --- a/arch/xtensa/src/esp32s3/rom/esp32s3_libc_stubs.h +++ b/arch/xtensa/src/esp32s3/rom/esp32s3_libc_stubs.h @@ -71,7 +71,7 @@ struct syscall_stub_table void (* _abort)(void); int (* _system_r)(struct _reent *r, const char *); int (* _rename_r)(struct _reent *r, const char *, const char *); - clock_t (* _times_r)(struct _reent *r, struct tms *); + unsigned long (* _times_r)(struct _reent *r, struct tms *); int (* _gettimeofday_r) (struct _reent *r, struct timeval *, void *); void (* _raise_r)(struct _reent *r); int (* _unlink_r)(struct _reent *r, const char *); From e90b199740917979d9f27170c1ae88d457a89d65 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Fri, 15 May 2026 02:27:36 +0800 Subject: [PATCH 8/8] board: enable LTO on g431 nsh boards and fix LTO link with toolchain switch For boards b-g431b-esc1/nsh, nucleo-g431kb/nsh and nucleo-g431rb/nsh, the `.data` section of nuttx.elf overflows the 128 KB flash region by a few hundred bytes on default GNU EABI builds: arm-none-eabi-ld: nuttx section `.data' will not fit in region `flash' arm-none-eabi-ld: region `flash' overflowed by 296 bytes Enabling CONFIG_LTO_FULL=y in the corresponding defconfigs brings flash usage back below the 128 KB limit (~93%). Additionally, fix arch/arm/src/cmake/gcc.cmake so that when LTO is enabled it always uses the gcc-ar / gcc-nm / gcc-ranlib wrappers, not just when CONFIG_ARM_TOOLCHAIN_GNU_EABI is also set. CI tooling (via tools/testbuild.sh) configures cmake first, then flips the toolchain choice in .config with kconfig-tweak before running `cmake --build`. With the previous "ARM_TOOLCHAIN_GNU_EABI && !LTO_NONE" guard the regen step would switch to plain `ar` for the .a files, even though the linker driver picked at configure time is still arm-none-eabi-g++ and the object files contain GCC LTO IR. The result was a flood of "undefined reference to `printf' / `free' / `puts' ..." link errors when running tools/testbuild.sh -A -N -R on the *_CLANG variants. Now that we are inside gcc.cmake the toolchain is unambiguously GCC, so dropping the redundant CONFIG_ARM_TOOLCHAIN_GNU_EABI conjunct keeps the LTO-aware ar wrappers in place across kconfig-tweak toolchain switches. Signed-off-by: Xiang Xiao --- boards/arm/stm32/b-g431b-esc1/configs/nsh/defconfig | 1 + boards/arm/stm32/nucleo-g431kb/configs/nsh/defconfig | 1 + boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig | 1 + boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig | 8 ++------ tools/ci/testlist/arm-09.dat | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/boards/arm/stm32/b-g431b-esc1/configs/nsh/defconfig b/boards/arm/stm32/b-g431b-esc1/configs/nsh/defconfig index a1215260ffc52..7008df0865512 100644 --- a/boards/arm/stm32/b-g431b-esc1/configs/nsh/defconfig +++ b/boards/arm/stm32/b-g431b-esc1/configs/nsh/defconfig @@ -26,6 +26,7 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LINE_MAX=64 +CONFIG_LTO_FULL=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y diff --git a/boards/arm/stm32/nucleo-g431kb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-g431kb/configs/nsh/defconfig index 413ff8b06f373..2470af3cfacf1 100644 --- a/boards/arm/stm32/nucleo-g431kb/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-g431kb/configs/nsh/defconfig @@ -25,6 +25,7 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LINE_MAX=64 +CONFIG_LTO_FULL=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y diff --git a/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig index 6b2c0c9aa2156..b28e171393d61 100644 --- a/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig @@ -26,6 +26,7 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y CONFIG_LINE_MAX=64 +CONFIG_LTO_FULL=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y diff --git a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig index 86a3bdafa7d8e..267ca41317119 100644 --- a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig @@ -16,10 +16,9 @@ CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=4531 -CONFIG_DISABLE_ENVIRON=y -CONFIG_DISABLE_MQUEUE_SYSV=y +CONFIG_DEFAULT_SMALL=y +CONFIG_FILE_STREAM=y CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_LINE_MAX=64 CONFIG_LTO_FULL=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y @@ -35,9 +34,6 @@ CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/tools/ci/testlist/arm-09.dat b/tools/ci/testlist/arm-09.dat index f3af9f5162ce7..cd9c27d5fdb28 100644 --- a/tools/ci/testlist/arm-09.dat +++ b/tools/ci/testlist/arm-09.dat @@ -2,7 +2,7 @@ /arm/stm32/nucleo-f4*,CONFIG_ARM_TOOLCHAIN_CLANG -/arm/stm32/nucleo-g*,CONFIG_ARM_TOOLCHAIN_CLANG +/arm/stm32/nucleo-g*,CONFIG_ARM_TOOLCHAIN_GNU_EABI /arm/stm32/nucleo-l*,CONFIG_ARM_TOOLCHAIN_CLANG