From 2b44c4c3f7321320f54e530992d1e71b822af596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Holz?= <sholz8530@gmail.com>
Date: Tue, 12 Dec 2023 17:17:05 +0100
Subject: [PATCH] Kernel/riscv64: Make the kernel compilable using GCC

This commit adds all necessary includes, so all functions are properly
declared.
PCI.cpp is moved to PCI/Initializer.cpp, as that matches the header
path.
---
 Kernel/Arch/riscv64/DebugOutput.cpp                  | 1 +
 Kernel/Arch/riscv64/Interrupts.cpp                   | 2 ++
 Kernel/Arch/riscv64/{PCI.cpp => PCI/Initializer.cpp} | 1 +
 Kernel/Arch/riscv64/PageDirectory.h                  | 2 +-
 Kernel/CMakeLists.txt                                | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)
 rename Kernel/Arch/riscv64/{PCI.cpp => PCI/Initializer.cpp} (88%)

diff --git a/Kernel/Arch/riscv64/DebugOutput.cpp b/Kernel/Arch/riscv64/DebugOutput.cpp
index 653e1cc3e0..57071bda9e 100644
--- a/Kernel/Arch/riscv64/DebugOutput.cpp
+++ b/Kernel/Arch/riscv64/DebugOutput.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Arch/DebugOutput.h>
 #include <Kernel/Library/Assertions.h>
 
 namespace Kernel {
diff --git a/Kernel/Arch/riscv64/Interrupts.cpp b/Kernel/Arch/riscv64/Interrupts.cpp
index 620ca4e659..48455d1586 100644
--- a/Kernel/Arch/riscv64/Interrupts.cpp
+++ b/Kernel/Arch/riscv64/Interrupts.cpp
@@ -7,6 +7,8 @@
 #include <AK/Error.h>
 #include <AK/Types.h>
 
+#include <Kernel/Arch/CPU.h>
+#include <Kernel/Arch/Interrupts.h>
 #include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Interrupts/GenericInterruptHandler.h>
 
diff --git a/Kernel/Arch/riscv64/PCI.cpp b/Kernel/Arch/riscv64/PCI/Initializer.cpp
similarity index 88%
rename from Kernel/Arch/riscv64/PCI.cpp
rename to Kernel/Arch/riscv64/PCI/Initializer.cpp
index 83f80bdf82..9d9a3324ec 100644
--- a/Kernel/Arch/riscv64/PCI.cpp
+++ b/Kernel/Arch/riscv64/PCI/Initializer.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Bus/PCI/Initializer.h>
 #include <Kernel/Library/Assertions.h>
 
 namespace Kernel::PCI {
diff --git a/Kernel/Arch/riscv64/PageDirectory.h b/Kernel/Arch/riscv64/PageDirectory.h
index 5079cf07bb..52c9a5c8b4 100644
--- a/Kernel/Arch/riscv64/PageDirectory.h
+++ b/Kernel/Arch/riscv64/PageDirectory.h
@@ -172,7 +172,7 @@ public:
 
     RISCV64::CSR::SATP satp() const
     {
-        return {
+        return RISCV64::CSR::SATP {
             .PPN = m_directory_table->paddr().get() >> PADDR_PPN_OFFSET,
             .ASID = 0,
             .MODE = RISCV64::CSR::SATP::Mode::Sv39,
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index d479d338da..842733cde9 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -522,7 +522,7 @@ elseif("${SERENITY_ARCH}" STREQUAL "riscv64")
         Arch/riscv64/Interrupts.cpp
         Arch/riscv64/PageDirectory.cpp
         Arch/riscv64/Panic.cpp
-        Arch/riscv64/PCI.cpp
+        Arch/riscv64/PCI/Initializer.cpp
         Arch/riscv64/PowerState.cpp
         Arch/riscv64/pre_init.cpp
         Arch/riscv64/Processor.cpp