summaryrefslogtreecommitdiffhomepage
path: root/Kernel
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-07-10 14:25:37 +0200
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-07-10 14:25:37 +0200
commit0402a1c2feb8e8036c56dfc51d13e63ef3133208 (patch)
tree3d916e3e38fbb1b63eb29c97da1f5b6441f0dad1 /Kernel
parent7516413c8b3156cc75e349f5f8b3392c3b4f885d (diff)
[MHR-36] Giving priority to NVMe module suport.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'Kernel')
-rw-r--r--Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cxx9
-rw-r--r--Kernel/HALKit/AMD64/HalKernelMain.cxx4
-rw-r--r--Kernel/HALKit/ARM64/HalKernelMain.cxx4
-rw-r--r--Kernel/KernelKit/ProcessHeap.hxx (renamed from Kernel/KernelKit/ProcessHeap.hpp)2
-rw-r--r--Kernel/KernelKit/ProcessScheduler.hxx2
-rw-r--r--Kernel/Modules/ACPI/ACPIFactoryInterface.hxx4
-rw-r--r--Kernel/NewKit/Json.hxx (renamed from Kernel/NewKit/Json.hpp)0
-rw-r--r--Kernel/NewKit/NewKit.hpp4
-rw-r--r--Kernel/Sources/Json.cxx2
-rw-r--r--Kernel/Sources/KeMain.cxx4
-rw-r--r--Kernel/Sources/ProcessHeap.cxx2
11 files changed, 23 insertions, 14 deletions
diff --git a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cxx b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cxx
index 86bf635c..76e447be 100644
--- a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cxx
+++ b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cxx
@@ -24,7 +24,7 @@
/// @brief assembly routine. internal use only.
EXTERN_C void _hal_enable_smp(void);
-/// @note: _hal_switch_context
+/// @note: _hal_switch_context is internal
///////////////////////////////////////////////////////////////////////////////////////
@@ -169,10 +169,13 @@ namespace Kernel::HAL
return cFramePtr;
}
+ /// @internal
EXTERN_C Void hal_apic_acknowledge(Void)
{
+ kcout << "newoskrnl: acknowledge APIC.\r";
}
+ /// @internal
EXTERN_C Void _hal_switch_context(HAL::StackFramePtr stackFrame)
{
hal_switch_context(stackFrame);
@@ -182,7 +185,9 @@ namespace Kernel::HAL
{
Semaphore sem;
- HardwareTimer timer(Seconds(5));
+ constexpr auto cSeconds = 1U;
+
+ HardwareTimer timer(Seconds(cSeconds));
sem.LockOrWait(&ProcessScheduler::The().Leak().TheCurrent().Leak(), &timer);
cFramePtr = stackFrame;
diff --git a/Kernel/HALKit/AMD64/HalKernelMain.cxx b/Kernel/HALKit/AMD64/HalKernelMain.cxx
index a279b776..dc3ae4d0 100644
--- a/Kernel/HALKit/AMD64/HalKernelMain.cxx
+++ b/Kernel/HALKit/AMD64/HalKernelMain.cxx
@@ -12,8 +12,8 @@
#include <KernelKit/KernelHeap.hpp>
#include <KernelKit/PEFCodeManager.hxx>
#include <KernelKit/ProcessScheduler.hxx>
-#include <KernelKit/ProcessHeap.hpp>
-#include <NewKit/Json.hpp>
+#include <KernelKit/ProcessHeap.hxx>
+#include <NewKit/Json.hxx>
#include <Modules/CoreCG/Accessibility.hxx>
#include <KernelKit/CodeManager.hpp>
#include <Modules/ACPI/ACPIFactoryInterface.hxx>
diff --git a/Kernel/HALKit/ARM64/HalKernelMain.cxx b/Kernel/HALKit/ARM64/HalKernelMain.cxx
index 3fb18737..1d82aeba 100644
--- a/Kernel/HALKit/ARM64/HalKernelMain.cxx
+++ b/Kernel/HALKit/ARM64/HalKernelMain.cxx
@@ -12,8 +12,8 @@
#include <KernelKit/KernelHeap.hpp>
#include <KernelKit/PEFCodeManager.hxx>
#include <KernelKit/ProcessScheduler.hxx>
-#include <KernelKit/ProcessHeap.hpp>
-#include <NewKit/Json.hpp>
+#include <KernelKit/ProcessHeap.hxx>
+#include <NewKit/Json.hxx>
#include <Modules/CoreCG/Accessibility.hxx>
#include <KernelKit/CodeManager.hpp>
#include <Modules/ACPI/ACPIFactoryInterface.hxx>
diff --git a/Kernel/KernelKit/ProcessHeap.hpp b/Kernel/KernelKit/ProcessHeap.hxx
index 0682d969..6fa397b3 100644
--- a/Kernel/KernelKit/ProcessHeap.hpp
+++ b/Kernel/KernelKit/ProcessHeap.hxx
@@ -14,7 +14,7 @@
#include <NewKit/Pmm.hpp>
/// @version 5/11/23
-/// @file ProcessHeap.hpp
+/// @file ProcessHeap.hxx
/// @brief memory heap for user processes.
#define kUserHeapMaxSz (4096)
diff --git a/Kernel/KernelKit/ProcessScheduler.hxx b/Kernel/KernelKit/ProcessScheduler.hxx
index 578dc163..5e7a6e55 100644
--- a/Kernel/KernelKit/ProcessScheduler.hxx
+++ b/Kernel/KernelKit/ProcessScheduler.hxx
@@ -10,7 +10,7 @@
#include <ArchKit/ArchKit.hpp>
#include <KernelKit/LockDelegate.hpp>
#include <KernelKit/PermissionSelector.hxx>
-#include <KernelKit/ProcessHeap.hpp>
+#include <KernelKit/ProcessHeap.hxx>
#include <NewKit/MutableArray.hpp>
#define kSchedMinMicroTime (AffinityKind::kHartStandard)
diff --git a/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx b/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx
index e5def104..fc49c2b9 100644
--- a/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx
+++ b/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx
@@ -14,6 +14,10 @@
namespace Kernel
{
+ class ACPIFactoryInterface;
+
+ typedef ACPIFactoryInterface PowerFactoryInterface;
+
class ACPIFactoryInterface final
{
public:
diff --git a/Kernel/NewKit/Json.hpp b/Kernel/NewKit/Json.hxx
index b2a0d872..b2a0d872 100644
--- a/Kernel/NewKit/Json.hpp
+++ b/Kernel/NewKit/Json.hxx
diff --git a/Kernel/NewKit/NewKit.hpp b/Kernel/NewKit/NewKit.hpp
index 8ca19ec8..90c0cf6e 100644
--- a/Kernel/NewKit/NewKit.hpp
+++ b/Kernel/NewKit/NewKit.hpp
@@ -10,7 +10,7 @@
#include <NewKit/Array.hpp>
#include <NewKit/ArrayList.hpp>
#include <NewKit/ErrorOr.hpp>
-#include <NewKit/Json.hpp>
+#include <NewKit/Json.hxx>
#include <NewKit/KernelCheck.hpp>
#include <KernelKit/LockDelegate.hpp>
#include <NewKit/MutableArray.hpp>
@@ -18,5 +18,5 @@
#include <NewKit/OwnPtr.hpp>
#include <NewKit/Ref.hpp>
#include <NewKit/Stream.hpp>
-#include <KernelKit/ProcessHeap.hpp>
+#include <KernelKit/ProcessHeap.hxx>
#include <NewKit/Utils.hpp>
diff --git a/Kernel/Sources/Json.cxx b/Kernel/Sources/Json.cxx
index 16a74765..f27c1486 100644
--- a/Kernel/Sources/Json.cxx
+++ b/Kernel/Sources/Json.cxx
@@ -4,7 +4,7 @@
------------------------------------------- */
-#include <NewKit/Json.hpp>
+#include <NewKit/Json.hxx>
using namespace Kernel;
diff --git a/Kernel/Sources/KeMain.cxx b/Kernel/Sources/KeMain.cxx
index 011e59a4..ddcdb6f9 100644
--- a/Kernel/Sources/KeMain.cxx
+++ b/Kernel/Sources/KeMain.cxx
@@ -17,8 +17,8 @@
#include <KernelKit/PEF.hpp>
#include <KernelKit/PEFCodeManager.hxx>
#include <KernelKit/ProcessScheduler.hxx>
-#include <KernelKit/ProcessHeap.hpp>
-#include <NewKit/Json.hpp>
+#include <KernelKit/ProcessHeap.hxx>
+#include <NewKit/Json.hxx>
#include <NewKit/KernelCheck.hpp>
#include <NewKit/String.hpp>
#include <NewKit/Utils.hpp>
diff --git a/Kernel/Sources/ProcessHeap.cxx b/Kernel/Sources/ProcessHeap.cxx
index b5988c5f..5efe8fd4 100644
--- a/Kernel/Sources/ProcessHeap.cxx
+++ b/Kernel/Sources/ProcessHeap.cxx
@@ -5,7 +5,7 @@
------------------------------------------- */
#include <KernelKit/ProcessScheduler.hxx>
-#include <KernelKit/ProcessHeap.hpp>
+#include <KernelKit/ProcessHeap.hxx>
#include <NewKit/PageManager.hpp>
#define kHeapHeaderPaddingSz (16U)