diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c index 3bd1cb362b6..6bffffb15b1 100644 --- a/drivers/flash/spi_nor.c +++ b/drivers/flash/spi_nor.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "spi_nor.h" #include "jesd216.h" @@ -44,10 +45,6 @@ LOG_MODULE_REGISTER(spi_nor, CONFIG_FLASH_LOG_LEVEL); #define SPI_NOR_MAX_ADDR_WIDTH 4 -#ifndef NSEC_PER_MSEC -#define NSEC_PER_MSEC (NSEC_PER_USEC * USEC_PER_MSEC) -#endif - #if DT_INST_NODE_HAS_PROP(0, t_enter_dpd) #define T_DP_MS ceiling_fraction(DT_INST_PROP(0, t_enter_dpd), NSEC_PER_MSEC) #else /* T_ENTER_DPD */ diff --git a/include/zephyr/posix/time.h b/include/zephyr/posix/time.h index 43b505981e5..cada7b2f36d 100644 --- a/include/zephyr/posix/time.h +++ b/include/zephyr/posix/time.h @@ -73,8 +73,6 @@ extern "C" { #define CLOCK_MONOTONIC 4 #endif -#define NSEC_PER_MSEC (NSEC_PER_USEC * USEC_PER_MSEC) - #ifndef TIMER_ABSTIME #define TIMER_ABSTIME 4 #endif diff --git a/include/zephyr/sys_clock.h b/include/zephyr/sys_clock.h index 413bac14d08..52c88b170e9 100644 --- a/include/zephyr/sys_clock.h +++ b/include/zephyr/sys_clock.h @@ -123,6 +123,9 @@ extern void z_enable_sys_clock(void); /* number of nsec per usec */ #define NSEC_PER_USEC 1000U +/* number of nsec per msec */ +#define NSEC_PER_MSEC 1000000U + /* number of microseconds per millisecond */ #define USEC_PER_MSEC 1000U diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_signal.c b/subsys/portability/cmsis_rtos_v1/cmsis_signal.c index c109488d468..66225a1b67f 100644 --- a/subsys/portability/cmsis_rtos_v1/cmsis_signal.c +++ b/subsys/portability/cmsis_rtos_v1/cmsis_signal.c @@ -7,7 +7,6 @@ #include #include -#define NSEC_PER_MSEC (NSEC_PER_USEC * USEC_PER_MSEC) #define MAX_VALID_SIGNAL_VAL ((1 << osFeature_Signals) - 1) void *k_thread_other_custom_data_get(struct k_thread *thread_id) diff --git a/subsys/portability/cmsis_rtos_v2/thread_flags.c b/subsys/portability/cmsis_rtos_v2/thread_flags.c index e4ec8749c5c..2ef8cea513c 100644 --- a/subsys/portability/cmsis_rtos_v2/thread_flags.c +++ b/subsys/portability/cmsis_rtos_v2/thread_flags.c @@ -8,7 +8,6 @@ #include "wrapper.h" #define DONT_CARE (0) -#define NSEC_PER_MSEC (NSEC_PER_USEC * USEC_PER_MSEC) /** * @brief Set the specified Thread Flags of a thread. diff --git a/tests/kernel/common/src/boot_delay.c b/tests/kernel/common/src/boot_delay.c index 9b965b8f009..71f40494d22 100644 --- a/tests/kernel/common/src/boot_delay.c +++ b/tests/kernel/common/src/boot_delay.c @@ -6,7 +6,6 @@ #include -#define NSEC_PER_MSEC (uint64_t)(NSEC_PER_USEC * USEC_PER_MSEC) /** * @brief Test delay during boot * @defgroup kernel_init_tests Init