diff --git a/Kernel/ACPI/ACPIDynamicParser.h b/Kernel/ACPI/ACPIDynamicParser.h index c7ea5539da8..025bf7aa19d 100644 --- a/Kernel/ACPI/ACPIDynamicParser.h +++ b/Kernel/ACPI/ACPIDynamicParser.h @@ -30,8 +30,8 @@ #include #include #include -#include #include +#include class ACPIDynamicParser final : public IRQHandler , ACPIStaticParser { diff --git a/Kernel/ACPI/ACPIParser.h b/Kernel/ACPI/ACPIParser.h index 80275a0d149..1105616b23b 100644 --- a/Kernel/ACPI/ACPIParser.h +++ b/Kernel/ACPI/ACPIParser.h @@ -29,9 +29,9 @@ #include #include #include -#include #include -#include +#include +#include class ACPIParser { public: @@ -53,4 +53,4 @@ public: protected: explicit ACPIParser(bool usable); bool m_operable; -}; \ No newline at end of file +}; diff --git a/Kernel/ACPI/DMIDecoder.h b/Kernel/ACPI/DMIDecoder.h index 85b453163d1..413c48b8943 100644 --- a/Kernel/ACPI/DMIDecoder.h +++ b/Kernel/ACPI/DMIDecoder.h @@ -28,9 +28,9 @@ #include #include -#include #include -#include +#include +#include namespace SMBIOS { struct [[gnu::packed]] LegacyEntryPoint32bit diff --git a/Kernel/Arch/i386/CPU.h b/Kernel/Arch/i386/CPU.h index 53bd135b8a0..b6bbbd492fa 100644 --- a/Kernel/Arch/i386/CPU.h +++ b/Kernel/Arch/i386/CPU.h @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #define PAGE_SIZE 4096 diff --git a/Kernel/Devices/BXVGADevice.h b/Kernel/Devices/BXVGADevice.h index 84bbd0dea42..a8a768f338f 100644 --- a/Kernel/Devices/BXVGADevice.h +++ b/Kernel/Devices/BXVGADevice.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include class BXVGADevice final : public BlockDevice { AK_MAKE_ETERNAL diff --git a/Kernel/Devices/FloppyDiskDevice.h b/Kernel/Devices/FloppyDiskDevice.h index e975fd789f9..9ef8e9083ae 100644 --- a/Kernel/Devices/FloppyDiskDevice.h +++ b/Kernel/Devices/FloppyDiskDevice.h @@ -101,8 +101,8 @@ #include #include #include -#include #include +#include struct FloppyControllerCommand { u8 cmd; // Command to send to the controller diff --git a/Kernel/Devices/MBVGADevice.h b/Kernel/Devices/MBVGADevice.h index a5cec28107e..3c12ac4a389 100644 --- a/Kernel/Devices/MBVGADevice.h +++ b/Kernel/Devices/MBVGADevice.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include class MBVGADevice final : public BlockDevice { AK_MAKE_ETERNAL diff --git a/Kernel/Devices/PATAChannel.h b/Kernel/Devices/PATAChannel.h index 829def7558b..05ef114ce5f 100644 --- a/Kernel/Devices/PATAChannel.h +++ b/Kernel/Devices/PATAChannel.h @@ -41,9 +41,9 @@ #include #include #include -#include #include #include +#include struct PhysicalRegionDescriptor { PhysicalAddress offset; diff --git a/Kernel/Devices/SB16.h b/Kernel/Devices/SB16.h index 21df353222c..8f30b075871 100644 --- a/Kernel/Devices/SB16.h +++ b/Kernel/Devices/SB16.h @@ -29,9 +29,9 @@ #include #include #include -#include #include #include +#include class SB16; diff --git a/Kernel/FileSystem/File.h b/Kernel/FileSystem/File.h index 46e8d802e1a..db226eafd1a 100644 --- a/Kernel/FileSystem/File.h +++ b/Kernel/FileSystem/File.h @@ -26,13 +26,13 @@ #pragma once -#include -#include #include +#include +#include #include #include #include -#include +#include class FileDescription; class Process; diff --git a/Kernel/FileSystem/FileDescription.h b/Kernel/FileSystem/FileDescription.h index be1e3d21205..9a0f6ee24ce 100644 --- a/Kernel/FileSystem/FileDescription.h +++ b/Kernel/FileSystem/FileDescription.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include class File; class TTY; diff --git a/Kernel/VM/AnonymousVMObject.h b/Kernel/VM/AnonymousVMObject.h index 29a4d195383..2bdbb1cde6d 100644 --- a/Kernel/VM/AnonymousVMObject.h +++ b/Kernel/VM/AnonymousVMObject.h @@ -26,8 +26,8 @@ #pragma once -#include #include +#include class AnonymousVMObject : public VMObject { public: diff --git a/Kernel/VM/PhysicalAddress.h b/Kernel/VM/PhysicalAddress.h deleted file mode 100644 index 4b51a4fd18c..00000000000 --- a/Kernel/VM/PhysicalAddress.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include -#include - -class PhysicalAddress { -public: - PhysicalAddress() {} - explicit PhysicalAddress(uintptr_t address) - : m_address(address) - { - } - - PhysicalAddress offset(uintptr_t o) const { return PhysicalAddress(m_address + o); } - uintptr_t get() const { return m_address; } - void set(uintptr_t address) { m_address = address; } - void mask(uintptr_t m) { m_address &= m; } - - bool is_null() const { return m_address == 0; } - - u8* as_ptr() { return reinterpret_cast(m_address); } - const u8* as_ptr() const { return reinterpret_cast(m_address); } - - PhysicalAddress page_base() const { return PhysicalAddress(m_address & 0xfffff000); } - - bool operator==(const PhysicalAddress& other) const { return m_address == other.m_address; } - bool operator!=(const PhysicalAddress& other) const { return m_address != other.m_address; } - bool operator>(const PhysicalAddress& other) const { return m_address > other.m_address; } - bool operator>=(const PhysicalAddress& other) const { return m_address >= other.m_address; } - bool operator<(const PhysicalAddress& other) const { return m_address < other.m_address; } - bool operator<=(const PhysicalAddress& other) const { return m_address <= other.m_address; } - -private: - uintptr_t m_address { 0 }; -}; - -inline const LogStream& operator<<(const LogStream& stream, PhysicalAddress value) -{ - return stream << 'P' << value.as_ptr(); -} diff --git a/Kernel/VM/PhysicalPage.h b/Kernel/VM/PhysicalPage.h index 2d916de1dfe..2d96307b00d 100644 --- a/Kernel/VM/PhysicalPage.h +++ b/Kernel/VM/PhysicalPage.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include class PhysicalPage { friend class MemoryManager; diff --git a/Kernel/VM/RangeAllocator.h b/Kernel/VM/RangeAllocator.h index 999282deffa..a8203485428 100644 --- a/Kernel/VM/RangeAllocator.h +++ b/Kernel/VM/RangeAllocator.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include class Range { friend class RangeAllocator; diff --git a/Kernel/VM/VirtualAddress.h b/Kernel/VM/VirtualAddress.h deleted file mode 100644 index 92dfb6698de..00000000000 --- a/Kernel/VM/VirtualAddress.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include -#include - -class VirtualAddress { -public: - VirtualAddress() {} - explicit VirtualAddress(uintptr_t address) - : m_address(address) - { - } - - explicit VirtualAddress(const void* address) - : m_address((uintptr_t)address) - { - } - - bool is_null() const { return m_address == 0; } - bool is_page_aligned() const { return (m_address & 0xfff) == 0; } - - VirtualAddress offset(uintptr_t o) const { return VirtualAddress(m_address + o); } - uintptr_t get() const { return m_address; } - void set(uintptr_t address) { m_address = address; } - void mask(uintptr_t m) { m_address &= m; } - - bool operator<=(const VirtualAddress& other) const { return m_address <= other.m_address; } - bool operator>=(const VirtualAddress& other) const { return m_address >= other.m_address; } - bool operator>(const VirtualAddress& other) const { return m_address > other.m_address; } - bool operator<(const VirtualAddress& other) const { return m_address < other.m_address; } - bool operator==(const VirtualAddress& other) const { return m_address == other.m_address; } - bool operator!=(const VirtualAddress& other) const { return m_address != other.m_address; } - - u8* as_ptr() { return reinterpret_cast(m_address); } - const u8* as_ptr() const { return reinterpret_cast(m_address); } - - VirtualAddress page_base() const { return VirtualAddress(m_address & 0xfffff000); } - -private: - uintptr_t m_address { 0 }; -}; - -inline VirtualAddress operator-(const VirtualAddress& a, const VirtualAddress& b) -{ - return VirtualAddress(a.get() - b.get()); -} - -inline const LogStream& operator<<(const LogStream& stream, VirtualAddress value) -{ - return stream << 'V' << value.as_ptr(); -}