From b301047903b79560dce69085fc271a653a1eb4b6 Mon Sep 17 00:00:00 2001
From: Amlal <amlal@nekernel.org>
Date: Sat, 16 Aug 2025 00:03:56 +0200
Subject: feat: ACPI: Better error handling.

Signed-off-by: Amlal <amlal@nekernel.org>
---
 dev/kernel/src/ACPIFactoryInterface.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'dev/kernel/src/ACPIFactoryInterface.cc')

diff --git a/dev/kernel/src/ACPIFactoryInterface.cc b/dev/kernel/src/ACPIFactoryInterface.cc
index 8cc11cad..01f30500 100644
--- a/dev/kernel/src/ACPIFactoryInterface.cc
+++ b/dev/kernel/src/ACPIFactoryInterface.cc
@@ -10,12 +10,11 @@
 #include <modules/ACPI/ACPIFactoryInterface.h>
 
 namespace Kernel {
-constexpr STATIC const auto kMinACPIVer = 1;
+constexpr STATIC const auto kMinACPIVer = 1U;
 
 /// @brief Finds a descriptor table inside ACPI XSDT.
 ErrorOr<voidPtr> ACPIFactoryInterface::Find(const Char* signature) {
-  MUST_PASS(this->fRsdp);
-
+  if (this->fRsdp) return ErrorOr<voidPtr>{kErrorInvalidData};
   if (!signature) return ErrorOr<voidPtr>{-kErrorInvalidData};
   if (*signature == 0) return ErrorOr<voidPtr>{-kErrorInvalidData};
 
@@ -33,7 +32,7 @@ ErrorOr<voidPtr> ACPIFactoryInterface::Find(const Char* signature) {
   if (num < 1) {
     /// stop here, we should have entries...
     ke_panic(RUNTIME_CHECK_ACPI);
-    return ErrorOr<voidPtr>{-1};
+    return ErrorOr<voidPtr>{-kErrorInvalidData};
   }
 
   this->fEntries = num;
@@ -62,7 +61,7 @@ ErrorOr<voidPtr> ACPIFactoryInterface::Find(const Char* signature) {
     }
   }
 
-  return ErrorOr<voidPtr>{-1};
+  return ErrorOr<voidPtr>{-kErrorInvalidData};
 }
 
 /***
-- 
cgit v1.2.3