diff options
| author | Liav A <liavalb@gmail.com> | 2022-09-02 10:49:18 +0300 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2022-09-20 18:43:05 +0100 |
| commit | 16428e4d4c5037830c6a42a0ddd4d5093da33e34 (patch) | |
| tree | 10dcb9ed1e13dbc5a8d2d18ca577ec1c02629ebd | |
| parent | 9252a892bb7f7fe3719a57143497726784138bd3 (diff) | |
| download | serenity-16428e4d4c5037830c6a42a0ddd4d5093da33e34.zip | |
Kernel: Convert NVMe code includes to absolute paths
| -rw-r--r-- | Kernel/Storage/NVMe/NVMeController.cpp | 4 | ||||
| -rw-r--r-- | Kernel/Storage/NVMe/NVMeInterruptQueue.cpp | 6 | ||||
| -rw-r--r-- | Kernel/Storage/NVMe/NVMeNameSpace.cpp | 2 | ||||
| -rw-r--r-- | Kernel/Storage/NVMe/NVMeNameSpace.h | 2 | ||||
| -rw-r--r-- | Kernel/Storage/NVMe/NVMePollQueue.cpp | 8 | ||||
| -rw-r--r-- | Kernel/Storage/NVMe/NVMeQueue.cpp | 5 |
6 files changed, 13 insertions, 14 deletions
diff --git a/Kernel/Storage/NVMe/NVMeController.cpp b/Kernel/Storage/NVMe/NVMeController.cpp index 2871c22695..95d2c434da 100644 --- a/Kernel/Storage/NVMe/NVMeController.cpp +++ b/Kernel/Storage/NVMe/NVMeController.cpp @@ -5,8 +5,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "NVMeController.h" -#include "AK/Format.h" +#include <AK/Format.h> #include <AK/Types.h> #include <Kernel/Arch/SafeMem.h> #include <Kernel/Arch/x86/IO.h> @@ -17,6 +16,7 @@ #include <Kernel/FileSystem/ProcFS.h> #include <Kernel/Library/LockRefPtr.h> #include <Kernel/Sections.h> +#include <Kernel/Storage/NVMe/NVMeController.h> #include <Kernel/Storage/StorageManagement.h> namespace Kernel { diff --git a/Kernel/Storage/NVMe/NVMeInterruptQueue.cpp b/Kernel/Storage/NVMe/NVMeInterruptQueue.cpp index 105c4a6251..4b8a14e63d 100644 --- a/Kernel/Storage/NVMe/NVMeInterruptQueue.cpp +++ b/Kernel/Storage/NVMe/NVMeInterruptQueue.cpp @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "NVMeInterruptQueue.h" -#include "Kernel/Devices/BlockDevice.h" -#include "NVMeDefinitions.h" +#include <Kernel/Devices/BlockDevice.h> +#include <Kernel/Storage/NVMe/NVMeDefinitions.h> +#include <Kernel/Storage/NVMe/NVMeInterruptQueue.h> #include <Kernel/WorkQueue.h> namespace Kernel { diff --git a/Kernel/Storage/NVMe/NVMeNameSpace.cpp b/Kernel/Storage/NVMe/NVMeNameSpace.cpp index a54cddfcd1..f126f8c10f 100644 --- a/Kernel/Storage/NVMe/NVMeNameSpace.cpp +++ b/Kernel/Storage/NVMe/NVMeNameSpace.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "NVMeNameSpace.h" #include <AK/NonnullOwnPtr.h> #include <Kernel/Devices/DeviceManagement.h> #include <Kernel/Storage/NVMe/NVMeController.h> +#include <Kernel/Storage/NVMe/NVMeNameSpace.h> #include <Kernel/Storage/StorageManagement.h> namespace Kernel { diff --git a/Kernel/Storage/NVMe/NVMeNameSpace.h b/Kernel/Storage/NVMe/NVMeNameSpace.h index 4a1ed072c9..f7c5a1225f 100644 --- a/Kernel/Storage/NVMe/NVMeNameSpace.h +++ b/Kernel/Storage/NVMe/NVMeNameSpace.h @@ -6,9 +6,9 @@ #pragma once -#include "AK/kmalloc.h" #include <AK/OwnPtr.h> #include <AK/Types.h> +#include <AK/kmalloc.h> #include <Kernel/Library/LockRefPtr.h> #include <Kernel/Library/NonnullLockRefPtr.h> #include <Kernel/Library/NonnullLockRefPtrVector.h> diff --git a/Kernel/Storage/NVMe/NVMePollQueue.cpp b/Kernel/Storage/NVMe/NVMePollQueue.cpp index 7219034666..086c042a51 100644 --- a/Kernel/Storage/NVMe/NVMePollQueue.cpp +++ b/Kernel/Storage/NVMe/NVMePollQueue.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "NVMePollQueue.h" -#include "Kernel/Arch/x86/IO.h" -#include "Kernel/Devices/BlockDevice.h" -#include "NVMeDefinitions.h" +#include <Kernel/Arch/x86/IO.h> +#include <Kernel/Devices/BlockDevice.h> +#include <Kernel/Storage/NVMe/NVMeDefinitions.h> +#include <Kernel/Storage/NVMe/NVMePollQueue.h> namespace Kernel { UNMAP_AFTER_INIT NVMePollQueue::NVMePollQueue(NonnullOwnPtr<Memory::Region> rw_dma_region, Memory::PhysicalPage const& rw_dma_page, u16 qid, u32 q_depth, OwnPtr<Memory::Region> cq_dma_region, NonnullRefPtrVector<Memory::PhysicalPage> cq_dma_page, OwnPtr<Memory::Region> sq_dma_region, NonnullRefPtrVector<Memory::PhysicalPage> sq_dma_page, Memory::TypedMapping<volatile DoorbellRegister> db_regs) diff --git a/Kernel/Storage/NVMe/NVMeQueue.cpp b/Kernel/Storage/NVMe/NVMeQueue.cpp index 8e206e07aa..46cd951ab7 100644 --- a/Kernel/Storage/NVMe/NVMeQueue.cpp +++ b/Kernel/Storage/NVMe/NVMeQueue.cpp @@ -4,13 +4,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "NVMeQueue.h" -#include "Kernel/StdLib.h" -#include "NVMeQueue.h" #include <Kernel/Arch/x86/IO.h> +#include <Kernel/StdLib.h> #include <Kernel/Storage/NVMe/NVMeController.h> #include <Kernel/Storage/NVMe/NVMeInterruptQueue.h> #include <Kernel/Storage/NVMe/NVMePollQueue.h> +#include <Kernel/Storage/NVMe/NVMeQueue.h> namespace Kernel { ErrorOr<NonnullLockRefPtr<NVMeQueue>> NVMeQueue::try_create(u16 qid, Optional<u8> irq, u32 q_depth, OwnPtr<Memory::Region> cq_dma_region, NonnullRefPtrVector<Memory::PhysicalPage> cq_dma_page, OwnPtr<Memory::Region> sq_dma_region, NonnullRefPtrVector<Memory::PhysicalPage> sq_dma_page, Memory::TypedMapping<volatile DoorbellRegister> db_regs) |