RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:17:35 +00:00
Code Issues Activity Actions

Kernel: Adjust includes after file reorganization

Browse source
This commit is contained in:
Tiaan Louw 2022-04-08 03:51:08 +02:00 • committed by Linus Groh
parent 382eacc08e
commit 678555af97
14 changed files with 38 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

0
Kernel/Arch/aarch64/dummy.cpp → Kernel/Arch/aarch64/Dummy.cpp
View file

4
Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp
View file

@ -4,10 +4,10 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Arch/aarch64/Prekernel.h> #include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
#include <Kernel/Arch/aarch64/ASM_wrapper.h> #include <Kernel/Arch/aarch64/ASM_wrapper.h>
#include <Kernel/Arch/aarch64/UART.h> #include <Kernel/Arch/aarch64/RPi/UART.h>
namespace Prekernel { namespace Prekernel {

4
Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
View file

@ -5,8 +5,8 @@
*/ */
#include <Kernel/Arch/aarch64/ASM_wrapper.h> #include <Kernel/Arch/aarch64/ASM_wrapper.h>
#include <Kernel/Arch/aarch64/Aarch64_asm_utils.h> #include <Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h>
#include <Kernel/Arch/aarch64/Prekernel.h> #include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
#include <Kernel/Arch/aarch64/Registers.h> #include <Kernel/Arch/aarch64/Registers.h>
extern "C" void enter_el2_from_el3(); extern "C" void enter_el2_from_el3();

6
Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
View file

@ -6,12 +6,12 @@
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Arch/aarch64/Prekernel.h> #include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
#include <Kernel/Arch/aarch64/ASM_wrapper.h> #include <Kernel/Arch/aarch64/ASM_wrapper.h>
#include <Kernel/Arch/aarch64/MMIO.h> #include <Kernel/Arch/aarch64/RPi/MMIO.h>
#include <Kernel/Arch/aarch64/RPi/UART.h>
#include <Kernel/Arch/aarch64/Registers.h> #include <Kernel/Arch/aarch64/Registers.h>
#include <Kernel/Arch/aarch64/UART.h>
// Documentation here for Aarch64 Address Translations // Documentation here for Aarch64 Address Translations
// https://documentation-service.arm.com/static/5efa1d23dbdee951c1ccdec5?token= // https://documentation-service.arm.com/static/5efa1d23dbdee951c1ccdec5?token=

4
Kernel/Arch/aarch64/RPi/Framebuffer.cpp
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Arch/aarch64/Framebuffer.h> #include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
#include <Kernel/Arch/aarch64/FramebufferMailboxMessages.h> #include <Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h>
#include <Kernel/Arch/aarch64/Utils.h> #include <Kernel/Arch/aarch64/Utils.h>
namespace Prekernel { namespace Prekernel {

2
Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h
View file

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <Kernel/Arch/aarch64/Mailbox.h> #include <Kernel/Arch/aarch64/RPi/Mailbox.h>
namespace Prekernel { namespace Prekernel {

4
Kernel/Arch/aarch64/RPi/GPIO.cpp
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Arch/aarch64/GPIO.h> #include <Kernel/Arch/aarch64/RPi/GPIO.h>
#include <Kernel/Arch/aarch64/MMIO.h> #include <Kernel/Arch/aarch64/RPi/MMIO.h>
extern "C" void wait_cycles(int n); extern "C" void wait_cycles(int n);

2
Kernel/Arch/aarch64/RPi/MMIO.cpp
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Arch/aarch64/MMIO.h>
#include <Kernel/Arch/aarch64/MainIdRegister.h> #include <Kernel/Arch/aarch64/MainIdRegister.h>
#include <Kernel/Arch/aarch64/RPi/MMIO.h>
namespace Prekernel { namespace Prekernel {

4
Kernel/Arch/aarch64/RPi/Mailbox.cpp
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Arch/aarch64/MMIO.h> #include <Kernel/Arch/aarch64/RPi/MMIO.h>
#include <Kernel/Arch/aarch64/Mailbox.h> #include <Kernel/Arch/aarch64/RPi/Mailbox.h>
namespace Prekernel { namespace Prekernel {

6
Kernel/Arch/aarch64/RPi/Timer.cpp
View file

@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Arch/aarch64/MMIO.h> #include <Kernel/Arch/aarch64/RPi/MMIO.h>
#include <Kernel/Arch/aarch64/Mailbox.h> #include <Kernel/Arch/aarch64/RPi/Mailbox.h>
#include <Kernel/Arch/aarch64/Timer.h> #include <Kernel/Arch/aarch64/RPi/Timer.h>
#include <Kernel/Arch/aarch64/Utils.h> #include <Kernel/Arch/aarch64/Utils.h>
namespace Prekernel { namespace Prekernel {

8
Kernel/Arch/aarch64/RPi/UART.cpp
View file

@ -4,10 +4,10 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Arch/aarch64/GPIO.h> #include <Kernel/Arch/aarch64/RPi/GPIO.h>
#include <Kernel/Arch/aarch64/MMIO.h> #include <Kernel/Arch/aarch64/RPi/MMIO.h>
#include <Kernel/Arch/aarch64/Timer.h> #include <Kernel/Arch/aarch64/RPi/Timer.h>
#include <Kernel/Arch/aarch64/UART.h> #include <Kernel/Arch/aarch64/RPi/UART.h>
namespace Prekernel { namespace Prekernel {

2
Kernel/Arch/aarch64/Utils.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Arch/aarch64/UART.h> #include <Kernel/Arch/aarch64/RPi/UART.h>
#include <Kernel/Arch/aarch64/Utils.h> #include <Kernel/Arch/aarch64/Utils.h>
void Prekernel::dbgln(char const* text) void Prekernel::dbgln(char const* text)

12
Kernel/Arch/aarch64/init.cpp
View file

@ -10,13 +10,13 @@
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Arch/aarch64/ASM_wrapper.h> #include <Kernel/Arch/aarch64/ASM_wrapper.h>
#include <Kernel/Arch/aarch64/Aarch64_asm_utils.h>
#include <Kernel/Arch/aarch64/BootPPMParser.h> #include <Kernel/Arch/aarch64/BootPPMParser.h>
#include <Kernel/Arch/aarch64/Framebuffer.h> #include <Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h>
#include <Kernel/Arch/aarch64/Mailbox.h> #include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
#include <Kernel/Arch/aarch64/Prekernel.h> #include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
#include <Kernel/Arch/aarch64/Timer.h> #include <Kernel/Arch/aarch64/RPi/Mailbox.h>
#include <Kernel/Arch/aarch64/UART.h> #include <Kernel/Arch/aarch64/RPi/Timer.h>
#include <Kernel/Arch/aarch64/RPi/UART.h>
#include <Kernel/Arch/aarch64/Utils.h> #include <Kernel/Arch/aarch64/Utils.h>
static void draw_logo(); static void draw_logo();

23
Kernel/CMakeLists.txt
View file

@ -413,27 +413,18 @@ else()
Arch/aarch64/BootPPMParser.cpp Arch/aarch64/BootPPMParser.cpp
Arch/aarch64/CrashHandler.cpp Arch/aarch64/CrashHandler.cpp
Arch/aarch64/Dummy.cpp
Arch/aarch64/MainIdRegister.cpp Arch/aarch64/MainIdRegister.cpp
Arch/aarch64/PageDirectory.cpp Arch/aarch64/PageDirectory.cpp
Arch/aarch64/Utils.cpp
Arch/aarch64/Dummy.cpp
# Preload specific
Arch/aarch64/init.cpp
Arch/aarch64/PrekernelMMU.cpp
Arch/aarch64/PrekernelExceptions.cpp
Arch/aarch64/PrekernelCommon.cpp
# Assembly
Arch/aarch64/boot.S
Arch/aarch64/Aarch64_asm_utils.S
Arch/aarch64/vector_table.S
Arch/aarch64/SmapDisabler.cpp
Arch/aarch64/ScopedCritical.cpp Arch/aarch64/ScopedCritical.cpp
Arch/aarch64/SmapDisabler.cpp
Arch/aarch64/Utils.cpp
Arch/aarch64/init.cpp
Arch/aarch64/vector_table.S
MiniStdLib.cpp # Files from base Kernel
Heap/kmalloc.cpp Heap/kmalloc.cpp
MiniStdLib.cpp
Memory/AddressSpace.cpp Memory/AddressSpace.cpp
Memory/AnonymousVMObject.cpp Memory/AnonymousVMObject.cpp