From 9db58da40cfcb6643412bfae25aefc0cd1077f9d Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>
Date: Mon, 27 May 2024 20:45:46 +0200
Subject: MHR-23: Improve project structure, make it better.

Signed-off-by: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>
---
 Kernel/KernelKit/DeviceManager.hpp |  4 +---
 Kernel/KernelKit/DriveManager.hxx  |  6 ++++--
 Kernel/KernelKit/Framebuffer.hpp   |  1 +
 Kernel/KernelKit/XCOFF.hxx         | 24 ++++++++++++++++++------
 4 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'Kernel/KernelKit')

diff --git a/Kernel/KernelKit/DeviceManager.hpp b/Kernel/KernelKit/DeviceManager.hpp
index 6e2a803f..dc53fed5 100644
--- a/Kernel/KernelKit/DeviceManager.hpp
+++ b/Kernel/KernelKit/DeviceManager.hpp
@@ -21,8 +21,6 @@
 #include <NewKit/ErrorOr.hpp>
 #include <NewKit/Ref.hpp>
 
-#define kDriveManagerCount 4U
-
 // Last Rev
 // Wed, Apr  3, 2024  9:09:41 AM
 
@@ -70,7 +68,7 @@ namespace NewOS
 		}
 		bool operator!()
 		{
-			return !fOut && !fIn;
+			return !fOut || !fIn;
 		}
 
 	private:
diff --git a/Kernel/KernelKit/DriveManager.hxx b/Kernel/KernelKit/DriveManager.hxx
index 7978221a..019812a3 100644
--- a/Kernel/KernelKit/DriveManager.hxx
+++ b/Kernel/KernelKit/DriveManager.hxx
@@ -14,8 +14,10 @@
 #include <NewKit/Defines.hpp>
 #include <NewKit/String.hpp>
 
-#define kDriveInvalidID -1
-#define kDriveNameLen	32
+#define kDriveManagerCount 	(4U)
+
+#define kDriveInvalidID 	(-1)
+#define kDriveNameLen		(32)
 
 namespace NewOS
 {
diff --git a/Kernel/KernelKit/Framebuffer.hpp b/Kernel/KernelKit/Framebuffer.hpp
index fd4eff04..1f189e77 100644
--- a/Kernel/KernelKit/Framebuffer.hpp
+++ b/Kernel/KernelKit/Framebuffer.hpp
@@ -39,6 +39,7 @@ namespace NewOS
 			: fFrameBufferAddr(addr)
 		{
 		}
+		
 		~Framebuffer()
 		{
 		}
diff --git a/Kernel/KernelKit/XCOFF.hxx b/Kernel/KernelKit/XCOFF.hxx
index f2e49c4c..55e37bfd 100644
--- a/Kernel/KernelKit/XCOFF.hxx
+++ b/Kernel/KernelKit/XCOFF.hxx
@@ -16,12 +16,15 @@
 
 #include <NewKit/Defines.hpp>
 
-#define kXCOFF64Magic (0x01F7)
+#define cXCOFF64Magic 	 (0x01F7)
 
-#define kXCOFFRelFlg	 (0x0001)
-#define kXCOFFExecutable (0x0002)
-#define kXCOFFLnno		 (0x0004)
-#define kXCOFFLSyms		 (0x0008)
+#define cXCOFFRelFlg	 (0x0001)
+#define cXCOFFExecutable (0x0002)
+#define cXCOFFLnno		 (0x0004)
+#define cXCOFFLSyms		 (0x0008)
+
+struct XCoffFileHeader;
+struct XCoffForkHeader;
 
 /// @brief XCoff file header, meant for POWER apps.
 typedef struct XCoffFileHeader
@@ -33,6 +36,15 @@ typedef struct XCoffFileHeader
 	NewOS::UIntPtr fSymPtr;
 	NewOS::UInt32  fNumSyms;
 	NewOS::UInt16  fOptHdr; // ?: Number of bytes in optional header
-} XCoffFileHeader;
+} XCoffFileHeader32, XCoffFileHeader64;
+
+#define cForkNameLen (255)
+
+/// @brief This the executable manifest fork.
+typedef struct XCoffForkHeader {
+	NewOS::Char	   fPropertiesXMLFork[cForkNameLen];
+	NewOS::Char	   fDynamicLoaderFork[cForkNameLen];
+	NewOS::Char	   fCodeSignFork[cForkNameLen];
+} XCoffForkHeader;
 
 #endif // ifndef __XCOFF__
-- 
cgit v1.2.3