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>

8 files changed, 9 insertions, 32 deletions

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
 {
diff --git a/Private/NewKit/Application.hxx b/Private/NewKit/Application.hxx
index 78ae20cd..aae97c6f 100644
--- a/Private/NewKit/Application.hxx
+++ b/Private/NewKit/Application.hxx
@@ -17,7 +17,7 @@
 
 /// \brief Application Interface.
 /// \author Amlal El Mahrouss
-typedef struct _Application final
+typedef struct _ApplicationInterface final
 {
 	/// @brief Releases the object exit the process on main object.
 	NewOS::Void (*Release)(struct _Application* Self, NewOS::Int32 ExitCode);
@@ -26,6 +26,6 @@ typedef struct _Application final
 	/// @brief Query a new application object from a GUID.
 	/// @note this doesn't query a process, it query a registered object withtin that app.
 	NewOS::Void (*Query)(struct _Application* Self, NewOS::VoidPtr* Dst, NewOS::SizeT SzDst, NewOS::XRN::GUIDSequence GuidOf);
-} Application, *ApplicationRef;
+} ApplicationInterface, *ApplicationInterfaceRef;
 
-#define app_cast reinterpret_cast<ApplicationRef>
+#define app_cast reinterpret_cast<ApplicationInterfaceRef>
diff --git a/Private/NewKit/ErrorID.hpp b/Private/NewKit/ErrorID.hpp
deleted file mode 100644
index fcd574e2..00000000
--- a/Private/NewKit/ErrorID.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -------------------------------------------
-
-    Copyright Mahrouss Logic
-
-------------------------------------------- */
-
-#pragma once
-
-/// @brief Internal kernel errors.
-
-#include <NewKit/ErrorOr.hpp>
-#include <NewKit/Defines.hpp>
-
-#define H_EXEC_ERROR	 33
-#define H_FILE_NOT_FOUND 35
-#define H_DIR_NOT_FOUND	 36
-#define H_FILE_EXISTS	 46
-#define H_UNIMPLEMENTED	 0
-#define H_INVALID_DATA	 1
diff --git a/Private/Source/FileManager.cxx b/Private/Source/FileManager.cxx
index 58330c9b..5f6ed174 100644
--- a/Private/Source/FileManager.cxx
+++ b/Private/Source/FileManager.cxx
@@ -5,7 +5,6 @@
 ------------------------------------------- */
 
 #include <KernelKit/FileManager.hpp>
-#include <NewKit/ErrorID.hpp>
 #include <NewKit/Utils.hpp>
 
 /// BUGS: 0
diff --git a/Private/Source/PEFCodeManager.cxx b/Private/Source/PEFCodeManager.cxx
index 356cd992..a3afbd52 100644
--- a/Private/Source/PEFCodeManager.cxx
+++ b/Private/Source/PEFCodeManager.cxx
@@ -10,7 +10,6 @@
 #include <KernelKit/PEFCodeManager.hxx>
 #include <KernelKit/ProcessScheduler.hpp>
 #include <NewKit/Defines.hpp>
-#include <NewKit/ErrorID.hpp>
 #include <NewKit/KernelCheck.hpp>
 #include <NewKit/OwnPtr.hpp>
 #include <NewKit/String.hpp>
@@ -172,7 +171,7 @@ namespace NewOS
 		if (auto sym = this->FindSymbol(kPefStart, kPefCode); sym)
 			return ErrorOr<VoidPtr>(sym);
 
-		return ErrorOr<VoidPtr>(H_EXEC_ERROR);
+		return ErrorOr<VoidPtr>(kErrorExecutable);
 	}
 
 	/// @brief Tells if the executable is loaded or not.
diff --git a/Private/Source/Timer.cxx b/Private/Source/Timer.cxx
index da80db1e..962b3367 100644
--- a/Private/Source/Timer.cxx
+++ b/Private/Source/Timer.cxx
@@ -14,7 +14,7 @@ using namespace NewOS;
 /// @brief Unimplemented as it is an interface.
 Int32 HardwareTimerInterface::Wait() noexcept
 {
-	return H_UNIMPLEMENTED;
+	return kErrorUnimplemented;
 }
 
 /// @brief HardwareTimer class, meant to be generic.