diff options
| author | Liav A <liavalb@gmail.com> | 2020-02-22 20:16:45 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-02-24 11:27:03 +0100 |
| commit | 895e874eb482daa14f4cd75afbb1fca6021fd09d (patch) | |
| tree | c9e62c9e4e3e13a1a65f1b32fb1b7d58a2d93e13 /Kernel | |
| parent | b3c132ffb7d8d294310d3747321332074604e08d (diff) | |
| download | serenity-895e874eb482daa14f4cd75afbb1fca6021fd09d.zip | |
Kernel: Include the new PIT class in system components
Diffstat (limited to 'Kernel')
| -rw-r--r-- | Kernel/Devices/PCSpeaker.cpp | 2 | ||||
| -rw-r--r-- | Kernel/Process.cpp | 2 | ||||
| -rw-r--r-- | Kernel/Scheduler.cpp | 6 | ||||
| -rw-r--r-- | Kernel/TimerQueue.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Kernel/Devices/PCSpeaker.cpp b/Kernel/Devices/PCSpeaker.cpp index c76bd9f3c0..05a8e0ad82 100644 --- a/Kernel/Devices/PCSpeaker.cpp +++ b/Kernel/Devices/PCSpeaker.cpp @@ -25,8 +25,8 @@ */ #include <Kernel/Arch/i386/CPU.h> -#include <Kernel/Arch/i386/PIT.h> #include <Kernel/Devices/PCSpeaker.h> +#include <Kernel/Devices/PIT.h> #include <LibBareMetal/IO.h> void PCSpeaker::tone_on(int frequency) diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index 9efd031561..f862a580c2 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -32,11 +32,11 @@ #include <AK/Time.h> #include <AK/Types.h> #include <Kernel/Arch/i386/CPU.h> -#include <Kernel/Arch/i386/PIT.h> #include <Kernel/Devices/BlockDevice.h> #include <Kernel/Devices/KeyboardDevice.h> #include <Kernel/Devices/NullDevice.h> #include <Kernel/Devices/PCSpeaker.h> +#include <Kernel/Devices/PIT.h> #include <Kernel/Devices/RandomDevice.h> #include <Kernel/FileSystem/Custody.h> #include <Kernel/FileSystem/DevPtsFS.h> diff --git a/Kernel/Scheduler.cpp b/Kernel/Scheduler.cpp index 1cad872a8d..e8b67b1d59 100644 --- a/Kernel/Scheduler.cpp +++ b/Kernel/Scheduler.cpp @@ -26,7 +26,7 @@ #include <AK/QuickSort.h> #include <AK/TemporaryChange.h> -#include <Kernel/Arch/i386/PIT.h> +#include <Kernel/Devices/PIT.h> #include <Kernel/FileSystem/FileDescription.h> #include <Kernel/Net/Socket.h> #include <Kernel/Process.h> @@ -594,8 +594,8 @@ void Scheduler::timer_tick(RegisterState& regs) ++g_uptime; timeval tv; - tv.tv_sec = RTC::boot_time() + PIT::seconds_since_boot(); - tv.tv_usec = PIT::ticks_this_second() * 1000; + tv.tv_sec = RTC::boot_time() + PIT::the().seconds_since_boot(); + tv.tv_usec = PIT::the().ticks_this_second() * 1000; Process::update_info_page_timestamp(tv); if (Process::current->is_profiling()) { diff --git a/Kernel/TimerQueue.h b/Kernel/TimerQueue.h index b21a9081a2..511e6e3bfc 100644 --- a/Kernel/TimerQueue.h +++ b/Kernel/TimerQueue.h @@ -30,7 +30,7 @@ #include <AK/NonnullOwnPtr.h> #include <AK/OwnPtr.h> #include <AK/SinglyLinkedList.h> -#include <Kernel/Arch/i386/PIT.h> +#include <Kernel/Devices/PIT.h> namespace Kernel { |