Merged in MHR-23 (pull request #15)

MHR-23

5 files changed, 19 insertions, 15 deletions

diff --git a/Kernel/FirmwareKit/EFI.hxx b/Kernel/FirmwareKit/EFI.hxx
index d09e6407..4b230489 100644
--- a/Kernel/FirmwareKit/EFI.hxx
+++ b/Kernel/FirmwareKit/EFI.hxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
diff --git a/Kernel/FirmwareKit/EFI/API.hxx b/Kernel/FirmwareKit/EFI/API.hxx
index 8e8183d6..c6d02a3e 100644
--- a/Kernel/FirmwareKit/EFI/API.hxx
+++ b/Kernel/FirmwareKit/EFI/API.hxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
@@ -21,7 +21,7 @@ class BTextWriter;
 #include <BootKit/BootKit.hxx>
 #include <BootKit/Rsrc/NewBootFatal.rsrc>
 #include <BootKit/Vendor/Qr.hxx>
-#include <Builtins/Toolbox/Toolbox.hxx>
+#include <Builtins/GX/GX>
 #endif // ifdef __NEWBOOT__
 
 inline EfiSystemTable*	ST = nullptr;
@@ -89,13 +89,13 @@ Bascially frees everything we have in the EFI side.
 #endif // ifdef __DEBUG__
 
 #ifdef __NEWBOOT__
-		ToolboxInitRsrc();
+		GXInit();
 
-		ToolboxDrawRsrc(NewBootFatal, NEWBOOTFATAL_HEIGHT, NEWBOOTFATAL_WIDTH,
+		GXDrawImg(NewBootFatal, NEWBOOTFATAL_HEIGHT, NEWBOOTFATAL_WIDTH,
 						(kHandoverHeader->f_GOP.f_Width - NEWBOOTFATAL_WIDTH) / 2,
 						(kHandoverHeader->f_GOP.f_Height - NEWBOOTFATAL_HEIGHT) / 2);
 
-		ToolboxClearRsrc();
+		GXFini();
 
 		/// Show the QR code now.
 
diff --git a/Kernel/FirmwareKit/EFI/EFI.hxx b/Kernel/FirmwareKit/EFI/EFI.hxx
index 2e1ef4d6..ae3bd042 100644
--- a/Kernel/FirmwareKit/EFI/EFI.hxx
+++ b/Kernel/FirmwareKit/EFI/EFI.hxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
diff --git a/Kernel/FirmwareKit/EPM.hxx b/Kernel/FirmwareKit/EPM.hxx
index aa5dc92a..7c4b37b6 100644
--- a/Kernel/FirmwareKit/EPM.hxx
+++ b/Kernel/FirmwareKit/EPM.hxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
@@ -83,6 +83,10 @@ struct PACKED PartitionBlock
 
 #define kEPMMagicUEFI "EPMUE"
 
+/* @brief CoreBoot magic for EPM */
+
+#define kEPMMagicCoreBoot "EPMCB"
+
 /* @brief Invalid magic for EPM */
 
 #define kEPMMagicError "EPM??"
@@ -104,7 +108,7 @@ typedef struct PartitionBlock PartitionBlockType;
 #ifdef __x86_64__
 #define kEPMMagic kEPMMagic86
 #else
-#ifdef __powerpc
+#ifdef __powerpc64__
 #define kEPMMagic kEPMMagicPPC
 #else
 #define kEPMMagic kEPMMagicError
@@ -113,16 +117,16 @@ typedef struct PartitionBlock PartitionBlockType;
 
 ///! @brief partition must start at this address.
 ///! Anything below is reserved for Data backup by the Main OS.
-#define kEPMStartPartitionBlk (sizeof(BootBlock))
+#define kEPMStartPartitionBlk 	(sizeof(BootBlock))
 
 ///! @brief Current EPM revision (2)
-#define kEPMRevision (2)
+#define kEPMRevision 			(3)
 
 ///! @brief Current EPM revision (2)
-#define kEPMRevisionUEFI (0xF)
+#define kEPMRevisionUEFI 		(0xF)
 
 /* @brief Maximum block count. */
-#define kEPMMaxBlks 128
+#define kEPMMaxBlks 			(128)
 
 /// END OF SPECS
 
diff --git a/Kernel/FirmwareKit/Handover.hxx b/Kernel/FirmwareKit/Handover.hxx
index 1a7d1da7..19602fc3 100644
--- a/Kernel/FirmwareKit/Handover.hxx
+++ b/Kernel/FirmwareKit/Handover.hxx
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright SoftwareLabs
+	Copyright Zeta Electronics Corporation
 
 ------------------------------------------- */
 
@@ -11,7 +11,7 @@
  * @version 0.3
  * @date 2024-02-23
  *
- * @copyright Copyright (c) 2024, SoftwareLabs
+ * @copyright Copyright (c) 2024, Zeta Electronics Corporation
  *
  */