Kernel: Use VirtualAddress & PhysicalAddress classes from LibBareMetal

luteresa · Feb 9, 2020 · 99ea806 · 99ea806
1 parent 7c4dd0c
commit 99ea806
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 163 deletions.
diff --git a/Kernel/ACPI/ACPIDynamicParser.h b/Kernel/ACPI/ACPIDynamicParser.h
@@ -30,8 +30,8 @@
 #include <Kernel/ACPI/ACPIStaticParser.h>
 #include <Kernel/IRQHandler.h>
 #include <Kernel/Lock.h>
-#include <Kernel/VM/PhysicalAddress.h>
 #include <Kernel/VM/PhysicalPage.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
 
 class ACPIDynamicParser final : public IRQHandler
  , ACPIStaticParser {

diff --git a/Kernel/ACPI/ACPIParser.h b/Kernel/ACPI/ACPIParser.h
@@ -29,9 +29,9 @@
 #include <AK/Types.h>
 #include <Kernel/ACPI/Definitions.h>
 #include <Kernel/FileSystem/File.h>
-#include <Kernel/VM/PhysicalAddress.h>
 #include <Kernel/VM/Region.h>
-#include <Kernel/VM/VirtualAddress.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
+#include <LibBareMetal/Memory/VirtualAddress.h>
 
 class ACPIParser {
 public:
@@ -53,4 +53,4 @@ class ACPIParser {
 protected:
  explicit ACPIParser(bool usable);
  bool m_operable;
-};
+};
diff --git a/Kernel/ACPI/DMIDecoder.h b/Kernel/ACPI/DMIDecoder.h
@@ -28,9 +28,9 @@
 
 #include <AK/Types.h>
 #include <AK/Vector.h>
-#include <Kernel/VM/PhysicalAddress.h>
 #include <Kernel/VM/Region.h>
-#include <Kernel/VM/VirtualAddress.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
+#include <LibBareMetal/Memory/VirtualAddress.h>
 
 namespace SMBIOS {
 struct [[gnu::packed]] LegacyEntryPoint32bit

diff --git a/Kernel/Arch/i386/CPU.h b/Kernel/Arch/i386/CPU.h
@@ -28,8 +28,8 @@
 
 #include <AK/Badge.h>
 #include <AK/Noncopyable.h>
-#include <Kernel/VM/PhysicalAddress.h>
-#include <Kernel/VM/VirtualAddress.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
+#include <LibBareMetal/Memory/VirtualAddress.h>
 #include <LibBareMetal/Output/kstdio.h>
 
 #define PAGE_SIZE 4096

diff --git a/Kernel/Devices/BXVGADevice.h b/Kernel/Devices/BXVGADevice.h
@@ -29,7 +29,7 @@
 #include <AK/String.h>
 #include <AK/Types.h>
 #include <Kernel/Devices/BlockDevice.h>
-#include <Kernel/VM/PhysicalAddress.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
 
 class BXVGADevice final : public BlockDevice {
  AK_MAKE_ETERNAL

diff --git a/Kernel/Devices/FloppyDiskDevice.h b/Kernel/Devices/FloppyDiskDevice.h
@@ -101,8 +101,8 @@
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/IRQHandler.h>
 #include <Kernel/Lock.h>
-#include <Kernel/VM/PhysicalAddress.h>
 #include <Kernel/VM/PhysicalPage.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
 
 struct FloppyControllerCommand {
  u8 cmd; // Command to send to the controller

diff --git a/Kernel/Devices/MBVGADevice.h b/Kernel/Devices/MBVGADevice.h
@@ -29,7 +29,7 @@
 #include <AK/String.h>
 #include <AK/Types.h>
 #include <Kernel/Devices/BlockDevice.h>
-#include <Kernel/VM/PhysicalAddress.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
 
 class MBVGADevice final : public BlockDevice {
  AK_MAKE_ETERNAL

diff --git a/Kernel/Devices/PATAChannel.h b/Kernel/Devices/PATAChannel.h
@@ -41,9 +41,9 @@
 #include <Kernel/IRQHandler.h>
 #include <Kernel/Lock.h>
 #include <Kernel/PCI/Access.h>
-#include <Kernel/VM/PhysicalAddress.h>
 #include <Kernel/VM/PhysicalPage.h>
 #include <Kernel/WaitQueue.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
 
 struct PhysicalRegionDescriptor {
  PhysicalAddress offset;

diff --git a/Kernel/Devices/SB16.h b/Kernel/Devices/SB16.h
@@ -29,9 +29,9 @@
 #include <AK/CircularQueue.h>
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/IRQHandler.h>
-#include <Kernel/VM/PhysicalAddress.h>
 #include <Kernel/VM/PhysicalPage.h>
 #include <Kernel/WaitQueue.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
 
 class SB16;
 

diff --git a/Kernel/FileSystem/File.h b/Kernel/FileSystem/File.h
@@ -26,13 +26,13 @@
 
 #pragma once
 
-#include <AK/String.h>
-#include <AK/RefCounted.h>
 #include <AK/NonnullRefPtr.h>
+#include <AK/RefCounted.h>
+#include <AK/String.h>
 #include <AK/Types.h>
 #include <Kernel/KResult.h>
 #include <Kernel/UnixTypes.h>
-#include <Kernel/VM/VirtualAddress.h>
+#include <LibBareMetal/Memory/VirtualAddress.h>
 
 class FileDescription;
 class Process;

diff --git a/Kernel/FileSystem/FileDescription.h b/Kernel/FileSystem/FileDescription.h
@@ -36,7 +36,7 @@
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/KBuffer.h>
 #include <Kernel/Net/Socket.h>
-#include <Kernel/VM/VirtualAddress.h>
+#include <LibBareMetal/Memory/VirtualAddress.h>
 
 class File;
 class TTY;

diff --git a/Kernel/VM/AnonymousVMObject.h b/Kernel/VM/AnonymousVMObject.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <Kernel/VM/PhysicalAddress.h>
 #include <Kernel/VM/VMObject.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
 
 class AnonymousVMObject : public VMObject {
 public:

diff --git a/Kernel/VM/PhysicalAddress.h b/Kernel/VM/PhysicalAddress.h
diff --git a/Kernel/VM/PhysicalPage.h b/Kernel/VM/PhysicalPage.h
@@ -29,7 +29,7 @@
 #include <AK/NonnullRefPtr.h>
 #include <Kernel/Assertions.h>
 #include <Kernel/Heap/SlabAllocator.h>
-#include <Kernel/VM/PhysicalAddress.h>
+#include <LibBareMetal/Memory/PhysicalAddress.h>
 
 class PhysicalPage {
  friend class MemoryManager;

diff --git a/Kernel/VM/RangeAllocator.h b/Kernel/VM/RangeAllocator.h
@@ -29,7 +29,7 @@
 #include <AK/String.h>
 #include <AK/Traits.h>
 #include <AK/Vector.h>
-#include <Kernel/VM/VirtualAddress.h>
+#include <LibBareMetal/Memory/VirtualAddress.h>
 
 class Range {
  friend class RangeAllocator;

diff --git a/Kernel/VM/VirtualAddress.h b/Kernel/VM/VirtualAddress.h