Merge pull request #32 from nekernel-org/dev

0.0.2e3

1 files changed, 7 insertions, 6 deletions

diff --git a/dev/kernel/src/ACPIFactoryInterface.cc b/dev/kernel/src/ACPIFactoryInterface.cc
index a76caff2..8cc11cad 100644
--- a/dev/kernel/src/ACPIFactoryInterface.cc
+++ b/dev/kernel/src/ACPIFactoryInterface.cc
@@ -5,22 +5,23 @@
 ------------------------------------------- */
 
 #include <ArchKit/ArchKit.h>
-#include <KernelKit/MemoryMgr.h>
-#include <NewKit/KString.h>
+#include <KernelKit/HeapMgr.h>
+#include <NeKit/KString.h>
 #include <modules/ACPI/ACPIFactoryInterface.h>
 
 namespace Kernel {
+constexpr STATIC const auto kMinACPIVer = 1;
+
 /// @brief Finds a descriptor table inside ACPI XSDT.
 ErrorOr<voidPtr> ACPIFactoryInterface::Find(const Char* signature) {
   MUST_PASS(this->fRsdp);
 
-  if (!signature) return ErrorOr<voidPtr>{-1};
-
-  if (*signature == 0) return ErrorOr<voidPtr>{-1};
+  if (!signature) return ErrorOr<voidPtr>{-kErrorInvalidData};
+  if (*signature == 0) return ErrorOr<voidPtr>{-kErrorInvalidData};
 
   RSDP* rsp_ptr = reinterpret_cast<RSDP*>(this->fRsdp);
 
-  if (rsp_ptr->Revision <= 1) return ErrorOr<voidPtr>{-1};
+  if (rsp_ptr->Revision < kMinACPIVer) return ErrorOr<voidPtr>{-kErrorInvalidData};
 
   RSDT* xsdt = reinterpret_cast<RSDT*>(rsp_ptr->RsdtAddress);