diff --git a/kernel/int_latency_bench.c b/kernel/int_latency_bench.c index d9fecfa06db..0a09d9bb98a 100644 --- a/kernel/int_latency_bench.c +++ b/kernel/int_latency_bench.c @@ -54,7 +54,7 @@ void _int_latency_start(void) { /* when interrupts are not already locked, take time stamp */ if (!int_locked_timestamp && int_latency_bench_ready) { - int_locked_timestamp = sys_cycle_get_32(); + int_locked_timestamp = k_cycle_get_32(); int_lock_unlock_nest = 0; } int_lock_unlock_nest++; @@ -73,7 +73,7 @@ void _int_latency_stop(void) { uint32_t delta; uint32_t delayOverhead; - uint32_t currentTime = sys_cycle_get_32(); + uint32_t currentTime = k_cycle_get_32(); /* ensured intLatencyStart() was invoked first */ if (int_locked_timestamp) { @@ -136,24 +136,24 @@ void int_latency_init(void) */ while (cacheWarming) { /* measure how much time it takes to read time */ - timeToReadTime = sys_cycle_get_32(); - timeToReadTime = sys_cycle_get_32() - timeToReadTime; + timeToReadTime = k_cycle_get_32(); + timeToReadTime = k_cycle_get_32() - timeToReadTime; /* measure time to call intLatencyStart() and intLatencyStop * takes */ - initial_start_delay = sys_cycle_get_32(); + initial_start_delay = k_cycle_get_32(); _int_latency_start(); initial_start_delay = - sys_cycle_get_32() - initial_start_delay - timeToReadTime; + k_cycle_get_32() - initial_start_delay - timeToReadTime; - nesting_delay = sys_cycle_get_32(); + nesting_delay = k_cycle_get_32(); _int_latency_start(); - nesting_delay = sys_cycle_get_32() - nesting_delay - timeToReadTime; + nesting_delay = k_cycle_get_32() - nesting_delay - timeToReadTime; - stop_delay = sys_cycle_get_32(); + stop_delay = k_cycle_get_32(); _int_latency_stop(); - stop_delay = sys_cycle_get_32() - stop_delay - timeToReadTime; + stop_delay = k_cycle_get_32() - stop_delay - timeToReadTime; /* re-initialize globals to default values */ int_locked_latency_min = ULONG_MAX; diff --git a/subsys/logging/kernel_event_logger.c b/subsys/logging/kernel_event_logger.c index 805be2085e0..44847b788f2 100644 --- a/subsys/logging/kernel_event_logger.c +++ b/subsys/logging/kernel_event_logger.c @@ -61,7 +61,7 @@ SYS_INIT(_sys_k_event_logger_init, * to point to an application-defined routine. * */ -sys_k_timer_func_t _sys_k_get_time = sys_cycle_get_32; +sys_k_timer_func_t _sys_k_get_time = k_cycle_get_32; #endif /* CONFIG_KERNEL_EVENT_LOGGER_CUSTOM_TIMESTAMP */ void sys_k_event_logger_put_timed(uint16_t event_id) @@ -168,7 +168,7 @@ void _sys_k_event_logger_enter_sleep(void) return; } - _sys_k_event_logger_sleep_start_time = sys_cycle_get_32(); + _sys_k_event_logger_sleep_start_time = k_cycle_get_32(); } void _sys_k_event_logger_exit_sleep(void) @@ -181,7 +181,7 @@ void _sys_k_event_logger_exit_sleep(void) if (_sys_k_event_logger_sleep_start_time != 0) { data[0] = _sys_k_get_time(); - data[1] = (sys_cycle_get_32() - _sys_k_event_logger_sleep_start_time) + data[1] = (k_cycle_get_32() - _sys_k_event_logger_sleep_start_time) / sys_clock_hw_cycles_per_tick; /* register the cause of exiting sleep mode */ data[2] = _sys_current_irq_key_get();