From d5ee03ef5b30a269c775d7093a71468153a1d141 Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Fri, 2 Sep 2022 11:35:12 +0300
Subject: [PATCH] Kernel/x86: Move RTC and CMOS code to x86 arch-specific
 subdirectory

The RTC and CMOS are currently only supported for x86 platforms and use
specific x86 instructions to produce only certain x86 plaform operations
and results, therefore, we move them to the Arch/x86 specific directory.
---
 Kernel/{ => Arch/x86/common}/CMOS.cpp | 2 +-
 Kernel/{ => Arch/x86/common}/CMOS.h   | 0
 Kernel/{ => Arch/x86/common}/RTC.cpp  | 4 ++--
 Kernel/{ => Arch/x86/common}/RTC.h    | 0
 Kernel/CMakeLists.txt                 | 4 ++--
 Kernel/Coredump.cpp                   | 1 -
 Kernel/Memory/MemoryManager.cpp       | 1 -
 Kernel/Scheduler.cpp                  | 1 -
 Kernel/Time/RTC.cpp                   | 2 +-
 Kernel/Time/RTC.h                     | 2 +-
 Kernel/Time/TimeManagement.cpp        | 1 +
 Kernel/init.cpp                       | 2 --
 12 files changed, 8 insertions(+), 12 deletions(-)
 rename Kernel/{ => Arch/x86/common}/CMOS.cpp (89%)
 rename Kernel/{ => Arch/x86/common}/CMOS.h (100%)
 rename Kernel/{ => Arch/x86/common}/RTC.cpp (97%)
 rename Kernel/{ => Arch/x86/common}/RTC.h (100%)

diff --git a/Kernel/CMOS.cpp b/Kernel/Arch/x86/common/CMOS.cpp
similarity index 89%
rename from Kernel/CMOS.cpp
rename to Kernel/Arch/x86/common/CMOS.cpp
index 79e76cc461..ad2b5ee015 100644
--- a/Kernel/CMOS.cpp
+++ b/Kernel/Arch/x86/common/CMOS.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Arch/x86/IO.h>
-#include <Kernel/CMOS.h>
+#include <Kernel/Arch/x86/common/CMOS.h>
 
 namespace Kernel::CMOS {
 
diff --git a/Kernel/CMOS.h b/Kernel/Arch/x86/common/CMOS.h
similarity index 100%
rename from Kernel/CMOS.h
rename to Kernel/Arch/x86/common/CMOS.h
diff --git a/Kernel/RTC.cpp b/Kernel/Arch/x86/common/RTC.cpp
similarity index 97%
rename from Kernel/RTC.cpp
rename to Kernel/Arch/x86/common/RTC.cpp
index d773af8a8f..7373c62f97 100644
--- a/Kernel/RTC.cpp
+++ b/Kernel/Arch/x86/common/RTC.cpp
@@ -7,8 +7,8 @@
 #include <AK/Format.h>
 #include <AK/Time.h>
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/CMOS.h>
-#include <Kernel/RTC.h>
+#include <Kernel/Arch/x86/common/CMOS.h>
+#include <Kernel/Arch/x86/common/RTC.h>
 
 namespace Kernel::RTC {
 
diff --git a/Kernel/RTC.h b/Kernel/Arch/x86/common/RTC.h
similarity index 100%
rename from Kernel/RTC.h
rename to Kernel/Arch/x86/common/RTC.h
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index d783aeb52f..a2e3bc2bf5 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -40,7 +40,6 @@ set(KERNEL_SOURCES
     Bus/VirtIO/Device.cpp
     Bus/VirtIO/Queue.cpp
     Bus/VirtIO/RNG.cpp
-    CMOS.cpp
     CommandLine.cpp
     Coredump.cpp
     Credentials.cpp
@@ -226,7 +225,6 @@ set(KERNEL_SOURCES
     ProcessSpecificExposed.cpp
     ProcessGroup.cpp
     ProcessProcFSTraits.cpp
-    RTC.cpp
     Random.cpp
     Scheduler.cpp
     StdLib.cpp
@@ -333,8 +331,10 @@ if ("${SERENITY_ARCH}" STREQUAL "i686" OR "${SERENITY_ARCH}" STREQUAL "x86_64")
         ${KERNEL_SOURCES}
         Arch/Processor.cpp
 
+        Arch/x86/common/CMOS.cpp
         Arch/x86/common/Delay.cpp
         Arch/x86/common/I8042Reboot.cpp
+        Arch/x86/common/RTC.cpp
         Arch/x86/common/ScopedCritical.cpp
         Arch/x86/common/SmapDisabler.cpp
         Arch/x86/common/Shutdown.cpp
diff --git a/Kernel/Coredump.cpp b/Kernel/Coredump.cpp
index cc0e963c9b..82c99329f1 100644
--- a/Kernel/Coredump.cpp
+++ b/Kernel/Coredump.cpp
@@ -17,7 +17,6 @@
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/ScopedAddressSpaceSwitcher.h>
 #include <Kernel/Process.h>
-#include <Kernel/RTC.h>
 #include <LibC/elf.h>
 #include <LibELF/Core.h>
 
diff --git a/Kernel/Memory/MemoryManager.cpp b/Kernel/Memory/MemoryManager.cpp
index 72e7e4c665..8035aee7df 100644
--- a/Kernel/Memory/MemoryManager.cpp
+++ b/Kernel/Memory/MemoryManager.cpp
@@ -14,7 +14,6 @@
 #include <Kernel/Arch/PageFault.h>
 #include <Kernel/Arch/RegisterState.h>
 #include <Kernel/BootInfo.h>
-#include <Kernel/CMOS.h>
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/Heap/kmalloc.h>
 #include <Kernel/KSyms.h>
diff --git a/Kernel/Scheduler.cpp b/Kernel/Scheduler.cpp
index 3bfdd354dc..99eb151e46 100644
--- a/Kernel/Scheduler.cpp
+++ b/Kernel/Scheduler.cpp
@@ -14,7 +14,6 @@
 #include <Kernel/Panic.h>
 #include <Kernel/PerformanceManager.h>
 #include <Kernel/Process.h>
-#include <Kernel/RTC.h>
 #include <Kernel/Scheduler.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Time/TimeManagement.h>
diff --git a/Kernel/Time/RTC.cpp b/Kernel/Time/RTC.cpp
index 8d9fbe897f..f0dd9cef14 100644
--- a/Kernel/Time/RTC.cpp
+++ b/Kernel/Time/RTC.cpp
@@ -7,7 +7,7 @@
 #include <Kernel/Arch/InterruptDisabler.h>
 #include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Arch/x86/NonMaskableInterruptDisabler.h>
-#include <Kernel/CMOS.h>
+#include <Kernel/Arch/x86/common/CMOS.h>
 #include <Kernel/Time/RTC.h>
 #include <Kernel/Time/TimeManagement.h>
 
diff --git a/Kernel/Time/RTC.h b/Kernel/Time/RTC.h
index a63cef27f6..b15e4aa7e1 100644
--- a/Kernel/Time/RTC.h
+++ b/Kernel/Time/RTC.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <Kernel/Arch/x86/common/RTC.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
-#include <Kernel/RTC.h>
 #include <Kernel/Time/HardwareTimer.h>
 
 namespace Kernel {
diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp
index 55e4bac899..fd085cdbf3 100644
--- a/Kernel/Time/TimeManagement.cpp
+++ b/Kernel/Time/TimeManagement.cpp
@@ -8,6 +8,7 @@
 #include <AK/StdLibExtras.h>
 #include <AK/Time.h>
 #include <Kernel/Arch/InterruptDisabler.h>
+#include <Kernel/Arch/x86/common/RTC.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Interrupts/APIC.h>
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index e2768b3370..3f5e42e8b9 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -12,7 +12,6 @@
 #include <Kernel/Bus/PCI/Initializer.h>
 #include <Kernel/Bus/USB/USBManagement.h>
 #include <Kernel/Bus/VirtIO/Device.h>
-#include <Kernel/CMOS.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/Audio/Management.h>
 #include <Kernel/Devices/DeviceControlDevice.h>
@@ -49,7 +48,6 @@
 #include <Kernel/Prekernel/Prekernel.h>
 #include <Kernel/Process.h>
 #include <Kernel/ProcessExposed.h>
-#include <Kernel/RTC.h>
 #include <Kernel/Random.h>
 #include <Kernel/Scheduler.h>
 #include <Kernel/Sections.h>