From e80b274a23cb6bbe83bc48058c779624b16dd556 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Tue, 7 May 2024 14:46:11 +0200
Subject: MHR-23: ErrorID error codes are now deprecated in favor of HError.

- Cleanup done in SystemLib.
- Refactor system API.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/KernelKit/FileManager.hpp | 5 ++---
 Private/KernelKit/HError.hpp      | 2 +-
 Private/KernelKit/Timer.hpp       | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'Private/KernelKit')

diff --git a/Private/KernelKit/FileManager.hpp b/Private/KernelKit/FileManager.hpp
index 142e1afd..7da08cbb 100644
--- a/Private/KernelKit/FileManager.hpp
+++ b/Private/KernelKit/FileManager.hpp
@@ -20,7 +20,6 @@
 
 #include <CompilerKit/CompilerKit.hxx>
 #include <HintKit/CompilerHint.hxx>
-#include <NewKit/ErrorID.hpp>
 #include <NewKit/Ref.hpp>
 #include <NewKit/Stream.hpp>
 
@@ -159,7 +158,7 @@ namespace NewOS
 		ErrorOr<Int64> WriteAll(const VoidPtr data) noexcept
 		{
 			if (data == nullptr)
-				return ErrorOr<Int64>(H_INVALID_DATA);
+				return ErrorOr<Int64>(kErrorInvalidData);
 
 			auto man = FSClass::GetMounted();
 
@@ -169,7 +168,7 @@ namespace NewOS
 				return ErrorOr<Int64>(0);
 			}
 
-			return ErrorOr<Int64>(H_INVALID_DATA);
+			return ErrorOr<Int64>(kErrorInvalidData);
 		}
 
 		VoidPtr Read() noexcept
diff --git a/Private/KernelKit/HError.hpp b/Private/KernelKit/HError.hpp
index 5a4f49fb..50cc5522 100644
--- a/Private/KernelKit/HError.hpp
+++ b/Private/KernelKit/HError.hpp
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <NewKit/Defines.hpp>
-#include <NewKit/ErrorID.hpp>
 
 namespace NewOS
 {
@@ -37,6 +36,7 @@ namespace NewOS
 	inline constexpr HError kErrorNoEntrypoint		 = 53;
 	inline constexpr HError kErrorDiskIsCorrupted	 = 54;
 	inline constexpr HError kErrorDisk				 = 55;
+	inline constexpr HError kErrorInvalidData		 = 56;
 	inline constexpr HError kErrorUnimplemented		 = 0;
 
 	Boolean ke_bug_check(void) noexcept;
diff --git a/Private/KernelKit/Timer.hpp b/Private/KernelKit/Timer.hpp
index fac1b11f..5f133dfe 100644
--- a/Private/KernelKit/Timer.hpp
+++ b/Private/KernelKit/Timer.hpp
@@ -8,8 +8,7 @@
 
 #include <ArchKit/ArchKit.hpp>
 #include <CompilerKit/CompilerKit.hxx>
-
-#include <NewKit/ErrorID.hpp>
+#include <KernelKit/HError.hpp>
 
 namespace NewOS
 {
-- 
cgit v1.2.3