Skip to content

Commit fe2bd8e

Browse files
supercomputer7linusg
authored andcommitted
Kernel: Move x86-specific timer code handling to Arch/x86/Time directory
The APICTimer, HPET and RTC (the RTC timer is in the context of the PC RTC here) are timers that exist only in x86 platforms, therefore, we move the handling code and the initialization code to the Arch/x86/Time directory. Other related code patterns in the TimeManagement singleton and in the Random.cpp file are guarded with #ifdef to ensure they are only compiled for x86 builds.
1 parent 48f3d76 commit fe2bd8e

File tree

16 files changed

+51
-33
lines changed

16 files changed

+51
-33
lines changed

Kernel/Time/APICTimer.cpp renamed to Kernel/Arch/x86/Time/APICTimer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* SPDX-License-Identifier: BSD-2-Clause
55
*/
66

7+
#include <Kernel/Arch/x86/Time/APICTimer.h>
78
#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
89
#include <Kernel/Panic.h>
910
#include <Kernel/Sections.h>
10-
#include <Kernel/Time/APICTimer.h>
1111
#include <Kernel/Time/TimeManagement.h>
1212

1313
namespace Kernel {

Kernel/Time/APICTimer.h renamed to Kernel/Arch/x86/Time/APICTimer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#pragma once
88

99
#include <AK/Types.h>
10+
#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
1011
#include <Kernel/Interrupts/GenericInterruptHandler.h>
1112
#include <Kernel/Time/HardwareTimer.h>
1213

Kernel/Time/HPET.cpp renamed to Kernel/Arch/x86/Time/HPET.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
*/
66

77
#include <AK/StringView.h>
8+
#include <Kernel/Arch/x86/Time/HPET.h>
9+
#include <Kernel/Arch/x86/Time/HPETComparator.h>
810
#include <Kernel/Debug.h>
911
#include <Kernel/Firmware/ACPI/Parser.h>
1012
#include <Kernel/Memory/MemoryManager.h>
1113
#include <Kernel/Memory/TypedMapping.h>
1214
#include <Kernel/Sections.h>
13-
#include <Kernel/Time/HPET.h>
14-
#include <Kernel/Time/HPETComparator.h>
1515
#include <Kernel/Time/TimeManagement.h>
1616

1717
namespace Kernel {
File renamed without changes.

Kernel/Time/HPETComparator.cpp renamed to Kernel/Arch/x86/Time/HPETComparator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*/
66

77
#include <Kernel/Arch/InterruptDisabler.h>
8+
#include <Kernel/Arch/x86/Time/HPETComparator.h>
89
#include <Kernel/Assertions.h>
910
#include <Kernel/Debug.h>
1011
#include <Kernel/Sections.h>
11-
#include <Kernel/Time/HPETComparator.h>
1212
#include <Kernel/Time/TimeManagement.h>
1313

1414
namespace Kernel {

Kernel/Time/HPETComparator.h renamed to Kernel/Arch/x86/Time/HPETComparator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <AK/Function.h>
1010
#include <AK/Types.h>
11-
#include <Kernel/Time/HPET.h>
11+
#include <Kernel/Arch/x86/Time/HPET.h>
1212
#include <Kernel/Time/HardwareTimer.h>
1313

1414
namespace Kernel {

Kernel/Time/PIT.cpp renamed to Kernel/Arch/x86/Time/PIT.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
#include <Kernel/Arch/InterruptDisabler.h>
88
#include <Kernel/Arch/x86/IO.h>
9+
#include <Kernel/Arch/x86/Time/PIT.h>
910
#include <Kernel/Interrupts/GenericInterruptHandler.h>
1011
#include <Kernel/Scheduler.h>
1112
#include <Kernel/Sections.h>
1213
#include <Kernel/Thread.h>
13-
#include <Kernel/Time/PIT.h>
1414
#include <Kernel/Time/TimeManagement.h>
1515

1616
#define IRQ_TIMER 0
File renamed without changes.

Kernel/Time/RTC.cpp renamed to Kernel/Arch/x86/Time/RTC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <Kernel/Arch/InterruptDisabler.h>
88
#include <Kernel/Arch/x86/IO.h>
99
#include <Kernel/Arch/x86/NonMaskableInterruptDisabler.h>
10+
#include <Kernel/Arch/x86/Time/RTC.h>
1011
#include <Kernel/Arch/x86/common/CMOS.h>
11-
#include <Kernel/Time/RTC.h>
1212
#include <Kernel/Time/TimeManagement.h>
1313

1414
namespace Kernel {
File renamed without changes.

0 commit comments

Comments
 (0)