diff --git a/Kernel/Time/HardwareTimer.cpp b/Kernel/Time/HardwareTimer.cpp index 174179c8eff..621a5bddf5d 100644 --- a/Kernel/Time/HardwareTimer.cpp +++ b/Kernel/Time/HardwareTimer.cpp @@ -48,7 +48,7 @@ const char* HardwareTimer::purpose() const return model(); } -void HardwareTimer::change_function(Function callback) +void HardwareTimer::set_callback(Function callback) { disable_irq(); m_callback = move(callback); diff --git a/Kernel/Time/HardwareTimer.h b/Kernel/Time/HardwareTimer.h index 2afb3ca1f8f..a62512b2b46 100644 --- a/Kernel/Time/HardwareTimer.h +++ b/Kernel/Time/HardwareTimer.h @@ -48,7 +48,8 @@ public: virtual const char* model() const = 0; virtual const char* purpose() const override; - virtual void change_function(Function); + void set_callback(Function); + virtual size_t ticks_per_second() const = 0; virtual bool is_periodic() const = 0; diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp index a4e1137900d..c271e19ebda 100644 --- a/Kernel/Time/TimeManagement.cpp +++ b/Kernel/Time/TimeManagement.cpp @@ -190,10 +190,10 @@ bool TimeManagement::probe_and_set_non_legacy_hardware_timers() } } - m_system_timer->change_function(Scheduler::timer_tick); + m_system_timer->set_callback(Scheduler::timer_tick); dbg() << "Reset timers"; m_system_timer->try_to_set_frequency(m_system_timer->calculate_nearest_possible_frequency(1024)); - m_time_keeper_timer->change_function(TimeManagement::update_time); + m_time_keeper_timer->set_callback(TimeManagement::update_time); m_time_keeper_timer->try_to_set_frequency(OPTIMAL_TICKS_PER_SECOND_RATE); return true;