Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel: Rename TimerHandler to SystemTimer

Browse Source 
I changed SystemTimer to only handle the "best" supported timer
it can initialize.
This commit is contained in:
Bananymous
2023-08-04 15:50:11 +03:00
parent ca5a097ef5
commit c732297623
13 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/kernel/Input/PS2Controller.cpp
View File

@@ -108,8 +108,8 @@ namespace Kernel::Input
{
if (device == 1)
IO::outb(PS2::IOPort::COMMAND, PS2::Command::WRITE_TO_SECOND_PORT);
uint64_t timeout = TimerHandler::get().ms_since_boot() + s_device_timeout_ms;
while (TimerHandler::get().ms_since_boot() < timeout)
uint64_t timeout = SystemTimer::get().ms_since_boot() + s_device_timeout_ms;
while (SystemTimer::get().ms_since_boot() < timeout)
{
if (!(IO::inb(PS2::IOPort::STATUS) & PS2::Status::INPUT_FULL))
{
@@ -122,8 +122,8 @@ namespace Kernel::Input
static BAN::ErrorOr<uint8_t> device_read_byte()
{
uint64_t timeout = TimerHandler::get().ms_since_boot() + s_device_timeout_ms;
while (TimerHandler::get().ms_since_boot() < timeout)
uint64_t timeout = SystemTimer::get().ms_since_boot() + s_device_timeout_ms;
while (SystemTimer::get().ms_since_boot() < timeout)
if (IO::inb(PS2::IOPort::STATUS) & PS2::Status::OUTPUT_FULL)
return IO::inb(PS2::IOPort::DATA);
return BAN::Error::from_error_code(ErrorCode::PS2_Timeout);

2
kernel/kernel/Input/PS2Keyboard.cpp
View File

@@ -216,7 +216,7 @@ namespace Kernel::Input
if (event.pressed() && event.key == Input::Key::F11)
{
auto time = TimerHandler::get().time_since_boot();
auto time = SystemTimer::get().time_since_boot();
dprintln("{}.{9} s", time.tv_sec, time.tv_nsec);
}