From 3283991ec6955e052339e1cd7e390c8350ea9fb3 Mon Sep 17 00:00:00 2001 From: apio Date: Sat, 3 Jun 2023 21:02:18 +0200 Subject: [PATCH] kernel: Keep the old Timer::ticks_ms() API. Removing this API broke the ATA branch. --- kernel/src/arch/Timer.cpp | 5 +++++ kernel/src/arch/Timer.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/kernel/src/arch/Timer.cpp b/kernel/src/arch/Timer.cpp index 8220a3b8..cec949e5 100644 --- a/kernel/src/arch/Timer.cpp +++ b/kernel/src/arch/Timer.cpp @@ -62,6 +62,11 @@ namespace Timer timespecadd(&s_realtime_clock, &s_interval, &s_realtime_clock); } + usize ticks_ms() + { + return (s_monotonic_clock.tv_sec * 1000) + (s_monotonic_clock.tv_nsec / 1'000'000); + } + struct timespec* monotonic_clock() { return &s_monotonic_clock; diff --git a/kernel/src/arch/Timer.h b/kernel/src/arch/Timer.h index 49c039fd..0b6d3fa3 100644 --- a/kernel/src/arch/Timer.h +++ b/kernel/src/arch/Timer.h @@ -16,6 +16,8 @@ namespace Timer { void tick(); + usize ticks_ms(); + struct timespec* monotonic_clock(); struct timespec* realtime_clock();